1270 commits

Author	SHA1	Message	Date
Nicholas Winter	32909aff69	Merge branch 'master' into production	2015-09-15 16:50:51 -07:00
Nicholas Winter	bce3b94a85	Fix #2970: Turn admin off by default on localhost	2015-09-14 09:39:48 -07:00
Matt Lott	b68e5e209b	Update course details page	2015-09-12 22:02:03 -07:00
Nicholas Winter	3cba4b23eb	Merge branch 'master' into production	2015-09-12 06:55:30 -07:00
Nicholas Winter	3eeb9a6a26	Reset some stuff for Ace of Coders and Robot Ragnarok. Put multiplayer link back now that we have two good mirror match levels and aren't listing the old arenas.	2015-09-12 06:54:14 -07:00
Nick Winter	8f22ede9ad	Merge branch 'master' into production	2015-09-09 21:55:04 -07:00
Nick Winter	4d68080c4c	Bumped up Ace of Coders simulations for the tournament.	2015-09-09 21:54:22 -07:00
Nick Winter	dd66018ece	Merge branch 'master' into production	2015-09-09 08:59:48 -07:00
Nick Winter	b13504eeb5	Watching out for finding a null session when getting two games.	2015-09-09 08:59:33 -07:00
Nick Winter	588fe0e134	Merge branch 'master' into production	2015-09-08 12:18:13 -07:00
Nick Winter	b1fd171a27	Opening up the ladder tab view by hiding the FB/G+ ladder column for now. Adding submitted dates to the leaderboards.	2015-09-08 06:44:26 -07:00
Nick Winter	0d2d1ddad0	A couple mirror match ladder tweaks. Made programmableMethods other code languages use proper code formatting.	2015-09-07 18:00:48 -07:00
Nick Winter	4b387602ac	Merge branch 'master' into production	2015-09-03 15:48:05 -07:00
Nick Winter	98b0bcfc75	Fixed playback victory message for spectate mode. Spectate mode now opens in new tabs.	2015-09-03 15:05:10 -07:00
Matt Lott	58880b23af	Add description to tower payment messages	2015-09-03 13:35:24 -07:00
Matt Lott	9131d8668f	Course enroll page ... Will add a prepaid purchase once the prepaid-v2 branch is merged into master.	2015-09-03 11:04:52 -07:00
Michael Schmatz	583d415796	Merge pull request #2986 from codecombat/master ... Enable Sao Paulo servers	2015-09-02 13:39:52 -04:00
Michael Schmatz	be80b1e355	Add Sao Paulo database condition	2015-09-02 12:33:48 -04:00
Nick Winter	bf0422a9d6	Merge branch 'master' into production	2015-08-29 08:02:31 -07:00
Matt Lott	8de00767b3	Initial courses object model	2015-08-29 07:15:39 -07:00
Nick Winter	4ca476713e	Merge branch 'master' into production	2015-08-28 10:45:19 -07:00
Nick Winter	d412a7d5ee	Fixed blank duel stats bar in single player, oops. Handling getTwoGames from non-logged-in users.	2015-08-28 10:45:07 -07:00
Matt Lott	448f4fce88	Merge branch 'master' into production	2015-08-27 09:48:48 -07:00
Matt Lott	e10c5d9646	Allow year sub purchases on top of monthly subs ... Monthly sub is cancelled, terminal sub of 1 year + remaining month is added.	2015-08-27 09:45:10 -07:00
Matt Lott	5faeb82d17	Extend terminal sub with year sub purchase	2015-08-27 09:45:10 -07:00
Matt Lott	264767e9e8	Add HipChat msg for Stripe payments	2015-08-26 15:37:58 -07:00
Matt Lott	761402b117	Add hipchat msg for year sub sale	2015-08-26 15:31:22 -07:00
Matt Lott	1c53b1b9df	Merge branch 'master' into production	2015-08-24 10:54:38 -07:00
Matt Lott	9c492a2d4b	🐛Increment gems for year sale purchase	2015-08-24 10:54:06 -07:00
Matt Lott	36e337495d	Merge branch 'master' into production	2015-08-23 17:14:04 -07:00
Matt Lott	9e222d0873	Add subscription sale ... Give a discount for purchasing a year New sale button on subscribe modal New subscription sale landing page	2015-08-21 11:19:39 -07:00
Nick Winter	86b076fde0	Merge branch 'master' into production	2015-08-21 03:28:35 -07:00
Nick Winter	256b19d331	More improvements and fixes for league ladder pages.	2015-08-21 03:28:25 -07:00
Nick Winter	8c3f4d92d2	Merge branch 'master' into production	2015-08-20 15:21:52 -07:00
Nick Winter	96b838da03	Fixed league-based simulation randomness.	2015-08-20 05:54:10 -07:00
Nick Winter	f34dd7c70e	Merge branch 'master' into production	2015-08-19 15:35:30 -07:00
Nick Winter	da0b7d3e64	Merge pull request #2955 from codecombat/leagues ... Leagues!	2015-08-19 15:34:54 -07:00
Nick Winter	f4d796a717	More ladder page support for leagues. Linking to clan league pages from clans pages.	2015-08-19 15:30:37 -07:00
Nick Winter	d86aa747bc	Merge branch 'master' into production	2015-08-19 12:24:33 -07:00
Matt Lott	0fee075470	🐛Fix sponsored subscription error logging bug	2015-08-17 15:49:49 -07:00
Nick Winter	6f2b1b2a41	Added back an index we need on LevelSession, but in code this time instead of just from the shell as 'weird query index'.	2015-08-15 12:44:19 -07:00
Nick Winter	32ca453dec	Added /play/ladder/levelID/clan/clanID clan-specific ladder pages.	2015-08-15 06:45:38 -07:00
Nick Winter	bda2483738	Added league-based ladder game simulation.	2015-08-15 05:38:47 -07:00
Nick Winter	f757f220be	Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods.	2015-08-13 11:17:38 -07:00
Matt Lott	532c2a05e8	Merge branch 'master' into production	2015-08-13 11:13:55 -07:00
Matt Lott	05a9013164	Remove deprecated prepaid schema properties	2015-08-13 11:13:15 -07:00
Matt Lott	6fb5f270b3	Merge branch 'master' into production	2015-08-13 08:39:02 -07:00
Matt Lott	9c39bf7656	Update prepaids to support multiple redeemers for a single code ... Will remove deprecated properties after updating production.	2015-08-12 15:51:18 -07:00
Nick Winter	b0cb3c8ab8	Merge branch 'master' into production	2015-08-12 11:55:39 -07:00
David Liu	7d64087e29	Fix the headless simulator ... Shims `lscache`, support io.js < v3.0.0. Make simulating `one-game` possible. Tested on Linux with Node.js v0.10.40 and v0.12.7; as well as io.js v2.5.0. It still won't work with io.js v3.0.0 because `webworker-threads` doesn't compile properly, so that's another problem.	2015-08-10 18:12:53 -07:00