Commit graph

6942 commits

Author SHA1 Message Date
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
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