Nick Winter
4329861bc4
Merge pull request #2812 from nemoyatpeace/patch-6
...
Added Ice Level to terrain generator
2015-06-09 11:13:48 -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
1dab44f1bf
Merge branch 'master' into production
2015-06-08 13:23:31 -07: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
1da13b33c3
Merge branch 'master' into production
2015-06-08 07:16:41 -07: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
Imperadeiro98
a421a401f7
Merge pull request #2810 from nixel2007/master
...
Propageted i18n
2015-06-07 22:40:08 +01:00
Nikita Gryzlov
730a0f5e36
Propageted i18n
2015-06-07 23:09:03 +03:00
Imperadeiro98
86c283aec3
Merge pull request #2809 from Danylo-Dubinin/patch-1
...
'viking' translation, 'fight' mistake fix
2015-06-07 20:42:08 +01:00
Danylo Dubinin
dd5ac2eda6
'viking' translation, 'fight' mistake fix
...
Правильніше "У бій!" за правилами вживання прийменників у/в.
2015-06-07 19:21:15 +03:00
Nick Winter
9ee8734c62
Merge branch 'master' into production
2015-06-05 17:02:55 -07: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
Matt Lott
251fcf05fd
Merge branch 'master' into production
2015-06-05 15:12:36 -07:00
Matt Lott
32b10b33e4
Update gem charge statement descriptors
...
Shown on bank statements and credit bills.
2015-06-05 14:58:44 -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
Matt Lott
e46613bf7f
Update trial request hipchat msg
...
Link to trial-requests approval page.
2015-06-05 11:27:53 -07:00
Matt Lott
b27a4539f1
Merge branch 'master' into production
2015-06-05 10:38:20 -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
a85e6fb695
Removed unnecessary full stop
2015-06-02 21:34:01 +01: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