Commit graph

7362 commits

Author SHA1 Message Date
Nick Winter
e6f61b545e ControlBarView handling playing non-latest versions of levels. 2015-09-02 14:54:44 -07:00
Imperadeiro98
bb119541da Merge pull request #2987 from sake12/master
pl.coffee - another update
2015-09-02 21:11:43 +01:00
sake12
0b5c3ad3d0 pl.coffee - update 2015-09-02 21:29:24 +02:00
Dmitry Suprun
d85b656b24 add some translation 2015-09-02 19:39:55 +03:00
Eero Penttilä
592bb6b472 fi.coffee translated: choose_hero, skill_docs
Some new translations and some fluency modifications.
There is some word placement problems in these sections:
-in lines 495 - 500 the words added between the texts 1,2 and 3 won't fit in Finnish. Could this be replaced with one sentence where the added words would be described like '__nAttackDamage__' etc.?
-in line 510 there is word 'Action' added in front of this word, and I didn't find it in the translation document.
I'll try to make some kind of bug repot of these things also...
2015-09-02 18:58:21 +03:00
Nick Winter
6463b04c5c Not trying to play a certain sound we don't have yet. 2015-09-02 05:32:45 -07:00
Eero Penttilä
8328a62409 fi.coffee translated: subscribe 2015-09-02 15:12:27 +03:00
Eero Penttilä
f1224c7107 fi.coffee translated: buy_gems 2015-09-02 14:00:10 +03:00
Matt Lott
aa16348ded Remove target subs line from subs dashboard 2015-08-31 05:46:13 -07:00
Matt Lott
ad079f1ff9 🐛Fix trial requests approval page width overflow 2015-08-31 05:40:07 -07:00
Eero Penttilä
98273a5520 Some new translations
Translated: Clans, user.
and some fixes for fluency
2015-08-31 15:24:30 +03:00
sake12
eb50a2f761 pl.coffee - another update 2015-08-31 12:05:21 +02:00
sake12
b5311c4589 pl.coffee - update 2015-08-30 23:29:22 +02:00
Nick Winter
b383c6ac00 Updated inventory for Ace of Coders. 2015-08-30 07:28:35 -07:00
Nick Winter
635dcf22ae Fixed typo for Okar session check. Not showing some common sub-skills as skills on hero picker. 2015-08-29 10:01:53 -07:00
Nick Winter
88f6e528b1 Implementing goliath. Configuring goliath for Ace of Coders. 2015-08-29 08:02:20 -07:00
Matt Lott
8de00767b3 Initial courses object model 2015-08-29 07:15:39 -07:00
Imperadeiro98
10e33dab4a Uncommented an header from ja.coffee 2015-08-29 09:49:23 +01:00
Imperadeiro98
8333e57ce2 Merge pull request #2977 from Ikuyadeu/patch-1
Update ja.coffee
2015-08-29 09:48:33 +01:00
Imperadeiro98
11564571d3 Merge pull request #2972 from sodaorange/patch-1
Update ja.coffee
2015-08-29 09:47:39 +01:00
Ikuyadeu
5d49e1cb9a Update ja.coffee 2015-08-29 16:22:41 +09:00
Imperadeiro98
0357a59cb9 Uncommented some headers from nl-BE.coffee 2015-08-28 22:21:54 +01:00
Imperadeiro98
d415ee25cd Merge pull request #2973 from WardLanssens/patch-1
Update nl-BE.coffee
2015-08-28 22:18:18 +01:00
Matt Lott
545567a24b Courses UI: Add teachers mode button to landing page 2015-08-28 11:33:37 -07:00
Matt Lott
a1927bf8cc Courses UI: Update tabs on details page 2015-08-28 10:53:24 -07:00
Nick Winter
d412a7d5ee Fixed blank duel stats bar in single player, oops. Handling getTwoGames from non-logged-in users. 2015-08-28 10:45:07 -07:00
WardLanssens
bfe061dc2b Update nl-BE.coffee 2015-08-28 10:38:14 +02:00
sodaorange
1aa93fbd8a Update ja.coffee 2015-08-27 22:20:02 -04:00
Matt Lott
066d6e7fc1 Courses UI: Add FAQ popup to landing page 2015-08-27 16:52:02 -07:00
Matt Lott
a27c17ef0a Courses UI: Add image to sales blurb and quote 2015-08-27 16:19:37 -07:00
Matt Lott
24fb52a8d9 Update year sub sale copy 2015-08-27 10:54:52 -07:00
Matt Lott
e10c5d9646 Allow year sub purchases on top of monthly subs
Monthly sub is cancelled, terminal sub of 1 year + remaining month is
added.
2015-08-27 09:45:10 -07:00
Matt Lott
5faeb82d17 Extend terminal sub with year sub purchase 2015-08-27 09:45:10 -07:00
Imperadeiro98
2ad285093a Merge pull request #2962 from nantoniazzi/patch-1
Update fr.coffee
2015-08-27 11:29:08 +01:00
Imperadeiro98
78b136d69c Fixed {changed} in english file 2015-08-27 10:41:13 +01:00
Matt Lott
b6ddb41df6 Add sale end date to year sub page 2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3 Add new heroes to year sub sale page 2015-08-26 14:49:35 -07:00
Matt Lott
66c864bca5 Add feature list to year sub sale landing page 2015-08-26 11:16:25 -07:00
AkaKaras
dafc5fc32f final check and now zh-HANT is done too
finally finished the translation, but there only has one sentence is translated
2015-08-25 22:13:22 -04:00
AkaKaras
f6a1d06c13 done the zh-HANS translation
only one sentence is translated, and thanks again for @lazydogP helping the zh-HANS translation
2015-08-25 21:55:36 -04:00
AkaKaras
358db97345 a minor fix 2015-08-25 21:15:19 -04:00
AkaKaras
d530cb5841 a new file
replace the dmg
2015-08-25 20:47:54 -04:00
Matt Lott
4392da1c20 Redirect to world selector after year sub purchase 2015-08-25 10:59:06 -07:00
Matt Lott
c601652d0b Add teacher banner image to year sub sale page
Also updating sale copy.
2015-08-25 10:38:12 -07:00
Matt Lott
58ff820d7d Prompt for login on year subscription sale page 2015-08-25 10:12:11 -07:00
Matt Lott
7d419c1615 Courses UI: add screenshot to landing page course blocks 2015-08-24 06:11:11 -07:00
Matt Lott
f42f34c96f 🐛Fix subs dashboard 30 day churn 2015-08-23 20:54:39 -07:00
AkaKaras
a28484dba8 something wrong
can't delete the zh-HANS, need to upload a new file or replace the whole thing
2015-08-23 19:33:29 -04:00
Matt Lott
b171a55876 Use real cancellations for 1st month on subs dashboard
We have the data now, so no need to approximate anymore.
2015-08-23 15:32:44 -07:00
Matt Lott
e8a4fd9336 Courses UI: update purchase/continue flow
Don’t show unlock code entry to teachers
Don’t show existing class selection or purchase course to students
Update copy to make it clearer what’s going on
2015-08-23 14:33:07 -07:00
Matt Lott
69f874a31d Courses UI: Add student option to courses landing page 2015-08-23 13:48:52 -07:00
AkaKaras
74365c873c another fixing
justing find something wording and wrong commit……
2015-08-23 10:47:58 -04:00
AkaKaras
00c0136542 Merge branch 'master' into for-fixing-translation-bug 2015-08-22 18:43:31 -04:00
AkaKaras
ae3fcce0f0 Finished zh-HANS and zh-HANT translation
finally i finished it!!!!!!!!
2015-08-22 18:08:27 -04:00
AkaKaras
542f70f7b9 TRANSLATION!!!!
that is for morning, gonna work on the rest at afternoon
2015-08-22 12:11:11 -04:00
jpss256
de2a071bcd minor fix 2015-08-22 12:56:42 +03:00
jpss256
89c9841fbf Fixes 2015-08-22 12:53:42 +03:00
jpss256
7a9d640f0e Translation 2015-08-22 12:45:02 +03:00
AkaKaras
f23a39d71b TRANSLATION!!!
gonna finish it in few days
2015-08-21 21:57:53 -04:00
Matt Lott
f966b8a2fc Courses UI: Add course details condensed progress view
Defaulting to condensed view, with checkbox to expand details.
2015-08-21 17:00:44 -07:00
Imperadeiro98
cf720ce270 Fixed 'changed' in english file 2015-08-21 21:42:02 +01:00
Matt Lott
e85d5eac6f Courses UI: Add student summary stats 2015-08-21 12:37:54 -07:00
Matt Lott
5961f14d2c Courses UI: Update details page copy 2015-08-21 12:18:05 -07:00
Matt Lott
9e222d0873 Add subscription sale
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
2015-08-21 11:19:39 -07:00
nantoniazzi
5e4b968658 Update fr.coffee 2015-08-21 19:35:48 +02:00
Imperadeiro98
a7074b11ca Merge pull request #2960 from AkaKaras/revert-2950-patch-2
Revert "there has a typos at #963"
2015-08-21 14:32:18 +01:00
Imperadeiro98
a9213f51c5 Merge pull request #2959 from AkaKaras/patch-5
fixed few things
2015-08-21 14:31:52 +01:00
AkaKaras
ec73c6852f Revert "there has a typos at #963" 2015-08-21 09:27:28 -04:00
AkaKaras
23a1a238b2 fixed few things
fixed some wordings and sentences
2015-08-21 09:23:04 -04:00
AkaKaras
85f95212cd just translate few sentences
just translated few sentences
2015-08-21 09:22:04 -04:00
Nick Winter
256b19d331 More improvements and fixes for league ladder pages. 2015-08-21 03:28:25 -07:00
Nick Winter
20c6248dba Added rough army power indicator to DuelStatsView. 2015-08-20 15:21:05 -07:00
jpss256
2220cbed8e Fixes 2015-08-21 00:28:11 +03:00
jpss256
14e4f0758a Another portion of the translation 2015-08-21 00:15:36 +03:00
Imperadeiro98
9cf4c06301 Added menu opening sound to PlayHeroesModal 2015-08-20 20:43:04 +01:00
Imperadeiro98
551b450a68 Merge pull request #2956 from javatlacati/patch-1
Update es-419.coffee
2015-08-20 20:28:01 +01:00
Nick Winter
78605ef459 Added DuelStatsView for ladder matches. 2015-08-20 11:57:47 -07:00
RUSLAN LÓPEZ CARRO
4bb7b544bd Update es-419.coffee 2015-08-20 09:35:14 -05:00
Nick Winter
da0b7d3e64 Merge pull request #2955 from codecombat/leagues
Leagues!
2015-08-19 15:34:54 -07:00
Nick Winter
f4d796a717 More ladder page support for leagues. Linking to clan league pages from clans pages. 2015-08-19 15:30:37 -07:00
Nick Winter
11f9238a91 Added Robot Ragnarok limited time challenge. 2015-08-19 12:16:48 -07:00
Nick Winter
3cfabf8122 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-08-19 12:16:23 -07:00
Imperadeiro98
c701976e65 Merge pull request #2951 from teresacream/patch-1
Update zh-HANT.coffee
2015-08-19 11:39:38 +01:00
AkaKaras
896f11c621 add few translations
just translate few words
2015-08-18 22:03:24 -04:00
Nick Winter
36494acc5a Merge pull request #2949 from trotod/fix-interface-audio
Fix some campaign interface audio
2015-08-18 16:19:38 -07:00
Imperadeiro98
557d4ceb42 Uncommented some headers 2015-08-18 22:38:30 +01:00
RUSLAN LÓPEZ CARRO
4aa0c61a74 Update it.coffee 2015-08-18 16:29:43 -05:00
Imperadeiro98
d5398f1376 Merge pull request #2950 from AkaKaras/patch-2
there has a typos at #963
2015-08-18 22:28:43 +01:00
Imperadeiro98
de98d865c2 Uncommented a couple headers 2015-08-18 21:00:58 +01:00
Imperadeiro98
3caec5c36a Merge pull request #2952 from javatlacati/patch-6
Update es-ES.coffee
2015-08-18 20:59:29 +01:00
Nick Winter
e041c288cc Merge pull request #2948 from Imperadeiro98/master
Use playSound in PlayItemsModal.coffee
2015-08-18 12:40:36 -07:00
RUSLAN LÓPEZ CARRO
bec730741c Update es-ES.coffee 2015-08-18 12:16:04 -05:00
teresacream
1607cbdfeb Update zh-HANT.coffee 2015-08-18 22:27:20 +08:00
AkaKaras
2fa01b660a there has a typos at #963
the word 吧is misused, should use 把 instead
2015-08-18 10:23:40 -04:00
Imperadeiro98
56291fc417 Use playSound in PlayItemsModal.coffee 2015-08-17 20:34:34 +01:00
David Liu
a242c41557 Play sound on Buy Gems press
Partial solution to #2916.
2015-08-16 18:59:21 -07:00
David Liu
18ac0e06a2 Cut out extra sound on Items/Achievements press
Removes event listener on supermodel 'loaded-all' event.

