Commit graph

8134 commits

Author SHA1 Message Date
Imperadeiro98
c37398b2c1 Small fix to last merge 2015-02-10 19:57:34 +00:00
Nick Winter
36ce1f6f66 Merge branch 'FedericoTomas-patch-6' 2015-02-10 11:55:04 -08:00
Nick Winter
db2b0c29fe Merginated. 2015-02-10 11:54:57 -08:00
Barney
201ef800bc Merge remote-tracking branch 'upstream/master' 2015-02-11 03:38:47 +08:00
Barney
31c5ce30cd Update zh-HANT.coffee 2015-02-11 03:38:43 +08:00
Matt Lott
30c31f908b Add a/b test results scripts 2015-02-10 11:34:14 -08:00
Imperadeiro98
92b8e2354e Small fix to last merge 2015-02-10 19:27:27 +00:00
Imperadeiro98
94cfe2011c Merge pull request #2282 from matifol/patch-1
Translated share_progress_modal
2015-02-10 19:25:56 +00:00
Imperadeiro98
d8eea3923f Small fix to last commit 2015-02-10 19:09:11 +00:00
Imperadeiro98
92b80b591d Merge pull request #2283 from ArthurLu/master
Update zh-HANT.coffee
2015-02-10 19:07:26 +00:00
Imperadeiro98
8264048f31 Merge pull request #2271 from jhoon/translations-es-419
Translating share_progress_modal section
2015-02-10 18:58:32 +00:00
Barney
2e4c261ada Update zh-HANT.coffee 2015-02-11 02:27:54 +08:00
Martin Folkeseth
28f6c5dc38 Translated share_progress_modal
Kept all the old strings for future reference.
2015-02-10 19:06:51 +01:00
divyanshu013
2b090a9841 Fixed the issue with the Leaderboard view to fit properly for #2254
The leaderboard view fits properly while scrolling down.
2015-02-10 23:27:23 +05:30
Barney
2546082eaf Update zh-HANT.coffee 2015-02-11 01:02:37 +08:00
laituan245
70ec7996c2 Added more names for #53 2015-02-10 23:26:02 +09:00
Anirudh GP
b422508f2d Added some quotes for #710 2015-02-10 14:41:04 +05:30
Anirudh GP
ada239b50d Added some quotes for #710 2015-02-10 14:41:03 +05:30
Anirudh GP
9184588969 Added more names for #53 2015-02-10 14:32:02 +05:30
Barney
6b8e9ad808 Update zh-HANT.coffee 2015-02-10 14:04:43 +08:00
Barney
60ff41ccf4 Merge remote-tracking branch 'upstream/master' 2015-02-10 13:12:11 +08:00
Barney
16708aacc8 Update zh-HANT.coffee 2015-02-10 13:12:09 +08:00
FedericoTomas
fa5134d09b Actualizando(Update)
Actualice un poco.
2015-02-10 01:18:25 -03:00
Nick Winter
09212f0063 Merge branch 'master' into production 2015-02-09 15:34:11 -08:00
Nick Winter
91b6f1759d Fixed weird behavior of MailChimp API where it wouldn't update not-yet-confirmed subscribers' email addresses when changed and we'd end up sending the opt-in email a zillion times. 2015-02-09 15:33:59 -08:00
Jhoon Saravia
f2534e2098 Translating leaderboard section and some tips 2015-02-09 18:22:52 -05:00
Jhoon Saravia
c9c8c3e755 Translating share_progress_modal 2015-02-09 18:08:59 -05:00
Matt Lott
62508f52e6 Merge branch 'master' into production 2015-02-09 15:04:51 -08:00
Matt Lott
c4620a7b2d Refactor analytics event logging
Clean up property slimming.
Save explicit identity traits in properties.
2015-02-09 15:03:04 -08:00
Imperadeiro98
1cd9a6997b Merge pull request #2270 from Martin005/patch-10
Update cs.coffee
2015-02-09 22:34:32 +00:00
Martin005
44fb8281bf Update cs.coffee
Finally done all translations :)
2015-02-09 23:22:04 +01:00
Nick Winter
abbab26d80 Using i18n for achievement descriptions in HeroVictoryModal. 2015-02-09 13:06:00 -08:00
Imperadeiro98
92531e366b Update en.coffee 2015-02-09 20:01:51 +00:00
Imperadeiro98
8718cd280f Added i18n 2015-02-09 20:00:52 +00:00
Imperadeiro98
f062f446d3 Fixed i18n 2015-02-09 19:57:28 +00:00
Imperadeiro98
bebada7f43 Update pt-PT.coffee 2015-02-09 19:50:18 +00:00
Imperadeiro98
8fb8e139b7 Small indentation fix 2015-02-09 19:47:09 +00:00
Nick Winter
19a9d8c9aa Propagated i18n. 2015-02-09 11:31:42 -08:00
Nick Winter
99f3bb7647 Merge branch 'Martin005-patch-9' 2015-02-09 11:31:00 -08:00
Nick Winter
16a8478f97 Merginated. 2015-02-09 11:30:52 -08:00
Nick Winter
598ca42d7c Merge branch 'master' into production 2015-02-09 11:20:30 -08:00
Nick Winter
5decf7ae36 Workaround for #2259, although I haven't been able to reproduce when it happens. 2015-02-09 11:11:52 -08:00
Nick Winter
7b34f90230 Added rough draft of subscribe button in gem shop. 2015-02-09 09:22:18 -08:00
Nick Winter
616940cafb Merge branch 'makertech81-patch-2' 2015-02-09 08:42:38 -08:00
Nick Winter
c2a4700aa2 Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well. 2015-02-09 08:42:24 -08:00
Nick Winter
61896083a9 Missed my save on that last one. 2015-02-09 08:39:40 -08:00
Nick Winter
e38b729188 Merge branch 'makertech81-patch-1' 2015-02-09 08:38:37 -08:00
Nick Winter
1c41c1df91 Merged more tips in en.coffee. 2015-02-09 08:38:29 -08:00
Nick Winter
048e783698 Merge branch 'JKniager-patch-3' 2015-02-09 08:35:51 -08:00
Nick Winter
65c0abd3ab Merged those tips in en.coffee. 2015-02-09 08:35:38 -08:00