Imperadeiro98
20371fa146
Indentation re-fix
2015-10-13 16:14:43 +01:00
Nick Winter
d776809e1c
Update Hour of Code student flow and tracking, remove signup requirement
2015-10-13 08:12:07 -07:00
Imperadeiro98
2b8856aead
Fixed indentation
2015-10-13 16:08:20 +01:00
Imperadeiro98
fbfb80d4bf
Added i18n to some strings
2015-10-13 16:05:47 +01:00
Imperadeiro98
c969768800
Merge pull request #3104 from tufik000/patch-2
...
Link to Ace of Coders
2015-10-13 14:58:22 +01:00
Matt Lott
4a85290af8
Merge branch 'master' into production
2015-10-12 21:14:09 -07:00
Matt Lott
eda10a55ec
Update /courses?_ppc= logged out instructions
2015-10-12 21:13:03 -07:00
AkaKaras
dc874e554f
Merge remote-tracking branch 'codecombat/master' into translation
2015-10-12 21:56:09 -04:00
Scott Erickson
66650452b2
Merge remote-tracking branch 'origin/master'
2015-10-12 16:47:59 -07:00
Scott Erickson
919e0605e9
Add spriteSheets to ThangType, export modal to Thang Editor
...
Units can be exported as rastered sprite sheets. This is the first part of the project,
the second part will be having the game use them.
2015-10-12 16:47:48 -07:00
Scott Erickson
b38a6c5060
Pass all arguments from constructor to initialize in CoreViews, add lodash to default view context
2015-10-12 16:46:30 -07:00
Matt Lott
e1e2be574c
Add teacher HoC instructions to /courses
2015-10-12 16:43:46 -07:00
Matt Lott
2aad347166
Add HoC blurb to top of /teachers pages
...
Replacing courses beta testing blurb.
2015-10-12 16:38:28 -07:00
Matt Lott
708f78153b
Route /hoc to courses
...
When in HoC mode:
Students have an option to play through as a single player, in addition
to entering a code to join an existing class.
Teachers get the normal course enrollment flow, without a sales blurb
on /courses.
2015-10-12 16:25:23 -07:00
AkaKaras
6e2711cd6a
Merge remote-tracking branch 'codecombat/master' into translation
2015-10-12 19:05:23 -04:00
Imperadeiro98
56c4c5a1b3
Merge pull request #3105 from AkaKaras/translation
...
Translation
2015-10-12 22:37:35 +01:00
AkaKaras
1a3ab303be
zh-hant latest translation
...
finally finished the translation, proud of myself (●—●) b
2015-10-12 16:54:14 -04:00
Nick Winter
a187307545
Merge branch 'master' into production
2015-10-12 13:12:45 -07:00
Nick Winter
f723fcbd39
Fix geolocation code
2015-10-12 13:12:34 -07:00
tufik000
00170d6821
Link to Ace of Coders
...
Changed "torneir" to "torneio" and "Era dos Programadores" to "Ás dos Programadores"
2015-10-11 23:02:20 -03:00
Derevianko Liubov
9312d8ad84
added some ru and uk locales
2015-10-11 23:13:07 +03:00
Derevianko Liubov
82c23183c8
added some ru and uk locales
2015-10-11 23:11:20 +03:00
Imperadeiro98
cac0739084
Merge pull request #3101 from HelloSeaNation/patch-2
...
Fix another typo
2015-10-11 20:01:57 +01:00
Imperadeiro98
2832a57a24
Merge pull request #3100 from HelloSeaNation/patch-1
...
Fix typo
2015-10-11 20:01:46 +01:00
AkaKaras
3325b91b5a
Merge remote-tracking branch 'codecombat/master' into translation
...
Conflicts:
app/locale/zh-HANT.coffee
2015-10-11 09:15:45 -04:00
AkaKaras
f6217a5626
zh-hant
...
translation
2015-10-11 09:15:28 -04:00
Nick Winter
ec685078b8
Merge pull request #3102 from Imperadeiro98/cleanup
...
Remove duplicated key
2015-10-10 13:57:40 -07:00
Imperadeiro98
b046be44f3
Remove duplicated key
2015-10-10 21:52:31 +01:00
HelloSeaNation
e75413fbe2
Fix another typo
2015-10-11 00:56:37 +13:00
HelloSeaNation
727dce6f2c
Fix typo
2015-10-11 00:54:59 +13:00
Imperadeiro98
eb3d4ce5f4
Merge pull request #3099 from kumabotz/patch-1
...
Some zh-HANS translations
2015-10-10 11:11:44 +01:00
Tery Lim
0b9e78e2b8
Some zh-HANS translations
...
- Translate `prepaid`
- Change `codecombat` => `CodeCombat`
2015-10-10 22:38:21 +13:00
Imperadeiro98
7445987061
Merge pull request #3098 from kumabotz/patch-3
...
Update harry's tips
2015-10-10 10:34:42 +01:00
Tery Lim
124b61a70c
Update harry's tips
...
`Yer a Wizard,`
2015-10-10 21:42:02 +13:00
Matt Lott
9ae463ed24
Remove perf killing 'add' event handler from /account/prepaid
2015-10-09 16:03:22 -07:00
Matt Lott
c4763c97b8
Merge branch 'master' into production
2015-10-09 15:54:30 -07:00
Matt Lott
67d088262c
🐛 Fix user admin query tests
2015-10-09 15:54:05 -07:00
Matt Lott
4c763a86ce
Merge branch 'master' into production
2015-10-09 14:26:54 -07:00
Matt Lott
8fce82ce72
Update trial requests approval page query to grab latest
...
Used to be limited to first 2000 requests, which was hit on 10/7/15.
2015-10-09 14:26:04 -07:00
Matt Lott
2d8d107a58
Update Handler admin get query params
...
Unclear how this was supposed to work before these changes.
2015-10-09 14:26:04 -07:00
Scott Erickson
2a739ea765
Remove placeholder text in invite email box in course details page
...
Already duplicated it outside of the textbox, so it'd be visible even after an email had been entered. This is just removing the old placement.
2015-10-09 13:45:33 -07:00
Matt Lott
9a0b98890c
Merge branch 'master' into production
2015-10-09 09:33:36 -07:00
Matt Lott
0cb30d9500
Prompt for login in /courses redeem code dialog
2015-10-09 09:32:46 -07:00
Matt Lott
1bd5078ecf
🐛 Sort course details nameless members
2015-10-09 09:27:30 -07:00
Imperadeiro98
a74a09a532
Added change to a string
2015-10-09 16:37:19 +01:00
Imperadeiro98
50961e2c68
Update pt-PT.coffee
2015-10-09 16:31:19 +01:00
Nick Winter
b51a933a11
Merge branch 'master' into production
2015-10-09 08:05:51 -07:00
Nick Winter
5dde55c1f3
Add premium server recognition for Brazil
2015-10-09 08:05:34 -07:00
RUSLAN LÓPEZ CARRO
dcab1eecc0
Update en.coffee
2015-10-09 09:39:15 -05:00
RUSLAN LÓPEZ CARRO
5ff287a511
Update level_loading.jade
2015-10-09 09:35:30 -05:00