Commit graph

11937 commits

Author SHA1 Message Date
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
ae9fe53889 Merge branch 'for-fixing-translation-bug' into codecombat/master 2015-08-22 18:44:42 -04:00
AkaKaras
00c0136542 Merge branch 'master' into for-fixing-translation-bug 2015-08-22 18:43:31 -04:00
AkaKaras
988ebd22a3 Merge remote-tracking branch 'codecombat/master' into for-fixing-translation-bug 2015-08-22 18:43:01 -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
Imperadeiro98
9e8e61aa2d Merge pull request #2965 from christotsvetanov/master
Another portion of the translation
2015-08-22 12:08:37 +01: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
AkaKaras
f6e3800970 Merge remote-tracking branch 'codecombat/master' 2015-08-21 11:28:33 -04: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
Imperadeiro98
178f9fd608 Merge pull request #2958 from AkaKaras/patch-4
just translate few sentences
2015-08-21 14:31:36 +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
86b076fde0 Merge branch 'master' into production 2015-08-21 03:28:35 -07:00
Nick Winter
256b19d331 More improvements and fixes for league ladder pages. 2015-08-21 03:28:25 -07:00
Nick Winter
8c3f4d92d2 Merge branch 'master' into production 2015-08-20 15:21:52 -07:00
Nick Winter
20c6248dba Added rough army power indicator to DuelStatsView. 2015-08-20 15:21:05 -07:00
Imperadeiro98
69fd4a55e7 Merge pull request #2957 from christotsvetanov/master
Another portion of the translation
2015-08-20 22:36:15 +01: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
96b838da03 Fixed league-based simulation randomness. 2015-08-20 05:54:10 -07:00
Nick Winter
9712c95b4a Added script to add clan leagues to sessions. 2015-08-20 05:53:46 -07:00
Nick Winter
f34dd7c70e Merge branch 'master' into production 2015-08-19 15:35:30 -07: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
d86aa747bc Merge branch 'master' into production 2015-08-19 12:24:33 -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
Imperadeiro98
4503483535 Merge pull request #2954 from AkaKaras/patch-3
add few translations
2015-08-19 11:38:57 +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