Nick Winter
aae44c2064
Further fix for DiplomatView including Esperanto.
2015-03-19 10:18:53 -07:00
Nick Winter
902bee1f91
Merge branch 'master' into production
2015-03-19 10:02:52 -07:00
Imperadeiro98
e1a6156345
Requiring Esperanto in Diplomat page...
...
... so that it doesn't break. It would be nice if the languages could be loaded from locale/locale.
2015-03-19 16:26:00 +00:00
Nick Winter
7a9158c2e7
Merge branch 'master' into production
2015-03-19 08:37:44 -07:00
Nick Winter
6b372ec82e
Adding Esperanto stub.
2015-03-19 08:36:35 -07:00
Nick Winter
c6cd7b032d
Fixed Alipay auto locale detection.
2015-03-18 17:17:30 -07:00
Nick Winter
330808f936
Merge branch 'master' into production
2015-03-18 16:21:44 -07:00
Nick Winter
f9d9b0985b
Merge pull request #2540 from nixel2007/master
...
Add "Translated Name" to /i18n
2015-03-18 16:21:34 -07:00
Nick Winter
585fa40a8c
Added first draft of campaign info to campaign selector screen.
2015-03-18 16:20:30 -07:00
nixel2007
9b509fa83e
Add "Translated Name" to /i18n
2015-03-19 01:44:23 +03:00
Imperadeiro98
a004c8376c
Merge pull request #2539 from ChaosCat/patch-4
...
Update he.coffee
2015-03-18 20:57:03 +00:00
Shady Kamal
216579d95b
Update he.coffee
...
finished the essentials and I took my time to check the translation, I wasn't active since I worked onmy projects now the steps remaining are
1) finishing the miscellenious translations (teachers, community, editors etc...)
2) fixing the right to left problem (probably by just using the mechanics of the text editor differently[reorganizing brackets, dots, commas, language mixed sentences and so on...])
3) altering other files to support sending the subscription message according to user's gender since there is no way to representboth gender in the same form (Could you please direct me to the files that I need to edit to send the message?)
2015-03-18 22:08:54 +02:00
Imperadeiro98
d6043d4572
Uncommented an header from last merge
2015-03-18 18:06:45 +00:00
Imperadeiro98
1ddbbdfbcd
Merge pull request #2538 from pettevi/patch-1
...
Update fi.coffee
2015-03-18 18:01:44 +00:00
Imperadeiro98
4b7f9366dc
Removed "Experimental" from Lua...
...
... and added to CoffeeScript
2015-03-18 17:58:29 +00:00
petteri
b98b621eb3
Update fi.coffee
...
Removed few # from category-tags and fixed typos
2015-03-18 13:20:56 +02:00
petteri
d36e2863c9
Update fi.coffee
...
Added more translations
2015-03-18 09:18:23 +02:00
petteri
1cfaf76bd1
Update fi.coffee
...
Added more translations here and there
2015-03-18 09:06:03 +02:00
Nick Winter
792e65767d
I could try to compile it first, I guess.
2015-03-17 22:04:30 -07:00
Nick Winter
8af94209b4
Lua is not experimental any more. (But CoffeeScript is.)
2015-03-17 22:02:15 -07:00
Nick Winter
3118821f9e
Merge branch 'master' into production
2015-03-17 21:26:14 -07:00
Nick Winter
3236abc5da
Added emphasis for Apocalypse.
2015-03-17 21:20:26 -07:00
Nick Winter
5e80bb60d0
Fixed scrolling issue on background on i18n edit pages.
2015-03-17 16:30:59 -07:00
Nick Winter
d0cb6d1c0c
Merge pull request #2537 from nixel2007/patch-1
...
Removing invoices from /account
2015-03-17 16:07:24 -07:00
Nikita Gryzlov
2c4be8bdda
Removing invoices from /account
...
As said at https://github.com/codecombat/codecombat/pull/2527#issuecomment-82609513
2015-03-18 01:23:40 +03:00
Imperadeiro98
9913a155c7
Some styling updates to account-settings-view.sass
2015-03-17 18:57:16 +00:00
Imperadeiro98
1a039ff3cc
Uncommented some strings from last merge
2015-03-17 18:42:39 +00:00
Imperadeiro98
0ceebbf4e5
Merge pull request #2536 from pettevi/patch-1
...
Update fi.coffee
2015-03-17 18:37:51 +00:00
petteri
7aa355c320
Update fi.coffee
...
Removed # that I forgot in my last commit
2015-03-17 20:25:36 +02:00
Imperadeiro98
44eef21f36
Merge pull request #2535 from Coderaulic/patch-2
...
Update ja.coffee
2015-03-17 18:05:11 +00:00
petteri
b8d92c1027
Update fi.coffee
...
Added more general translations
2015-03-17 18:43:22 +02:00
Nick Winter
c5942c65f3
Merge pull request #2534 from Elegy/master
...
Added more names for #53
2015-03-17 09:09:14 -07:00
petteri
962635b6bd
Update fi.coffee
...
Started Finnish translation
2015-03-17 13:08:06 +02:00
Coderaulic
a101c0a6d6
Update ja.coffee
...
Finished translation for Settings:
Minor fixes from previous. One off translations here and there.
2015-03-16 23:31:55 -07:00
Nathan Smith
8f67835d41
Added more names for #53
2015-03-16 20:51:29 -07:00
Nick Winter
0916f1dd61
Style tweaks for #2533 . Fixed #1403 .
2015-03-16 19:50:05 -07:00
Nick Winter
084c01c5b7
Merge pull request #2533 from basicer/patch-1
...
Update vector.coffee
2015-03-16 19:48:43 -07:00
Nick Winter
7e97c5dd58
Merge pull request #2532 from nixel2007/patch-1
...
Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show
2015-03-16 19:24:57 -07:00
Rob Blanckaert
82c2d4d4b5
Update vector.coffee
...
Fix indents.
2015-03-16 21:02:07 -04:00
Rob Blanckaert
0a06022b8f
Update vector.coffee
...
Make Vector do the right thing if you forget new,
2015-03-16 20:56:28 -04:00
Nick Winter
eee15b4b0c
Merge branch 'master' into production
2015-03-16 17:37:54 -07:00
Nick Winter
2d89de8183
Using new Aether optimization options for minimal flow tracking (big performance gains). Trying again to handle random no-window avatar creation error.
2015-03-16 17:36:38 -07:00
nixel2007
38275dd2a9
Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show
2015-03-17 01:15:13 +03:00
Nick Winter
103cbe7996
Merge branch 'master' into production
2015-03-16 14:17:22 -07:00
Nick Winter
8c28247906
Merge pull request #2509 from Imperadeiro98/master
...
Some cleanup to play-items-modal.sass file
2015-03-16 13:55:02 -07:00
Nick Winter
709c2fc4f1
Added more Artisan permissions for Articles.
2015-03-16 13:54:20 -07:00
Nick Winter
4f8b81903b
Propagated i18n.
2015-03-16 13:51:51 -07:00
Nick Winter
e28e3a163e
Merge branch 'pougounias-master'
2015-03-16 13:49:55 -07:00
Nick Winter
116cf24060
Merged el.coffee.
2015-03-16 13:49:45 -07:00
Imperadeiro98
746ea0689d
Merge pull request #2529 from swoeste/patch-1
...
Update de-DE.coffee
2015-03-16 19:36:29 +00:00
