2176 commits

Author	SHA1	Message	Date
Nick Winter	d53d1d5ace	Merginated.	2014-12-06 17:28:11 -08:00
Nick Winter	9bde375dcc	Implemented new AuthModal design (sans green button for signup/login).	2014-12-06 17:27:02 -08:00
Scott Erickson	83e1fe8bfe	InventoryModal loads item portraits when they are visible, getting rid of dozens of unnecessary web requests.	2014-12-06 14:21:56 -08:00
Scott Erickson	aac1aa379e	Set up stubs for future subscription sales.	2014-12-06 12:38:06 -08:00
Nick Winter	491a7ef456	Handling another error noted with Errorception. Updated minimum Firefox version to 25 based on seeing many (possibly non-critical) errors with it.	2014-12-06 12:02:48 -08:00
Nick Winter	708f0e543c	Fixed some issues I saw in Errorception. Stopped saving the session when the play state or frame changes.	2014-12-06 11:33:57 -08:00
Nick Winter	477ebb3c48	Fixed an error I saw in Errorception, and a Sass problem I saw in Webkit.	2014-12-06 11:05:52 -08:00
Nick Winter	bba78970ea	Deleted WizardSettingsView.	2014-12-06 10:23:26 -08:00
Scott Erickson	62cab1e76b	Admins can now give users discounts and free accounts from the MainAdminView view.	2014-12-06 10:05:52 -08:00
Nick Winter	00e6ce5f45	Couldn't reproduce #1851, but this should work around the error if it happens again.	2014-12-06 09:46:37 -08:00
Nick Winter	175cdb5151	Now showing SubscribeModal before AuthModal for players who need to sign up before subscribing.	2014-12-06 09:35:13 -08:00
Nick Winter	6a26681fec	Minor level progression tweak.	2014-12-05 18:30:31 -08:00
Nick Winter	bbc25a0877	Updated next level links.	2014-12-05 18:29:15 -08:00
Nick Winter	c7e2398f7c	Fixed some bugs with hero doll placement and dungeon unlocks.	2014-12-05 18:16:58 -08:00
Nick Winter	07f7e7473d	Merged.	2014-12-05 17:27:33 -08:00
Nick Winter	6596bde758	Right, don't need that in there.	2014-12-05 17:25:20 -08:00
Scott Erickson	836d2905b9	Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties.	2014-12-05 17:19:52 -08:00
Nick Winter	6344b0c1a3	Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only.	2014-12-05 15:46:15 -08:00
Matt Lott	d6265a4065	Fix default locked code css ... Couldn’t get multiple ranges to highlight ranges correctly, so leaving it on for python and coffeescript only.	2014-12-05 14:15:43 -08:00
Scott Erickson	209836c172	Fixed user patching to not also unsubscribe subscribers.	2014-12-05 14:11:38 -08:00
Nick Winter	8b62b6ec44	Temporary workaround for #1842.	2014-12-05 07:55:17 -08:00
Matt Lott	4616df6c23	Add virtual page views for subscribe paths	2014-12-04 21:14:22 -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	0306d0ee31	Fixed bug with heroes not rendering in the hero picker.	2014-12-04 15:04:34 -08:00
Matt Lott	4ff6e95f62	Add show subscribe modal events	2014-12-04 14:23:47 -08:00
Imperadeiro98	1c136b0657	Fixed translation, I think	2014-12-04 21:44:27 +00:00
Nick Winter	c0842959e8	Avoid opening InventoryModal or ChooseHeroesModal until the session is loaded.	2014-12-04 13:18:06 -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	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	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
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
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
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	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
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