Commit graph

6158 commits

Author SHA1 Message Date
Nick Winter
abbde82aa2 Merge pull request #1848 from nixel2007/master
More ru translations.
2014-12-05 12:54:09 -08:00
Imperadeiro98
074c16733b Update pt-PT.coffee 2014-12-05 20:23:06 +00:00
Imperadeiro98
7a89d30bb6 Update pt-PT.coffee 2014-12-05 20:21:13 +00:00
nixel2007
9a2bc14bad merge remote 2014-12-05 20:15:59 +03:00
nixel2007
793fbfcd18 Merge remote-tracking branch 'upstream/master' 2014-12-05 20:08:29 +03:00
Nick Winter
fb4646b1dd Propagated i18n. 2014-12-05 09:08:26 -08:00
nixel2007
171d862fcf ru
community block, skill_docs done, small fixes
2014-12-05 20:07:50 +03:00
Nick Winter
723209642c Merge pull request #1845 from Imperadeiro98/patch-1
Fixed some i18n
2014-12-05 08:56:11 -08:00
Nick Winter
b01b74cdc8 Merge pull request #1843 from Lirai/patch-2
Update de-DE.coffee
2014-12-05 08:54:57 -08:00
Nick Winter
8b62b6ec44 Temporary workaround for #1842. 2014-12-05 07:55:17 -08:00
Imperadeiro98
bf7872b059 Update legal.jade 2014-12-05 15:54:35 +00:00
Imperadeiro98
f089531aac Update en.coffee 2014-12-05 15:43:54 +00:00
Imperadeiro98
e4be319875 Update legal.jade 2014-12-05 15:43:37 +00:00
Imperadeiro98
afbc669742 Update en.coffee 2014-12-05 15:41:31 +00:00
Imperadeiro98
7cd8a57d1e Update legal.jade 2014-12-05 15:38:42 +00:00
Imperadeiro98
203b407b4b Update en.coffee 2014-12-05 15:38:41 +00:00
Imperadeiro98
ecc94b411c Update en.coffee 2014-12-05 15:29:18 +00:00
nixel2007
ef20e26484 ru
subscribe block and strings above.
2014-12-05 18:00:14 +03:00
nixel2007
5703e3eb94 ru
Play block
2014-12-05 17:42:19 +03:00
Lirai
e4120ceadf Update de-DE.coffee
some translations
2014-12-05 10:43:41 +01:00
Matt Lott
4616df6c23 Add virtual page views for subscribe paths 2014-12-04 21:14:22 -08:00
Scott Erickson
d0ee8cb7c7 Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided. 2014-12-04 17:41:27 -08:00
Matt Lott
bd797e8cfd Highlight locked default code 2014-12-04 16:33:59 -08:00
Nick Winter
5aefd5ffa2 I think the server needs to gzip now, and possibly only a bug is keeping it working. 2014-12-04 16:33:17 -08:00
Matt Lott
222e532006 Make default code locking contiguous
Lock ‘del’ command too.
2014-12-04 16:04:44 -08:00
Nick Winter
b5b38d042a Added i18n for extrapolation tip. 2014-12-04 15:35:31 -08:00
Nick Winter
3c3d98b0ec Merge pull request #1841 from Zacharias030/master
Added another tip to be displayed during loading
2014-12-04 15:34:16 -08:00
Zacharias Fisches
55f85e3682 Added another tip to be displayed during loading
There are only two kinds of people: those that can extrapolate from
incomplete data...
2014-12-05 00:21:36 +01:00
Nick Winter
0306d0ee31 Fixed bug with heroes not rendering in the hero picker. 2014-12-04 15:04:34 -08:00
Nick Winter
8318606457 Added a slot for the wizard hand hero doll images. 2014-12-04 14:35:25 -08:00
Nick Winter
b253eb9be8 Merged something. 2014-12-04 14:34:35 -08:00
Matt Lott
4ff6e95f62 Add show subscribe modal events 2014-12-04 14:23:47 -08:00
Nick Winter
bae90024b5 Merge pull request #1840 from nixel2007/master
Update ru.coffee
2014-12-04 14:20:14 -08:00
Nick Winter
24c3f6aa3a Merge pull request #1829 from jkohlin/patch-1
Update sv.coffee
2014-12-04 14:09:53 -08:00
Nick Winter
b895db3da2 Merge pull request #1831 from Rubiconline/patch-1
Update fr.coffee
2014-12-04 14:09:28 -08:00
Nick Winter
49dd6704c3 Merge pull request #1839 from Imperadeiro98/patch-1
Fixed translation, I think
2014-12-04 14:08:29 -08:00
nixel2007
7179236caa Update ru.coffee
G+ commands, skill_docs, about - team blocks, thangs and small fixes.
2014-12-05 01:00:50 +03:00
Nick Winter
dffc14f995 Put in a fallback in case somehow the gems weren't loaded for the PlayHeroesView locked hero gem costs. 2014-12-04 13:57:21 -08:00
Imperadeiro98
1c136b0657 Fixed translation, I think 2014-12-04 21:44:27 +00:00
Nick Winter
a25d306be7 Added restricted hero button where the choose hero would normally go, for heroes unavailable to a particular level. 2014-12-04 13:43:19 -08:00
Nick Winter
fa4f479107 Restricted Arcane Ally and Munchkin Harvest to warriors, since otherwise players will tend to suicidally pick their under-armored new ranger or wizard. 2014-12-04 13:37:17 -08:00
Nick Winter
a7eaac773d Fixed some ranger paper doll stylings and a typo in the femaleRangeThumbr item doll image schema. 2014-12-04 13:30:20 -08:00
Nick Winter
c0842959e8 Avoid opening InventoryModal or ChooseHeroesModal until the session is loaded. 2014-12-04 13:18:06 -08:00
Scott Erickson
0edf4e0ca1 Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users. 2014-12-04 13:07:07 -08:00
Matt Lott
e3abb9ceb3 Capture active user metrics
Watching for these events:
Level completed
User registered
Playtime of 30s in a level
Purchase
Payment
Subscribe
Earned an achievement
2014-12-04 12:57:57 -08:00
Scott Erickson
7025f0a488 Another hotfix for people having preferredLanguage set to null. It's preventing people from subscribing because they can't put a User object that does not validate. Still can't repro, but it's happened to a lot of people and continues to happen to new people signing up. 2014-12-04 11:56:14 -08:00
Nick Winter
86be36621d Sped up real-time playback on some more non-randomized levels. 2014-12-04 11:31:22 -08:00
Nick Winter
7bfe0e5c9e Updated Programmaticon II requirements. Adjust editor height after reloading code. 2014-12-04 11:31:22 -08:00
Nick Winter
4d6a52b31f Merge pull request #1837 from Lirai/patch-1
Update de-DE.coffee
2014-12-04 11:30:20 -08:00
Lirai
324a749149 Update de-DE.coffee
uncommented...
2014-12-04 20:28:56 +01:00