Fixes #2915
2015-08-16 18:59:21 -07:00
jpss256
4120a31890 Translate a part of the Bulgarian file 2015-08-16 11:49:02 +03:00
Nick Winter
32ca453dec Added /play/ladder/levelID/clan/clanID clan-specific ladder pages. 2015-08-15 06:45:38 -07:00
Nick Winter
bda2483738 Added league-based ladder game simulation. 2015-08-15 05:38:47 -07:00
Ikuyadeu
d5cd08108a Update ja.coffee 2015-08-15 18:57:20 +09:00
Jhoon Saravia
e036e5a663 Translate all sections but concepts. 2015-08-14 21:00:37 -05:00
Matt Lott
978f0df7d3 🐛Fix InspectletJS script loading
Original embed code was not correct for delayed script loading.
2015-08-14 14:02:19 -07:00
Lai Tuan
5795399aaa Fixed #2729 2015-08-15 04:04:00 +09:00
Jhoon Saravia
e69bd91afe Add translations up teacher's section 2015-08-13 23:34:24 -05:00
Nick Winter
f757f220be Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods. 2015-08-13 11:17:38 -07:00
Matt Lott
05a9013164 Remove deprecated prepaid schema properties 2015-08-13 11:13:15 -07:00
Nick Winter
621e143544 Fixed bug with game menu not highlighting guide tab. 2015-08-13 11:09:26 -07:00
Matt Lott
4804f3965f 🐛Fix prepaid schema for redeemers property 2015-08-13 10:57:47 -07:00
Nick Winter
52aa877f46 Cleaned up an old file. 2015-08-13 08:30:18 -07:00
Nick Winter
a52e9a3189 Fixed #2939. 2015-08-13 05:58:46 -07:00
Jhoon Saravia
182614400a Add some translations in Spanish 2015-08-12 23:15:03 -05:00
Matt Lott
9c39bf7656 Update prepaids to support multiple redeemers for a single code
Will remove deprecated properties after updating production.
2015-08-12 15:51:18 -07:00
Nick Winter
49dc71a157 Added a Bloc coupon code after A Mayhem of Munchkins. 2015-08-12 10:25:56 -07:00
Ikuyadeu
d9cc779261 Update ja.coffee 2015-08-11 20:09:45 +09:00
Imperadeiro98
e205450d79 Fixed some mistakes in last merge 2015-08-11 10:59:05 +01:00
Matheus Marques
cad071f384 Update pt-BR.coffee 2015-08-11 02:05:16 -03:00
Imperadeiro98
bbe6dd7783 Update pt-PT.coffee 2015-08-10 23:11:51 +01:00
Imperadeiro98
e130acb184 Uncommented a translation 2015-08-10 23:08:16 +01:00
Imperadeiro98
0c4cec8a4b Merge pull request #2928 from fabichoi/master
translate some words
2015-08-10 23:07:25 +01:00
Nick Winter
7ee155278d Not showing the 'Course: ' in course level names to teachers/players in the obvious places. 2015-08-10 12:01:03 -07:00
Nick Winter
303c19a2dd Pulled in kids coding on homepage image to be visible on screens as small as 1280px wide. 2015-08-10 11:02:19 -07:00
Cat Sync
37fbb07211 Added continue_statements, graphics, and parameters to concepts list 2015-08-10 10:56:21 -04:00
Nick Winter
1d81133f24 Possible solution for #2917, needs testing. Added crossbow bolts to missile orientation display logic. 2015-08-09 14:10:32 -07:00
unknown
07a4cecaaa translate some words 2015-08-08 17:57:14 -04:00
Nick Winter
72199c3548 Propagated i18n. 2015-08-08 11:29:48 -07:00
Nick Winter
79ea3258f1 Added GitHub link to community page. 2015-08-08 10:26:13 -07:00
David Liu
817d790fea Fix poll keys when key is a number
jQuery converts data strings into a possible JavaScript value, so keys
like '0' and '1' get converted into numbers, which fails the validation
(it expects a string for a key).
2015-08-08 08:50:18 -07:00
Nick Winter
bb525b0b7f Flags now animate in using the appear action. (Still need to fix it to make it not 'appear' when it's just a cursor change.) 2015-08-08 08:23:02 -07:00
Nick Winter
e9e2866863 Added custom backgrounds for equip buttons. Shrunk equip text to fit for languages where it was overflowing. 2015-08-08 06:31:53 -07:00
Nick Winter
4d697a43ab Added kids coding on homepage. 2015-08-08 05:35:08 -07:00
Nick Winter
859627d232 Fixed cliff sprite scaling. 2015-08-07 19:26:47 -07:00
Imperadeiro98
26c634ab24 Merge pull request #2923 from Zacharias030/master
Update de-DE.coffee
2015-08-07 20:08:55 +01:00
Matt Lott
ab9e3d39ee 👕Fix courses view linter warning
warn: Linting of app/views/courses/mock1/CoursesView.coffee: warn:
ensure_comprehensions at line 72.

May be a linter bug, have filed an issue here:
https://github.com/clutchski/coffeelint/issues/482
2015-08-07 12:03:09 -07:00
Imperadeiro98
7c92d7cd1c Update pt-PT.coffee 2015-08-07 19:15:46 +01:00
Matt Lott
985cfa2c56 Courses UI - Update free course button copy 2015-08-07 10:12:11 -07:00
Nick Winter
69e7c68784 Hide Kithgard Mastery from slow/young players, and highlight it once for fast/old players. Fix clan button link. 2015-08-07 07:33:30 -07:00
Zacharias Fisches
e1d6641348 Update de-DE.coffee
small german translation fix
2015-08-06 16:15:30 +08:00
Nick Winter
66212b0559 Don't show victory text for hero levels. New Clans button. Floor stretching support for firn cliff. 2015-08-05 16:17:27 -07:00
Matt Lott
697b0e9e42 Courses UI - Clean up details page summary 2015-08-05 10:58:12 -07:00
Matt Lott
579f63c059 Courses UI - Clean up course details page titles 2015-08-05 09:53:54 -07:00
Matt Lott
d47f41548c Courses UI - Show progress to students by default 2015-08-05 09:44:19 -07:00
Matt Lott
ea90b93bd2 Courses UI - Consolidate class settings into single modal 2015-08-05 09:35:18 -07:00
Matt Lott
c90fcada7d Update course names 2015-08-04 20:03:30 -07:00
Matt Lott
1b21a677dc Courses UI - Updating copy on landing page 2015-08-04 20:01:13 -07:00
Nick Winter
ae0dc0eb7c Merge pull request #2922 from brian-yang/patch-2
Added more names for #53
2015-08-04 17:54:16 -07:00
Nick Winter
7ad16683ce Fixed error for non-course hero victory modals. 2015-08-04 17:41:42 -07:00
Matt Lott
38efeb119c Courses UI - take class size as buy input instead of bucketizing 2015-08-04 15:33:02 -07:00
Matt Lott
60e21600b8 Course details - use given instance 2015-08-04 15:33:02 -07:00
Matt Lott
55a58ef0b3 Courses UI - update button text based on enrolled or not 2015-08-04 15:33:02 -07:00
Matt Lott
36cc9b5f18 Update courses landing page sales copy 2015-08-04 15:33:02 -07:00
Matt Lott
9547bd1021 Add sales copy to beginning of courses landing page 2015-08-04 15:33:02 -07:00
Brian Yang
56ba5e1a32 Added more names for #53 2015-08-04 18:31:46 -04:00
Nick Winter
3f323d27d0 Removed achievement and rewards from course-type level victory screens. Added victory text, return-to-course-button, and level feedback and reviews to course-type levels. 2015-08-04 11:35:10 -07:00
Matt Lott
4ef6d471ee Course UI - bold enrolled marker on course tiles 2015-08-04 11:30:06 -07:00
Matt Lott
b53e4707d8 Update course names
Trying different formats.
2015-08-04 11:26:18 -07:00
Matt Lott
bfd4b4f0ca Courses UI - Update landing page flow
Simplify initial options, add course instance selection.
2015-08-04 11:21:02 -07:00
Matt Lott
da6cf60381 Target specific levels with InspectletJS
Currently targeting cupboards-of-kithgard.
2015-08-03 15:52:52 -07:00
Nick Winter
74b2c5abdb Propagated i18n. 2015-08-02 14:16:26 -07:00
Nick Winter
8d09357a7a Fixed #2914: no disabling spaces for Clojure and other advanced/experimental languages. 2015-08-02 14:12:15 -07:00
Nick Winter
2eb3cfb93a Added Myanmar language (Burmese) stub. 2015-08-02 07:42:27 -07:00
Matt Lott
0768b533e2 Subs dashboard perf
Caching older (at least 16 days) Stripe invoices in analytics
collection, which will be updated once a day via the analytics server
cron job.
2015-07-31 16:19:40 -07:00
gnerkus
835074e5e6 chore (coding tips): Add more quotes for #710 2015-07-31 21:58:10 +01:00
Matt Lott
8fe189f915 Course details page student level progress popups 2015-07-30 16:04:13 -07:00
Matt Lott
59c730ef20 Add aggregate student progress to course details page 2015-07-30 15:30:36 -07:00
Matt Lott
14b4b83148 Move course purchase details off buy button 2015-07-30 13:54:02 -07:00
Matt Lott
c3430ff3e1 Add free teacher trial to course purchase page 2015-07-30 13:54:02 -07:00
Matt Lott
260d062014 🐛Fix courses jquery css typo 2015-07-30 13:54:02 -07:00
Imperadeiro98
574a264daf Uncommented some headers from th.coffee 2015-07-30 21:30:59 +01:00
Auratus
1defff99c1 Update th.coffee 2015-07-31 03:17:21 +07:00
Imperadeiro98
36c018ccf9 Uncommented some headers from th.coffee 2015-07-30 19:46:57 +01:00
Auratus
87a838d128 I am native Thai and already translate some of it.
I would translate more if I have the time.
BTW, How can I translate "Gems Gained" when it would sound awkward in Thai if it is "5 Gems gained"
and most appropriate translation would be "ได้รับเพชร 5 ชิ้น" - "Gained gem 5 pieces"
2015-07-31 00:55:16 +07:00
Matt Lott
1eb9162463 Add more course info gameplay screenshots 2015-07-29 16:11:06 -07:00
Matt Lott
c5efdb97e1 Course details mock UI edit dialogs 2015-07-29 16:11:06 -07:00
Matt Lott
2baf18ef56 Course mock UI redeem code dialog 2015-07-29 16:11:06 -07:00
Imperadeiro98
78a1e621f1 Merge pull request #2908 from fabichoi/master
Translated some words and sentences
2015-07-29 23:08:11 +01:00
Matt Lott
822d25984f Merge pull request #2910 from trotod/fix-clan-details-style
Fix clan details style
2015-07-29 10:22:36 -07:00
Matt Lott
30e8fc2397 Courses: Link to campaigns, add intro course instances
Courses will now use campaign levels instead of mock data if available.
 At the moment only the first intro course has a campaign specified
(‘intro’).
2015-07-29 09:51:01 -07:00
Matt Lott
48512060d5 🐛Fix subs dashboard fetch state typos 2015-07-28 15:51:09 -07:00
Michael Revell
4d27c8682c Add names for issue #52 2015-07-26 19:44:07 -07:00
David Liu
3bf3321411 Fix weird styling on clans details page
- add `display: table-cell` on hero portrait cell
- middle align more things
- `Name` should be a table header
2015-07-26 12:39:43 -07:00
Nick Winter
653dc16207 Merge pull request #2909 from gnerkus/add-thang-names
chore (names.coffee): Add more Thang names for #53
2015-07-26 08:23:25 -07:00
gnerkus
037760e230 chore (names.coffee): Add more Thang names for #53 2015-07-26 15:07:02 +01:00
Nick Winter
1dd5d5c109 Merge pull request #2906 from spkane/loading_tips
Add a tip for the loading screen #710
2015-07-26 04:00:06 -07:00
fabichoi
788156564f Translated some words and sentences 2015-07-25 23:10:34 -04:00
Sean P. Kane
d5f81b8f51 Move tip into correct language file 2015-07-25 19:29:13 -07:00
Sean P. Kane
6205ff26ae Add a tip for the loading screen #710 2015-07-25 14:05:32 -07:00
Sean P. Kane
758e40c7f6 Added a few more names for issue #53 2015-07-25 13:46:41 -07:00
Imperadeiro98
3c7b79964f Merge pull request #2903 from fabichoi/master
Translated some words.
2015-07-25 20:21:48 +01:00
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07:00
Nick Winter
107f94a08b Fixed another cause of the bug fixed in 0d99b07b with modified levels still granting rewards. 2015-07-24 08:56:20 -07:00
unknown
c3d07e950a modified 2015-07-23 22:43:43 -04:00
Imperadeiro98
aeff90cba9 Re-added a missing string from last merge 2015-07-23 22:20:55 +01:00
dolom
35dcdff3ff Update it.coffee 2015-07-23 22:30:06 +02:00
Imperadeiro98
3d9c7927ea Update pt-PT.coffee 2015-07-23 17:37:49 +01:00
Imperadeiro98
015ed33dbe Updated i18n of delta.jade 2015-07-23 17:35:22 +01:00
Matheus Marques
24d599dcdd Translated some descriptions 2015-07-23 01:50:13 -03:00
bileuze
c88d8f1666 Update pt-BR.coffee 2015-07-22 14:16:35 -03:00
Imperadeiro98
1b077b2456 Fixed previous merge 2015-07-22 17:59:29 +01:00
Shady Kamal
10afbebe70 Update he.coffee
+I'm back
+add tips translation
+add partial "clans" new feature localization (see notes in code)
2015-07-22 17:21:28 +03:00
Cat Sync
11aeb05e66 Limit to showing 6 concepts. For now, show the last 6 in the array. 2015-07-21 13:28:13 -04:00
Imperadeiro98
b6cbf84f48 Some fixes to last merge 2015-07-20 16:53:28 +01:00
Imperadeiro98
3d105f51ce Merge pull request #2892 from Abdel-Malik13/patch-2
Traduction de l'anglais vers l'arabe
2015-07-20 16:51:29 +01:00
Imperadeiro98
08409f3a3b Merge pull request #2896 from itcbx/master
i18n for zh-HANS
2015-07-20 11:37:19 +01:00
Imperadeiro98
8b31415c9b Merge pull request #2894 from sake12/master
Updated polish translation
2015-07-19 19:53:49 +01:00
Imperadeiro98
1961d786cc Fixed last merge 2015-07-19 19:50:24 +01:00
Imperadeiro98
41a00d0090 Merge pull request #2893 from Abdel-Malik13/patch-1
Traduction d'une ligne non traduite.
2015-07-19 19:48:43 +01:00
itcbx
478efd82d7 I18n for zh-HANS
I18n for zh-HANS
2015-07-19 23:44:36 +08:00
itcbx
eea2f511ba i18n for zh-HANS
i18n for zh-HANS
2015-07-19 09:54:21 +08:00
Christelle
0e8c578562 Update fr.coffee 2015-07-18 05:11:03 -04:00
sake12
6c66c782e4 pl.coffee: Translation update 2015-07-18 00:27:22 +02:00
sake12
6e6fda889f Updated polish translation 2015-07-16 01:40:12 +02:00
Abdel-Malik
f5ec107fb0 Traduction de l'anglais vers l'arabe 0.5
Traduction supplémentaire, il reste quelques erreurs de traduction, je les modifierai plus tard si personne ne le fait :)
2015-07-15 12:43:28 +02:00
Abdel-Malik
5e5d4d6445 Traduction de l'anglais vers l'arabe 0.4 2015-07-15 12:26:06 +02:00
Abdel-Malik
901c1e4c56 Traduction de l'anglais vers l'arabe 0.3
Ajout de traducton
2015-07-15 11:58:53 +02:00
Abdel-Malik
b177f63b4e Traduction de l'anglais vers l'arabe 0.2 2015-07-15 11:43:34 +02:00
Abdel-Malik
69d21e279e Traduction de l'anglais vers l'arabe
Si il y a des problèmes au niveau de la traduction, n'hésitez pas à modifier :)
2015-07-15 11:33:48 +02:00
Abdel-Malik
50e4eb5769 Update fr.coffee 2015-07-15 11:23:14 +02:00
Matt Lott
e70b8b8652 Add sorting to course details mock UI 2015-07-10 17:11:16 -07:00
Matt Lott
49a75d2d42 Update course info mock UI 2015-07-10 17:11:16 -07:00
Nick Winter
899aae5798 Consolidated extra resources. 2015-07-10 14:20:25 -07:00
Nick Winter
bcbffd1f65 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-07-10 12:54:25 -07:00
Nick Winter
929455b234 Fixed bug with heroes not loading the proper amount of gems. 2015-07-10 11:13:31 -07:00
Matt Lott
0b714e98d1 Update course info mock UI 2015-07-10 11:04:52 -07:00
Matt Lott
57f869379d Add student view to course details mock UI 2015-07-10 10:37:41 -07:00
Nick Winter
7173fd367f Re-enabled gutter highlights for executing code. 2015-07-10 09:39:08 -07:00
Matt Lott
0a2248393d Update course details mock UI
Add student concepts progress.
Add level status and concepts covered.
Add mostly working level Play button.
2015-07-09 17:53:35 -07:00
Nick Winter
36d3b8e910 Highlighting entry points is working pretty well, at least in Python through the forest. 2015-07-09 15:05:35 -07:00
Nick Winter
4f443efd8b First draft of logic to work out where the code entry points should be. 2015-07-09 12:47:07 -07:00
Nick Winter
dfa0de7521 Bad testing version of code entry point arrow numbering. 2015-07-09 11:45:11 -07:00
Matt Lott
6831355649 🐛Fix subs dashboard monthly churn and perf
Use Stripe events API to calculate monthly churn.
Move Stripe API page handling to the client.
2015-07-08 17:34:34 -07:00
Imperadeiro98
a8e59c5302 Updated 'Generate Terrain' strings 2015-07-08 23:20:32 +01:00
Imperadeiro98
ad25f66db0 Update pt-PT.coffee 2015-07-08 22:22:56 +01:00
Nick Winter
be19edb7a1 Merge pull request #2881 from Vikasgupta09/master
fix #2867 added i18n to some words of lvl save form
2015-07-07 16:09:53 -07:00
Nick Winter
16407a8ca0 Merged fr.coffee. 2015-07-07 16:07:42 -07:00
Nick Winter
45c249ac27 Not asking for resubscription in buy gems modal if already subscribed. 2015-07-07 11:50:55 -07:00
Nick Winter
51c08eff3b Propagated i18n. 2015-07-07 11:45:41 -07:00
Nick Winter
07f81755b0 Added deprecation message to old arenas, highlighting new hero arenas instead. 2015-07-07 11:43:38 -07:00
Julien Reichardt
9748c80cae Translation of "concepts" section 2015-07-06 23:57:19 +00:00
Cat Sync
5ab7fd7840 Added 'arguments' to the concepts list, and renamed while loops to just 'Loops', for now 2015-07-06 15:46:18 -04:00
Matt Lott
0c427ff440 Update teachers and sales copy with latest level and hour counts 2015-07-03 13:07:25 -07:00
Matt Lott
8d258c6943 Update private clans preview image and copy 2015-07-02 18:44:13 -07:00
Matt Lott
6a53237e65 Add member sorting to premium clan dashboard 2015-07-02 15:17:34 -07:00
Imperadeiro98
8a4645ebc6 Updated i18n of 'Status' in clan-details.jade 2015-07-02 21:50:28 +01:00
Matt Lott
a316924576 Add member concept maps to private clans 2015-07-02 13:23:26 -07:00
Matt Lott
a62e0a8fe6 👕Fix linter warning in mock course details view
warn: Linting of app/views/courses/mock1/CourseDetailsView.coffee:
warn: ensure_comprehensions at line 50.
2015-07-02 10:54:22 -07:00
Imperadeiro98
ede3b35368 Fixes to previous merge 2015-07-02 12:47:20 +01:00
Imperadeiro98
74cdc1c3ea Merge pull request #2882 from Ikuyadeu/patch-1
Update ja.coffee
2015-07-02 12:46:17 +01:00
Imperadeiro98
41f2eacff9 Some fixes to previous merge 2015-07-02 12:44:30 +01:00
Ikuyadeu
8a9ea09eca Update ja.coffee 2015-07-02 19:20:25 +09:00
Vikas Gupta
4776ff8325 fix #2867 added i18n to some words of lvl save form 2015-07-02 11:40:37 +05:30
Federico Tomas
7e0c5490e0 Update es-419.coffee
up guys!.
2015-07-01 23:06:20 -03:00
Matt Lott
af612afcdd Mock course UI show last expanded complete level 2015-07-01 15:36:33 -07:00
Matt Lott
bee5d53457 Fix clan details html indentation
And reorder progress key.
2015-07-01 15:16:21 -07:00
Matt Lott
254d6a9d6b Add course mock UI for student level progress 2015-07-01 15:16:20 -07:00
tahmidshahriar
62b050f6d8 Merge remote-tracking branch 'upstream/master' 2015-07-01 10:54:37 -07:00
tahmidshahriar
f6dd3ce0c8 minimize changes 2015-07-01 10:22:25 -07:00
tahmidshahriar
60e27d386f add close buttonn to payment methods 2015-07-01 10:20:14 -07:00
Nick Winter
1c5f176c3c Added recursion to concepts list. 2015-06-30 20:52:10 -07:00
Matt Lott
71fd13276f Update mock course details page
Add individual course session selection, call them classes.
Edit buttons for class name and description.
Rearrange layout.
Update course concept lists to use real values.
Also add class name field to course enrollment page.
2015-06-30 16:53:37 -07:00
Imperadeiro98
90e02cba48 Updated i18n 2015-06-30 20:33:05 +01:00
Imperadeiro98
0ef6dfcc30 Updated i18n in add-thangs-view.jade 2015-06-30 20:33:03 +01:00
Imperadeiro98
92052ceb5b Update pt-PT.coffee 2015-06-30 19:59:50 +01:00
Nick Winter
4742b23854 Propagated i18n. 2015-06-30 11:29:18 -07:00
Nick Winter
b0c7b50761 Added programming concept tags to campaign and level editor. 2015-06-30 11:27:58 -07:00
Nick Winter
8df32b47d0 Some tweaks to #2876. 2015-06-30 10:31:52 -07:00
Nick Winter
1d6f777b58 Merge pull request #2876 from tahmidshahriar/master
Fixed email requirement
2015-06-30 10:13:50 -07:00
tahmidshahriar
259c91b62d fix unneeded changes 2015-06-30 09:37:39 -07:00
tahmidshahriar
56b81f175e Fix email 2015-06-30 09:35:45 -07:00
Nick Winter
8155d6fba0 Merge pull request #2873 from UltCombo/gh-2740
updateLevelRequiredItems: special-case rings, fixes #2740
2015-06-29 19:46:55 -07:00
Nick Winter
be2f47c79a Merge pull request #2857 from laituan245/for2806_teacher_survey
Fixes #2806 (radio buttons of teacher survey page)
2015-06-29 19:37:06 -07:00
UltCombo
7d7d2d5f0e updateLevelRequiredItems: special-case rings, fixes #2740
Rings often have unique effects instead of progressively enhancing another ring's effect, hence let's make rings required even if there's already non-restricted rings equipped.
If, by any chance, there's ever a new ring which enhances the effect of a ring which is required for some level, then it should be easy enough to whitelist it in the given ring slot's allowed items array.
2015-06-29 21:25:43 -03:00
Imperadeiro98
e1e1328906 Updated i18n in account-settings-root-view.jade 2015-06-29 20:26:45 +01:00
Matt Lott
e36cf0ca3f Initial courses mock UI
Do not localize these files.
This is under construction.
2015-06-29 12:15:10 -07:00
Imperadeiro98
e932d27242 Merge pull request #2871 from SuperPranx/patch-1
Added new translations and modified existing ones
2015-06-29 20:05:49 +01:00
Matt Lott
8c6fd49f43 Clans view class name typo 2015-06-29 11:51:38 -07:00
Nick Winter
11d69880f7 Merge pull request #2868 from UltCombo/required-rings
Improved `updateLevelRequiredItems` logic regarding rings, fixes #2740
2015-06-29 11:19:04 -07:00
Nick Winter
ba3a1dd3df Merge pull request #2869 from UltCombo/2828
fix #2828
2015-06-29 11:14:09 -07:00
Nick Winter
39f8a8a8af Fixed #2870. 2015-06-29 11:13:15 -07:00
Nick Winter
d7f88c3d95 Merge pull request #2856 from laituan245/for2854
Fixes #2854
2015-06-29 11:03:47 -07:00
tahmidshahriar
4d8c539b2c Merge remote-tracking branch 'upstream/master' 2015-06-29 09:51:26 -07:00
Ivan Milanov
c7dc30ea64 Added new translations and modified existing ones 2015-06-29 17:23:13 +02:00
Imperadeiro98
d4f1fcaaed Added i18n 2015-06-28 11:43:56 +01:00
Imperadeiro98
f4e54d4f54 Updated i18n in add system 2015-06-28 11:43:53 +01:00
UltCombo
cc8b8fa8be fix #2828 2015-06-28 00:32:08 -03:00
UltCombo
63299c4d80 Improved updateLevelRequiredItems logic regarding rings, fixes #2740
This fixes the main issue of #2740, allowing the player to play the level if the required ring is equipped on either ring slot.

