codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6117 commits 27 branches 0 tags 134 MiB
Commit graph

4821 commits

Author SHA1 Message Date
Scott Erickson
209836c172 Fixed user patching to not also unsubscribe subscribers. 2014-12-05 14:11:38 -08:00
Anders Bernard
3304fedb16 Update de-DE.coffee 2014-12-05 22:16:48 +01:00
Nick Winter
fd88056123 Merge pull request #1849 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-12-05 12:54:38 -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
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
Lirai
324a749149 Update de-DE.coffee 
uncommented...
 2014-12-04 20:28:56 +01:00
Lirai
bde08dd24b Update de-DE.coffee 
Checked for errors and better translations.
 2014-12-04 19:34:28 +01:00
Matt Lott
7537817081 Update subscribe parent copy 2014-12-04 09:57:01 -08:00
Nick Winter
a1d8b02ca6 Moved simulation Aether requires to be more specific and not loaded all the time on normal play pages. 2014-12-04 08:33:26 -08:00
Nick Winter
3573a929e3 Added requires for other languages in Simulator.coffee so simulation can work. 2014-12-04 08:21:36 -08:00
Nick Winter
f48468c474 Merge pull request #1834 from ebirkenes/translation 
Bunch of norwegian translations
 2014-12-04 07:40:10 -08:00
Maks Lyashuk
22fe41fd70 Fix another indent 2014-12-04 14:19:37 +02:00
Maks Lyashuk
8479f94ecb Fix indent 2014-12-04 14:13:46 +02:00
Maks Lyashuk
f12d9b5598 New translation in uk.coffee 2014-12-04 13:14:19 +02:00
Nick Winter
69623edefb WorldMapView no longer restricting access to adventurer and started levels. 2014-12-03 20:46:57 -08:00
Scott Erickson
41d78fd4c5 Payments view now sorts payments by date. 2014-12-03 19:44:04 -08:00
Nick Winter
4d72c1c84b Show an AuthModal instead of a SubscribeModal to anonymous players. 2014-12-03 19:34:00 -08:00
Scott Erickson
0f706bfdf6 Fixed GPlus login. 2014-12-03 16:40:28 -08:00
Nick Winter
8cff42a843 Show SubscribeModal for non-admins, too. 2014-12-03 16:28:56 -08:00
Nick Winter
a8ce1bbfb2 Added unsubscribe button and subscription status on payments screen. 2014-12-03 16:11:46 -08:00
Nick Winter
1f2408a99f Can actually edit requiresSubscription on levels. 2014-12-03 15:50:34 -08:00
Erlend Birkenes
4c4c263bb8 Fixed indentation error 2014-12-03 22:43:45 +01:00
Scott Erickson
eb98cf4952 Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one. 2014-12-03 13:32:28 -08:00
Nick Winter
4701ba22af Got rid of a bit of skipping, enabled some other arenas for testing. 2014-12-03 13:17:57 -08:00
Nick Winter
6e57cbfb66 LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it). 2014-12-03 12:04:12 -08:00
Nick Winter
50ec896fd8 Added a requiresSubscription property to the levels. 2014-12-03 11:46:03 -08:00
George Saines
371127a368 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-03 11:19:52 -08:00
George Saines
bcaad51b24 more level rearranging 2014-12-03 11:19:48 -08:00
Nick Winter
0ac9b3758b Fixed bug with subscriptions not working. Added subscription status text to the world map. 2014-12-03 11:19:10 -08:00
Erlend Birkenes
861cb64fec More norwegian translations 2014-12-03 20:01:00 +01:00
Matt Lott
898b22723e Update subscribe copy 2014-12-03 11:00:45 -08:00
George Saines
103d1035a2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-12-03 10:53:52 -08:00
George Saines
5dafe4b541 changing the placement of the level dots 2014-12-03 10:53:45 -08:00
Nick Winter
73b5f130b5 Repositioned ranger weapons. 2014-12-03 10:39:16 -08:00
Nick Winter
f82ccfc4cb The sky darkened. 2014-12-03 10:04:50 -08:00
Nick Winter
65dde043c7 SubscribeModal is in. 2014-12-03 09:14:14 -08:00
Erlend Birkenes
5d4d631ae6 More norwegian translations. 
Conflicts:
	app/locale/nb.coffee
 2014-12-03 16:36:04 +01:00
Matt Lott
201547e388 Revert autocomplete to support Enter too 2014-12-02 22:14:01 -08:00
Nick Winter
32d3745b77 A tiny bit more progress on the SubscribeModal. 2014-12-02 21:27:12 -08:00
Scott Erickson
cd3bb690f4 Created stripe subscription logic. 2014-12-02 20:02:35 -08:00
Nick Winter
15d7ac876a Starting SubscribeModal. 2014-12-02 20:01:53 -08:00
Matt Lott
774260769d Update pageview tracking 
Based on more feedback from segment.io support.
Still trying to get Google Analytics virtual pageviews to work
correctly.
 2014-12-02 13:25:18 -08:00
Scott Erickson
3675c79b26 Hotfix for #1828. Still doesn't figure out why user preferredLanguage properties are being set to null. 2014-12-02 13:19:05 -08:00
Rubiconline
e1326f1698 Update fr.coffee 2014-12-02 21:25:58 +01:00
Scott Erickson
5dcdabfd62 Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there. 2014-12-02 11:47:15 -08:00
Nick Winter
6cfb45e7a6 Pausing branchingGroup temporarily for school testing. 2014-12-02 09:18:39 -08:00
Matt Lott
1773744bcd Turn off a/b test hide locked levels 
Minor increase in level completion for hiding locked levels was not
statistically significant.  We can run this test again after level
banners and world map paths have been ironed out.
 2014-12-02 09:13:42 -08:00
Johan
06dcb8c48b Update sv.coffee 2014-12-02 17:03:33 +01:00
Nick Winter
19dde10a54 Fixed jade comment syntax error. 2014-12-01 18:33:37 -08:00
Nick Winter
8c7e62b9bd Added back doll image buckets. 2014-12-01 18:19:20 -08:00
Scott Erickson
7f97a3b91e The PlayItemsModal now dynamically loads portrait images as they scroll into view. 2014-12-01 17:33:45 -08:00
Nick Winter
4f9dc39567 Fixed item details view shadow. 2014-12-01 17:17:27 -08:00
Matt Lott
5965d319d6 Fix Firefox world map level hover flicker 2014-12-01 17:12:02 -08:00
Nick Winter
4b75516a88 Fixed Amara's positioning. 2014-12-01 17:08:48 -08:00
Scott Erickson
cd5b57a658 Set up our resource retrying mechanism to stop after 20 tries. 2014-12-01 16:09:59 -08:00
Nick Winter
8ce192bf7c Got modularized Aether imports working for PlayLevelView and its workers. 2014-12-01 15:43:22 -08:00