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
Nikita Gryzlov
f590333d77
Update ru.coffee
...
tip_scrub_shortcut
2015-05-31 13:45:24 +03:00
Nikita Gryzlov
43e514950e
Propagated i18n
2015-05-31 13:44:43 +03:00
Nikita Gryzlov
8d25d2cba2
Update en.coffee
...
Add {change} to last commit
2015-05-31 13:43:25 +03:00
Imperadeiro98
187c7c6487
Merge pull request #2796 from probil/patch-2
...
Translate some new strings in uk.coffee
2015-05-30 21:37:30 +01:00
Max Lyashuk
05c1ecd13d
Translate some new strings in uk.coffee
2015-05-30 22:04:28 +03:00
Imperadeiro98
aea4ac9d19
Merge pull request #2794 from aliceinwire/patch-2
...
Update ja.coffee
2015-05-29 14:52:52 +01:00
Imperadeiro98
bc29f7303b
Fixed sv.coffee
2015-05-29 14:48:19 +01:00
Alice Ferrazzi
179af18478
Update ja.coffee
2015-05-29 16:39:31 +09:00
Matt Lott
9812986655
Enable more server subs tests for Travis
2015-05-28 16:56:13 -07:00
Matt Lott
9828bd5d1d
Sponsored sub cleanup on unsubscribe
...
Sponsored subscriptions can be partially set up when the incremental
subscription charge fails. This cleans up the sponsored subscriptions
when one of the recipient subscriptions is cancelled.
Related to #2786
2015-05-28 16:56:13 -07:00
Imperadeiro98
5a272f8bed
Fixed last merge
2015-05-28 21:54:27 +01:00
Imperadeiro98
b9de6dbc9d
Merge pull request #2792 from Lego3/swedish_updates_3
...
Fixes and additions to the Swedish localization
2015-05-28 21:49:24 +01:00
Imperadeiro98
1e656ddabd
Merge pull request #2791 from Atomk/patch-10
...
Translated "contribute" page
2015-05-28 21:48:21 +01:00
Edvin Linge
ef5bd0368a
Fixes and additions to the Swedish localization
2015-05-28 22:03:29 +02:00