There's still a small problem: if the player already had a ring equipped in the `right-ring` slot, the Ring of flowers will not display as required due to this [line](0df6da7efa/app/views/play/menu/InventoryModal.coffee (L436)). This seems to be a different issue though, probably related to the `unequipLevelRestrictedItems` logic.
2015-06-27 22:22:37 -03:00
Imperadeiro98
5eed3361f3 Updated i18n 2015-06-27 12:40:48 +01:00
Imperadeiro98
737dd56754 Updated i18n in save-version-modal.jade 2015-06-27 12:40:41 +01:00
Imperadeiro98
d868894845 Updated i18n in play-account-modal.jade 2015-06-27 12:39:42 +01:00
Nikita Gryzlov
2d7e9e88f9 Update ru.coffee. Sync type_in_email
Sync type_in_email
2015-06-25 23:31:33 +03:00
Lai Tuan
1453c132fe Fixes #2806 2015-06-25 23:58:12 +09:00
Lai Tuan
29d19ffc37 Fixes #2854 2015-06-25 23:30:13 +09:00
tahmidshahriar
4ac7408166 Fix small change in not-found to keep change to minimum 2015-06-24 14:53:52 -07:00
tahmidshahriar
e287e515f1 Fix small change in not-found to keep change to minimum 2015-06-24 14:51:07 -07:00
tahmidshahriar
f6a35f1fd4 Fixed not found page (got rid of NotFoundView in core) 2015-06-24 14:49:26 -07:00
tahmidshahriar
6ac3ea9f5f Fixed not found page 2015-06-24 14:46:59 -07:00
Nick Winter
270340a79f Removed Learnable. 2015-06-24 09:18:13 -07:00
Nikita Gryzlov
8c5b67d826 Update en.coffee. {change} added. 2015-06-23 10:59:14 +03:00
Imperadeiro98
a9eeb7723b Update pt-PT.coffee 2015-06-22 20:46:53 +01:00
Nick Winter
aa1150768f Propagated i18n. 2015-06-22 11:59:28 -07:00
Imperadeiro98
80bb030951 Removed unnecessary i18n 2015-06-22 19:18:47 +01:00
Imperadeiro98
cbf65ff352 Removed unnecessary i18n from about page 2015-06-22 19:18:18 +01:00
nixel2007
8f3efeb97c Update ru.coffee. teachers_survey 2015-06-22 20:00:42 +03:00
nixel2007
a3781d887a Update ru.coffee
Misc.
2015-06-22 17:56:12 +03:00
NoYzE1
7fcfce5b33 Update de-DE.coffee
Beim Dialog Abonnieren steht "$9.99/Monate". Es sollte aber "$9.99/Monat" heißen. Dev-tools sagen, dass der Text von subscribe.month stammt, wo "Monate" steht.
2015-06-20 20:59:43 +02:00
Lai Tuan
7c680e4efa Removed 'this' and 'tempThis' 2015-06-21 02:09:44 +09:00
Lai Tuan
39fc882303 Require user password for deleting accounts #2842 2015-06-20 23:12:26 +09:00
Matt Lott
d632119a6c Add 6 month graph to admin dashboard 2015-06-19 13:49:19 -07:00
David Liu
1716359fdf Limit multiplayer leaderboard name width even more
adjusted max-width to 100px, fixes #2373
2015-06-19 07:35:35 -07:00
Nick Winter
8ef4a9ddde Merge pull request #2830 from arthurnn/master
i18N press enter on spell view
2015-06-18 18:37:24 -07:00
Nick Winter
339aaa0aee Uncommented all translations for #2840. 2015-06-18 18:35:26 -07:00
Nick Winter
b220849190 Merge pull request #2840 from flowabuse/patch-2
Update ro.coffee
2015-06-18 18:28:12 -07:00
Matt Lott
b9622d54a3 Merge pull request #2835 from Mihbo/patch-3
Update names.coffee
2015-06-18 18:05:35 -07:00
Matt Lott
b12b7e8ca4 Add user deletion date
Fixes #2734
2015-06-18 15:17:56 -07:00
flowabuse
5facc41f82 Update ro.coffee
Forgot a " on line 10.
2015-06-18 18:38:31 +03:00
Nick Winter
6a4efa9a21 Switching to Boom and Bust as first level of the forest. 2015-06-17 18:17:14 -07:00
Matt Lott
5fb8b18a31 🐛Fix managed subs next payment UI 2015-06-17 16:35:30 -07:00
flowabuse
1b1482f118 Update ro.coffee
It had to be done! Sorry it took so long... Life happend...
2015-06-17 03:27:34 +03:00
Nick Winter
593f7a9dd7 Some improvements for handling new art. 2015-06-16 13:50:33 -07:00
Imperadeiro98
a8c06652ec Merge pull request #2839 from Mihbo/patch-4
Update uk.coffee
2015-06-16 10:01:50 +01:00
Mihbo
ce73d87f92 Update uk.coffee
some more strings translated
2015-06-16 10:27:32 +03:00
Ikuyadeu
e8a862b2ce Update ja.coffee 2015-06-16 11:05:18 +09:00
Matt Lott
8df49b036b Merge pull request #2831 from trotod/fix-achievement-dates
Show correct achievement earned dates on user page - fixes #2524
2015-06-15 13:21:23 -07:00
Matt Lott
535ca8d2ac Merge pull request #2834 from laituan245/master
Add Contact section to About page #2822
2015-06-15 11:11:58 -07:00
Mihbo
50bcbd97be Update names.coffee
added some more names
2015-06-15 16:57:31 +03:00
Imperadeiro98
c35c9eadf1 Merge pull request #2833 from Ikuyadeu/patch-1
Update ja.coffee
2015-06-15 11:30:57 +01:00
Lai Tuan
aabae7082e Add Contact section to About page #2822 2015-06-15 19:11:48 +09:00
Ikuyadeu
fa8d317745 Update ja.coffee 2015-06-15 18:48:04 +09:00
Mihbo
fd5a99b9d0 Update uk.coffee
translated some more strings
2015-06-15 10:02:24 +03:00
David Liu
1c633a8ee4 Show correct achievement earned dates on user page
fixes #2524
2015-06-14 15:40:14 -07:00
Arthur Neves
6cb673e228
i18N press enter on spell view 2015-06-14 23:20:49 +02:00
Nick Winter
7d637a0a27 Added a couple levels' next-campaign links. 2015-06-14 11:07:21 -07:00
Nick Winter
b1680f500b Merge branch 'master' of https://github.com/codecombat/codecombat 2015-06-14 11:06:48 -07:00
Nick Winter
ac2039c81a Merged fr.coffee. 2015-06-14 11:06:15 -07:00
Ikuyadeu
3f3f44038e Update ja.coffee 2015-06-14 17:11:26 +09:00
Kevin Avignon
e263866a3a Made some update within the spanish file 2015-06-13 23:33:48 -04:00
Kevin Avignon
c806b8865e Made some changes into the french file 2015-06-13 11:39:25 -04:00
Imperadeiro98
2f9e9b1b67 Merge pull request #2818 from Zleep-Dogg/da-translation
A bit of Danish translation pt. 2
2015-06-11 11:24:26 +01:00
Esben Madsen
db25007765 A bit of Danish translation pt. 2 2015-06-11 00:35:56 +02:00
Nick Winter
a85d52ebe2 Made a tabbed interface for Programmaticon V's Vector and standard library documentation. 2015-06-10 15:18:37 -07:00
Esben Madsen
8293c717a1 A bit of Danish translation 2015-06-10 01:05:12 +02:00
Imperadeiro98
1383d4c9b7 Merge pull request #2813 from Danylo-Dubinin/patch-3
translate few strings
2015-06-09 19:44:56 +01:00
Nick Winter
bb417e9a97 Tweaked glacier terrain generation to work similarly to dungeon (still needs flare) for #2812. 2015-06-09 11:23:05 -07:00
Danylo Dubinin
c0f05e7c86 translate few strings 2015-06-09 18:42:20 +03:00
nemoyatpeace
e0e62271b4 Added Ice Level to terrain generator 2015-06-09 18:30:40 +08:00
Imperadeiro98
66c126a8df Update pt-PT.coffee 2015-06-08 23:39:34 +01:00
Imperadeiro98
c1d8022f35 Merge pull request #2811 from Danylo-Dubinin/patch-2
Improve translation, add infinite loop
2015-06-08 22:35:17 +01:00
Nick Winter
4e08d453b7 Added some code for the glacier world. 2015-06-08 13:20:54 -07:00
Danylo Dubinin
fe8c680fb1 Improve translation, add infinite loop
Better translation of "comment out" phrase and correct translation of "rewind and fast-forward".
2015-06-08 21:45:51 +03:00
Imperadeiro98
fa273d7535 Update pt-PT.coffee 2015-06-08 18:19:27 +01:00
Matt Lott
021ff541e4 Add separate school field for teacher survey 2015-06-08 06:39:30 -07:00
Imperadeiro98
a9f8a7b1be Fixed some typos 2015-06-08 14:32:55 +01:00
Matt Lott
78004a0a94 Trial requests localization typo
Adding missing period at end of approved sentence.
2015-06-08 06:27:40 -07:00
Matt Lott
9b37c9f18a 🐛Fix trial request onclick 2015-06-08 06:27:40 -07:00
Imperadeiro98
198806bfc9 Removed hard-coded strings...
... from teachers-free-trial.jade
2015-06-08 14:16:24 +01:00
Imperadeiro98
6960358850 Update pt-PT.coffee 2015-06-07 22:58:54 +01:00
Imperadeiro98
b9b36d5fea Update en.coffee 2015-06-07 22:54:39 +01:00
Nikita Gryzlov
730a0f5e36 Propageted i18n 2015-06-07 23:09:03 +03:00
Danylo Dubinin
dd5ac2eda6 'viking' translation, 'fight' mistake fix
Правильніше "У бій!" за правилами вживання прийменників у/в.
2015-06-07 19:21:15 +03:00
Nick Winter
0d99b07bc3 Made it so that high scores and level victories are not achieved when playing changed levels from inside the level editor. Some additions for Nalfar. 2015-06-05 17:02:37 -07:00
Imperadeiro98
3f23598c60 Update teacher trial copy 2015-06-05 23:44:31 +01:00
Matt Lott
12b28234a7 Update teacher trial copy 2015-06-05 15:18:47 -07:00
Nick Winter
ccd96122e1 Tweaked Nalfar's hero modal positioning. 2015-06-05 15:13:22 -07:00
Imperadeiro98
7b92bf8c84 Updated i18n in en.coffee 2015-06-05 20:49:08 +01:00
Imperadeiro98
df9a115eb0 Added i18n to teachers-free-trial.jade 2015-06-05 20:49:03 +01:00
Imperadeiro98
10937bfaf8 Minor changes to teachers.jade 2015-06-05 20:46:32 +01:00
Matt Lott
02095a8ddd Update teacher survey email validation
Removing restrictive regex matching.
2015-06-05 11:47:12 -07:00
Imperadeiro98
b0c6b50062 Indentation fixes to last merge 2015-06-05 15:03:05 +01:00
Imperadeiro98
445a3f736e Merge pull request #2805 from lucasangelon/master
Updated pt-BR.coffee
2015-06-05 15:00:21 +01:00
Matt Lott
d7cddcb136 Teacher trial subscription form
Add a teacher survey form for applying for a free trial subscription
for evaluation purposes.
Add an admin trial requests review page, where admins can approve/deny
requests.
2015-06-05 06:48:19 -07:00
Matt Lott
d0f9456024 Admin dashboard width 100% 2015-06-05 06:48:19 -07:00
LucasAngelon
920aed7910 Updated pt-BR.coffee
Uncommented the remaining translations =].
2015-06-05 12:19:27 +08:00
LucasAngelon
7940857dc6 Updated pt-BR.coffee
Translated a few things on the file~

