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

6210 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Nick Winter
f10eb94b16 Merge pull request #1836 from probil/patch-1 
New translation in uk.coffee
 2014-12-04 07:37:51 -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
Scott Erickson
7210de02e9 Set up stripe to get user emails so receipts can be emailed. 2014-12-03 16:36:03 -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
Scott Erickson
0893784a75 Fixed MailChimp subscription updating from the website. 2014-12-03 15:26:39 -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
aea1e39b58 Tweaked the subscription handler to act more like the payment handler when a card charge fails. It returns 402. 2014-12-02 20:40:33 -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
Nick Winter
bf4c030d33 Updated data from playtime breakdown script. 2014-12-02 18:13:37 -08:00
Nick Winter
a7b617eab3 Slight update to playtime breakdown script to run faster. 2014-12-02 16:56:42 -08:00
Matt Lott
806644ca58 Add Matt's avatar 2014-12-02 13:35:02 -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