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
b0cb3c8ab8
Merge branch 'master' into production
2015-08-12 11:55:39 -07:00
Nick Winter
49dc71a157
Added a Bloc coupon code after A Mayhem of Munchkins.
2015-08-12 10:25:56 -07:00
Nick Winter
ccf889480f
Removed unnecessary newConsole line in headless client.
2015-08-11 08:50:43 -07:00
Nick Winter
3dac0e4a99
Merge pull request #2932 from trotod/fix-headless-simulator
...
Fix the headless simulator
2015-08-11 05:14:35 -07:00
Imperadeiro98
dcd09137c1
Merge pull request #2934 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-08-11 12:30:04 +01: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
Imperadeiro98
758d84dc12
Merge pull request #2933 from matheusmbar/patch-2
...
Update pt-BR.coffee
2015-08-11 10:57:31 +01:00
Matheus Marques
cad071f384
Update pt-BR.coffee
2015-08-11 02:05:16 -03:00
David Liu
7d64087e29
Fix the headless simulator
...
Shims `lscache`, support io.js < v3.0.0. Make simulating `one-game`
possible.
Tested on Linux with Node.js v0.10.40 and v0.12.7; as well as io.js
v2.5.0.
It still won't work with io.js v3.0.0 because `webworker-threads`
doesn't compile properly, so that's another problem.
2015-08-10 18:12:53 -07: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
6de96e76b6
Merge branch 'master' into production
2015-08-10 06:49:24 -07: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
d101a427ba
Merge branch 'master' into production
2015-08-08 12:26:33 -07:00
Nick Winter
cd0c252b14
Disabled some logging now that chinaVersion appears to be working.
2015-08-08 12:26:20 -07:00
Nick Winter
72199c3548
Propagated i18n.
2015-08-08 11:29:48 -07:00
Nick Winter
c351f09a61
Merge branch 'master' into production
2015-08-08 11:28:49 -07:00
Nick Winter
b8da7f547f
More fixes for geoip stuff.
2015-08-08 11:28:39 -07:00
Nick Winter
79ea3258f1
Added GitHub link to community page.
2015-08-08 10:26:13 -07:00
Nick Winter
e650ab52d4
Merge branch 'master' into production
2015-08-08 09:34:50 -07:00
Nick Winter
a1a6bb368d
Merge pull request #2927 from trotod/fix-poll-keys
...
Fix poll keys when key is a number
2015-08-08 09:33:10 -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
Zacharias Fisches
55634ceefd
Merge pull request #1 from codecombat/master
...
update from master
2015-08-06 16:13:01 +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
4593b7d864
Teacher survey counts per day script
2015-08-05 11:40:57 -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
af92ff1b75
Merge branch 'master' into production
2015-08-04 17:42:09 -07:00