I saw the clans and account_invoices section titles commented out and
was unsure about what to do with them. Translated the items related to
them but left them commented out.
2015-06-04 23:39:04 +08:00
Imperadeiro98
b1e1a1d13c Some fixes to last merge 2015-06-03 19:56:26 +01:00
Imperadeiro98
b6bcc41a31 Merge pull request #2804 from Kavignon/Translator
Updated the french file
2015-06-03 19:52:52 +01:00
Kevin Avignon
2d20ae987a Commited changes in the fr coffee script file 2015-06-03 14:48:01 -04:00
Imperadeiro98
0e7314cf4e Merge pull request #2799 from Ikuyadeu/patch-1
Update ja.coffee
2015-06-02 20:14:38 +01:00
Matt Lott
ad1cf1cd15 Update /teachers copy 2015-06-02 07:25:55 -07:00
Matt Lott
54623f5e30 🐛Fix admin dashboard target line 2015-06-02 07:06:31 -07:00
Ikuyadeu
336cdc2c7a Update ja.coffee 2015-06-02 17:50:39 +09:00
Imperadeiro98
273b3156e0 Merge pull request #2797 from nixel2007/master
Propaganation + ru.coffee
2015-06-01 22:42:41 +01:00
Cat Sync
a3588b2801 Yellow arrow shouldn't point to disabled levels 2015-06-01 17:39:55 -04:00
Nikita Gryzlov
f590333d77 Update ru.coffee
tip_scrub_shortcut
2015-05-31 13:45:24 +03:00
Nikita Gryzlov
43e514950e Propagated i18n 2015-05-31 13:44:43 +03:00
Nikita Gryzlov
8d25d2cba2 Update en.coffee
Add {change} to last commit
2015-05-31 13:43:25 +03:00
Max Lyashuk
05c1ecd13d Translate some new strings in uk.coffee 2015-05-30 22:04:28 +03:00
Imperadeiro98
aea4ac9d19 Merge pull request #2794 from aliceinwire/patch-2
Update ja.coffee
2015-05-29 14:52:52 +01:00
Imperadeiro98
bc29f7303b Fixed sv.coffee 2015-05-29 14:48:19 +01:00
Alice Ferrazzi
179af18478 Update ja.coffee 2015-05-29 16:39:31 +09:00
Imperadeiro98
5a272f8bed Fixed last merge 2015-05-28 21:54:27 +01:00
Imperadeiro98
b9de6dbc9d Merge pull request #2792 from Lego3/swedish_updates_3
Fixes and additions to the Swedish localization
2015-05-28 21:49:24 +01:00
Edvin Linge
ef5bd0368a Fixes and additions to the Swedish localization 2015-05-28 22:03:29 +02:00
Marco Fras
02c9080838 Translated "contribute" page 2015-05-28 21:55:15 +02:00
Alice Ferrazzi
c8f5871b90 Update ja.coffee 2015-05-28 13:01:43 +09:00
rohmunhoz
332cf728d1 Update pt-BR.coffee
Translated many strings
2015-05-27 16:21:46 -03:00
Imperadeiro98
f2fb8610b7 Uncommented headers 2015-05-27 17:23:29 +01:00
Imperadeiro98
35efc6c640 Merge pull request #2787 from KisgadoB/patch-3
Update hu.coffee
2015-05-27 17:22:07 +01:00
Imperadeiro98
d175085626 Merge pull request #2781 from KisgadoB/patch-2
Update hu.coffee
2015-05-27 17:20:43 +01:00
Nick Winter
9e2c29403b Re-fixed #2753. 2015-05-26 17:02:59 -07:00
Nick Winter
c915ff1d94 Merged zh-HANS.coffee. Fixed tab indentations. 2015-05-26 16:59:19 -07:00
KisgadoB
600216aa9e Update hu.coffee 2015-05-26 09:14:30 +02:00
Nick Winter
9dedf04f56 Added Uzbek (uz) language stub. 2015-05-25 16:01:12 -07:00
Nick Winter
86d7b6c625 Added Uzbek (uz) language stub. 2015-05-25 16:00:32 -07:00
Imperadeiro98
1af308424f Merge pull request #2774 from Atomk/patch-2
Added my username in Italian translators
2015-05-24 12:18:02 +01:00
Imperadeiro98
e320bbbed5 Merge pull request #2783 from Atomk/patch-9
Update it.coffee
2015-05-23 20:19:46 +01:00
Marco Fras
cfc8147b31 Update it.coffee
Added a few translations regarding patches.
2015-05-23 10:57:06 +02:00
Marco Fras
536c422185 Small fix in a translated string 2015-05-23 10:42:27 +02:00
Marco Fras
5995f7d6a2 Update it.coffee 2015-05-23 10:38:49 +02:00
KisgadoB
7eeaf3385c Update hu.coffee 2015-05-22 21:01:45 +02:00
Marco Fras
355efdd78d Update it.coffee 2015-05-21 23:07:10 +02:00
Imperadeiro98
7f09e8f1f1 Merge pull request #2778 from Atomk/patch-5
Fixed a missing "to" in a string
2015-05-21 21:13:29 +01:00
Marco Fras
0f0143925d Update en.coffee
I added "use" because it seems more suitable than "click".
2015-05-21 21:38:15 +02:00
Imperadeiro98
8d1fc92f4a Uncommented translations 2015-05-21 16:56:22 +01:00
Imperadeiro98
506801cdda Merge pull request #2777 from lynxlynxlynx/patch-1
sl.coffee: minor translations
2015-05-21 16:54:59 +01:00
Cat Sync
b38c7b4978 Next Level arrow shouldn't point to Kithgard Mastery 2015-05-21 11:30:37 -04:00
Imperadeiro98
3c203f13ff Fixed indentation 2015-05-21 14:50:57 +01:00
Marco Fras
0cfb4f5c6b Update it.coffee 2015-05-21 11:39:27 +02:00
Marco Fras
a3e3bdc125 Fixed a missing "to" in a string 2015-05-21 10:36:25 +02:00
Jaka Kranjc
f8293670b3 sl.coffee: minor translations 2015-05-21 09:19:49 +02:00
Imperadeiro98
8cc13e0829 Fixed indentation 2015-05-20 19:24:26 +01:00
Marco Fras
1f2df9f971 Update it.coffee 2015-05-20 19:51:28 +02:00
Imperadeiro98
bafef886cb Merge pull request #2773 from Atomk/patch-1
Update it.coffee
2015-05-20 15:41:09 +01:00
Imperadeiro98
4721143346 Update pt-PT.coffee 2015-05-20 15:34:06 +01:00
Marco Fras
6db448b6c6 Added my username in Italian translators
Just red on the diplomat forum to do this..
2015-05-20 15:15:34 +02:00
Marco Fras
e9c3b68eb8 Update it.coffee
Just fixed tons of typos and bad translations, more fixes to come (this file is huge)
2015-05-20 01:25:11 +02:00
Imperadeiro98
21ce4eb8e1 Uncommented an header 2015-05-18 22:59:02 +01:00
Imperadeiro98
e64435e409 Merge pull request #2771 from dedalcom/patch-1
Update bg.coffee
2015-05-18 22:58:08 +01:00
Nick Winter
4c2c896496 Hacky fix for Kithgard Mastery walls not updating properly after dynamically being spawned. 2015-05-18 14:30:17 -07:00
dedalcom
724d76ac84 Update bg.coffee 2015-05-18 13:39:28 +03:00
bignova
59b15fcf82 Update zh-HANS.coffee 2015-05-17 23:22:12 -04:00
Nikita Gryzlov
6e62e3deb9 Propagated i18n 2015-05-18 00:05:23 +03:00
Imperadeiro98
ef7281a9bd Merge pull request #2768 from nixel2007/master
Update ru.coffee
2015-05-17 20:29:09 +01:00
Nikita Gryzlov
6a66a03998 Update ru.coffee. Clans, misc. 2015-05-17 21:36:17 +03:00
Nikita Gryzlov
b29391b188 ru.coffee. Tips 2015-05-17 21:07:38 +03:00
FedericoTomas
976df82f5e Update es-419.coffee
Updated my friends!.
2015-05-17 06:54:53 -03:00
Imperadeiro98
461a7c9c49 Merge pull request #2762 from Imperadeiro98/master
Updated i18n for clans
2015-05-16 19:36:56 +01:00
Imperadeiro98
a56807bcac Updated i18n (part 3) 2015-05-16 19:32:00 +01:00
Imperadeiro98
32b4a7d76f Updated i18n (part 3) 2015-05-16 19:31:40 +01:00
Imperadeiro98
323d5c5c2d Updated i18n (part 2) 2015-05-16 19:25:07 +01:00
Imperadeiro98
bfd18471a5 Updated i18n (part 2) 2015-05-16 19:24:49 +01:00
wgsu
81dd640a5c Update zh-HANS.coffee 2015-05-16 11:52:04 -04:00
wgsu
0155bd02ba few more translation
Since I don't how the payment for the server in China work, I don't want to mess up your teacher section.
2015-05-16 11:35:48 -04:00
Imperadeiro98
e88aff1339 Updated i18n (part 1) 2015-05-16 14:46:00 +01:00
Imperadeiro98
a2b846e3fd Updated i18n 2015-05-16 14:45:51 +01:00
Imperadeiro98
74380cc94a Updated i18n (part 1) 2015-05-16 14:31:24 +01:00
Imperadeiro98
482d795146 Updated i18n 2015-05-16 14:16:13 +01:00
Imperadeiro98
ec9906c9ae Updated i18n 2015-05-16 13:58:23 +01:00
Imperadeiro98
8a1bbec80e Updated i18n 2015-05-16 13:57:46 +01:00
Imperadeiro98
6dbb9dd72b Updated i18n 2015-05-16 13:55:41 +01:00
Nikita Gryzlov
ff8be31cb5 Propagated i18n. 2015-05-16 00:11:37 +03:00
Matt Lott
a881443bf2 🐛Fix admin dashboard typo 2015-05-15 09:56:06 -07:00
Imperadeiro98
7a87b59988 Removed blank line 2015-05-14 20:07:07 +01:00
Nick Winter
c7c27d3208 Added missing half of recent loading quotes addition. 2015-05-14 11:30:14 -07:00
Lokendra Sharma
4abfc088bf added more quotes for #710 2015-05-14 15:56:59 +05:30
nixel2007
fd8e798034 Update ru.coffee 2015-05-13 17:46:45 +03:00
Matt Lott
ee2540dcf2 🐛Fix choose hero icon widths
Fixes #2753
2015-05-12 20:49:08 -07:00
Nick Winter
213a66b2ab Implemented Arryn. 2015-05-12 16:59:30 -07:00
Matt Lott
81ec591b50 Swap teachers and blog menu links 2015-05-12 15:24:03 -07:00
Matt Lott
959fe434ea Update /teachers site license copy
We don’t support site licenses yet, but can do one-time bulk purchases.
2015-05-12 15:18:42 -07:00
Matt Lott
896205bdf9 Use live version of Stripe checkout
Fixes #2639
2015-05-11 21:26:06 -07:00
Nick Winter
b7d1ab2b01 Not sending HipChat messages for level load errors. Not sending level load errors for level editor loads. Not sending more than one level load error report per session. 2015-05-11 18:53:42 -07:00
Matt Lott
3072e5f198 Merge pull request #2745 from stephenfloydwallace/patch-2
"Added more names for #53"
2015-05-11 11:13:59 -07:00
Matt Lott
6dc51e27e4 🐛Admin dashboard deleted users
Also disabling invoice caching to see if that is what causes invalid
sub end counts.
2015-05-11 10:37:44 -07:00
Edvin Linge
de59c56ec8 Added a bunch of Swedish translations 2015-05-09 22:29:04 +02:00
stephenfloydwallace
06e678b930 "Added more names for #53"
This time in alphabetical order and without comma's
2015-05-09 17:52:51 +02:00
Matt Lott
dd35a1eb76 Include sponsored cancels in dashboard
Also includes free teacher sub cancels, which should be an
insignificant number.
2015-05-08 11:34:59 -07:00
Matt Lott
0353be4fc4 Add recent cancellations table to dashboard 2015-05-06 15:23:46 -07:00
Imperadeiro98
27b2b53943 Added a spr to replace a spl 2015-05-06 18:07:17 +01:00
VicYu
60fb8426c1 improved Chinese localization
1.Modify some wording error
2.Translated some items
2015-05-06 17:29:46 +08:00
Matt Lott
713f72f5e1 Merge pull request #2723 from Catsync/fixYellowArrow
Yellow arrow shouldn't point to replayable levels
2015-05-05 20:52:15 -07:00
Matt Lott
37804f07aa Merge pull request #2718 from motoko-11/patch-1
Added more names for #53
2015-05-05 20:47:58 -07:00
Matt Lott
e2f18de220 Update /teachers page copy
Add blurb about one-time purchase site license option.
2015-05-05 20:33:37 -07:00
Matt Lott
103abdbfb0 Add teachers forum link to /teachers page 2015-05-05 15:35:22 -07:00
Matt Lott
901c0ed085 Update managed subscriptions copy
Add blurb about recipients needing to be existing CodeCombat users
2015-05-05 15:18:35 -07:00
Matt Lott
bf20d5f7be Add level to Inventory Play analytics event 2015-05-05 15:05:18 -07:00
Imperadeiro98
4f43139f9f Uncommented some headers 2015-05-03 21:21:21 +01:00
Edvin Linge
707c098472 Added some Swedish translation 2015-05-03 18:55:34 +02:00
Cat Sync
42aaba6278 Yellow arrow shouldn't point to replayable levels 2015-05-02 00:15:42 -04:00
Matt Lott
dce8005169 Fix admin dashboard monthly churn
Monthly churn = cancelled during last month / total at beginning of
month
2015-05-01 17:26:22 -07:00
Matt Lott
5305d80887 Add conversion info to admin dashboard 2015-05-01 09:37:47 -07:00
Lokendra Sharma
eb13de9f34 Added more names for #53
First contrib. Don't know where else to start.
2015-05-01 16:43:49 +05:30
Imperadeiro98
8b9c12e685 Merge pull request #2716 from ameer157/patch-1
translated "weapons" into arabic
2015-04-30 22:02:17 +01:00
Nick Winter
def6709c52 Added /identify page. 2015-04-30 13:36:32 -07:00
Amir Off
d8955d3389 add epic paladin female name 2015-04-30 20:41:33 +03:00
Amir Off
dcb9df32bd translated "weapons" into arabic 2015-04-30 20:30:54 +03:00
Matt Lott
e576557bba Update private clans dashboard preview 2015-04-29 11:52:23 -07:00
Nick Winter
1a1da2924f Noticed Chrome 30 wasn't working for Gems in the Deep, so recommending 31+ instead of 25+. 2015-04-28 14:49:10 -07:00
Imperadeiro98
e11e8a8966 Fixed last merge 2015-04-28 19:44:34 +01:00
Imperadeiro98
cf8240c400 Merge pull request #2713 from YukiUeda/patch-1
Translate ja.cofee on Achizan
2015-04-28 19:42:51 +01:00
Matt Lott
03bf357a84 Update /teachers copy 2015-04-28 11:35:24 -07:00
Matt Lott
f7503f5dba Expanded progress private clans toggle
Expand option for level bubbles in the private clan dashboard.
2015-04-28 10:31:35 -07:00
Matt Lott
a995fb938b Update clans UI
Update private clans dashboard to show level progression in order, and
visually indicate which levels are not completed/started/completed.
Update private clans blurb and screenshot.
Subscribe prompt on make private clan checkbox.
2015-04-28 09:22:58 -07:00
YukiUeda
7b05fbf84e Translate ja.cofee on Achizan 2015-04-28 20:29:40 +09:00
Nicolas Kaiser
2f5cb0c8cd Fix typos in de-DE.coffee
line 4: According to [1], "Leid tun" was actually an accepted spelling between 1996 and 2006.
line 839: Imperative form [2]

[1] http://www.korrekturen.de/wortliste/leidtun.shtml
[2] http://www.duden.de/rechtschreibung/beitreten
2015-04-27 14:11:38 +02:00
Nicolas Kaiser
4416332938 Fix typos in en.coffee 2015-04-26 20:16:25 +02:00
Nick Winter
520a08a39c Merge pull request #2699 from lewishenson/patch-1
Added more male knight names for #53
2015-04-26 09:55:40 -07:00
Imperadeiro98
5a3f368960 Uncommented some strings from last merge 2015-04-26 16:52:07 +01:00
YrlaCharlotta
ef71b22cab Update sv.Coffee 2015-04-26 17:19:40 +02:00
Imperadeiro98
0498d125e6 Some fixes to last merge 2015-04-26 14:50:09 +01:00
Imperadeiro98
b6cb601973 Merge pull request #2705 from LikeMyGeek/master
Traduction en cours
2015-04-26 14:47:26 +01:00