Commit graph

9554 commits

Author SHA1 Message Date
Matt Lott
f89bb8ac0f Subs dashboard perf
Update sub sponsors API to use payments collection before users
collection to whittle down potential sponsors.
2015-07-28 09:11:55 -07:00
Nick Winter
d07b087c7b Merge branch 'master' into production 2015-07-27 11:35:35 -07:00
Nick Winter
e43addf55b Debugging chinaVersion inconsistencies. 2015-07-27 11:35:20 -07:00
Nick Winter
8cffb68462 Merge pull request #2911 from MichaelRevell/patch-1
Add names for issue #53
2015-07-27 04:25:20 -07:00
Michael Revell
4d27c8682c Add names for issue #52 2015-07-26 19:44:07 -07:00
David Liu
b5d7791e84 Custom hero portraits
Though missing the raider and necromancer from the spritesheet
2015-07-26 12:40:55 -07:00
David Liu
3bf3321411 Fix weird styling on clans details page
- add `display: table-cell` on hero portrait cell
- middle align more things
- `Name` should be a table header
2015-07-26 12:39:43 -07:00
Nick Winter
653dc16207 Merge pull request #2909 from gnerkus/add-thang-names
chore (names.coffee): Add more Thang names for #53
2015-07-26 08:23:25 -07:00
gnerkus
037760e230 chore (names.coffee): Add more Thang names for #53 2015-07-26 15:07:02 +01:00
Nick Winter
1dd5d5c109 Merge pull request #2906 from spkane/loading_tips
Add a tip for the loading screen #710
2015-07-26 04:00:06 -07:00
fabichoi
788156564f Translated some words and sentences 2015-07-25 23:10:34 -04:00
Sean P. Kane
d5f81b8f51 Move tip into correct language file 2015-07-25 19:29:13 -07:00
Nick Winter
5644b5aff9 Merge pull request #2890 from trotod/fix-travis-client-tests
Disable coverage reporter in Travis CI
2015-07-25 18:38:10 -07:00
Nick Winter
2a125d7635 Merge pull request #2905 from spkane/thang_names
Added a few more names for issue #53
2015-07-25 18:36:04 -07:00
Sean P. Kane
6205ff26ae Add a tip for the loading screen #710 2015-07-25 14:05:32 -07:00
Sean P. Kane
758e40c7f6 Added a few more names for issue #53 2015-07-25 13:46:41 -07:00
Imperadeiro98
3c7b79964f Merge pull request #2903 from fabichoi/master
Translated some words.
2015-07-25 20:21:48 +01:00
Nick Winter
85db686e74 Merge branch 'master' into production 2015-07-24 17:38:39 -07:00
Nick Winter
15ecc92abc Adding 'course' type levels. Removing 'campaign' type levels. 2015-07-24 17:37:42 -07:00
Nick Winter
640b33ea16 Merge pull request #2904 from spkane/vmware_ulimits
Add VMware support and fix ulimits
2015-07-24 08:57:33 -07:00
Nick Winter
107f94a08b Fixed another cause of the bug fixed in 0d99b07b with modified levels still granting rewards. 2015-07-24 08:56:20 -07:00
Sean P. Kane
6edbcf2224 Add VMware support and fix ulimits 2015-07-24 08:48:34 -07:00
unknown
c3d07e950a modified 2015-07-23 22:43:43 -04:00
Imperadeiro98
aeff90cba9 Re-added a missing string from last merge 2015-07-23 22:20:55 +01:00
Imperadeiro98
26faed2b22 Merge pull request #2902 from dolom/patch-1
Update it.coffee
2015-07-23 22:18:50 +01:00
dolom
35dcdff3ff Update it.coffee 2015-07-23 22:30:06 +02:00
Imperadeiro98
3d9c7927ea Update pt-PT.coffee 2015-07-23 17:37:49 +01:00
Imperadeiro98
015ed33dbe Updated i18n of delta.jade 2015-07-23 17:35:22 +01:00
Imperadeiro98
f7675d90ee Merge pull request #2900 from matheusmbar/patch-1
Translated some descriptions
2015-07-23 17:09:13 +01:00
Matheus Marques
24d599dcdd Translated some descriptions 2015-07-23 01:50:13 -03:00
Imperadeiro98
89b1b70606 Merge pull request #2899 from bileuze/patch-1
Update pt-BR.coffee
2015-07-22 22:02:11 +01:00
bileuze
c88d8f1666 Update pt-BR.coffee 2015-07-22 14:16:35 -03:00
Imperadeiro98
1b077b2456 Fixed previous merge 2015-07-22 17:59:29 +01:00
Imperadeiro98
8598dc56e4 Merge pull request #2898 from ChaosCat/patch-1
Update he.coffee
2015-07-22 17:54:32 +01:00
Shady Kamal
10afbebe70 Update he.coffee
+I'm back
+add tips translation
+add partial "clans" new feature localization (see notes in code)
2015-07-22 17:21:28 +03:00
Cat Sync
11aeb05e66 Limit to showing 6 concepts. For now, show the last 6 in the array. 2015-07-21 13:28:13 -04:00
Imperadeiro98
b6cbf84f48 Some fixes to last merge 2015-07-20 16:53:28 +01:00
Imperadeiro98
3d105f51ce Merge pull request #2892 from Abdel-Malik13/patch-2
Traduction de l'anglais vers l'arabe
2015-07-20 16:51:29 +01:00
Imperadeiro98
08409f3a3b Merge pull request #2896 from itcbx/master
i18n for zh-HANS
2015-07-20 11:37:19 +01:00
Imperadeiro98
8b31415c9b Merge pull request #2894 from sake12/master
Updated polish translation
2015-07-19 19:53:49 +01:00
Imperadeiro98
1961d786cc Fixed last merge 2015-07-19 19:50:24 +01:00
Imperadeiro98
41a00d0090 Merge pull request #2893 from Abdel-Malik13/patch-1
Traduction d'une ligne non traduite.
2015-07-19 19:48:43 +01:00
Imperadeiro98
1355323c3b Merge pull request #2895 from Hamtara/patch-1
Update fr.coffee
2015-07-19 19:48:13 +01:00
itcbx
478efd82d7 I18n for zh-HANS
I18n for zh-HANS
2015-07-19 23:44:36 +08:00
itcbx
eea2f511ba i18n for zh-HANS
i18n for zh-HANS
2015-07-19 09:54:21 +08:00
Christelle
0e8c578562 Update fr.coffee 2015-07-18 05:11:03 -04:00
sake12
6c66c782e4 pl.coffee: Translation update 2015-07-18 00:27:22 +02:00
sake12
6e6fda889f Updated polish translation 2015-07-16 01:40:12 +02:00
Abdel-Malik
f5ec107fb0 Traduction de l'anglais vers l'arabe 0.5
Traduction supplémentaire, il reste quelques erreurs de traduction, je les modifierai plus tard si personne ne le fait :)
2015-07-15 12:43:28 +02:00
Abdel-Malik
5e5d4d6445 Traduction de l'anglais vers l'arabe 0.4 2015-07-15 12:26:06 +02:00