1077 commits

Author	SHA1	Message	Date
Nick Winter	11d3f62314	Merge branch 'master' into production	2015-03-28 13:55:06 -07:00
Nick Winter	0b1bb6a4aa	Added admin/pending-patches view. Fixed accepting several kinds of patches. Added keyboard shortcuts for accepting (a) and rejecting (r) patches. Fixed #2490. Fixed #2515. Fixed #2304.	2015-03-28 13:54:44 -07:00
Nick Winter	8be5278f98	Merge branch 'master' into production	2015-03-27 16:25:41 -07:00
Matt Lott	532e8133c6	Add graph to sub counts admin page	2015-03-27 15:27:34 -07:00
Matt Lott	53de6c6134	Add current subscription counts view under the admin page	2015-03-27 15:27:34 -07:00
Nick Winter	238c36ac74	Merge branch 'master' into production	2015-03-25 16:53:35 -07:00
Nick Winter	7dff105cdf	Insane hackery for #1777 to give us more code editor space, better use of space with tall screens, and scrolling API properties. Watch out for bugs.	2015-03-25 16:47:31 -07:00
Nick Winter	1feba83fed	Merge branch 'master' into production	2015-03-24 18:57:12 -07:00
Nick Winter	a7244e1567	Tweaking offer triggers.	2015-03-24 18:56:32 -07:00
Nick Winter	a39a4d4c1c	MailChimp API doesn't let us segment by custom properties like chinaVersion.	2015-03-24 18:22:59 -07:00
Nick Winter	5bc58ce996	Added MakerSquare email offer. Not emailing subscribers with next-steps offers.	2015-03-24 17:08:50 -07:00
Nick Winter	90bc6fb39e	Merge branch 'master' into production	2015-03-23 16:38:20 -07:00
Nick Winter	eda57e366a	Fix for anonymous user signups.	2015-03-23 16:38:12 -07:00
Nick Winter	b4ea78e5cb	Implementing alternative pricing with Alipay in China to support dedicated China server.	2015-03-23 15:26:44 -07:00
Nick Winter	9f62532ae9	Merge branch 'master' into production	2015-03-22 08:11:44 -07:00
Michael Schmatz	a16ae2b5bc	Changed read prefs and enabled middleware	2015-03-21 21:49:32 -04:00
Matt Lott	2824ea5f9d	Merge branch 'master' into production	2015-03-20 16:18:52 -07:00
Matt Lott	2561bc4caf	🐛Fix Stripe web hook sub deleted for deleted user ... Add check for deleted user in subscription deleted Stripe web hook event handler, and equivalent test case. Add logging for web hook 500 errors to aid future debugging.	2015-03-20 16:14:32 -07:00
Nick Winter	6cde6c00b6	Merge branch 'master' into production	2015-03-20 15:38:33 -07:00
Michael Schmatz	5a7666fca3	More read nearests and changed redirection	2015-03-20 16:33:03 -04:00
Michael Schmatz	d8c21771fc	Merge branch 'master' into china	2015-03-20 16:08:18 -04:00
Nick Winter	da75015f46	Merge branch 'master' into production	2015-03-20 11:10:00 -07:00
Nick Winter	e6f53d437a	Adding zero-sum to simulated ladder levels.	2015-03-20 10:16:19 -07:00
Nick Winter	7714354447	Merge branch 'master' into production	2015-03-20 07:17:41 -07:00
Nick Winter	8b06de9613	Requests without users can't save poll votes.	2015-03-20 07:10:47 -07:00
Nick Winter	927363fd6f	Merge branch 'master' into production	2015-03-19 21:38:06 -07:00
Matt Lott	fec3ac38e9	Prepaid subscriptions ... Admins can generate a prepaid code, which a user can use to subscribe for free via the account/subscription page. The subscription will be identical to the normal monthly subscription (e.g. 3500 gems per month), except they won’t be charged. Does not require the recipient to enter billing information. Can be applied to an existing subscription, which will be converted to free. Prepaid code can only be used once. Prepaid subscription cannot be unsubscribed via the UI.	2015-03-19 15:04:15 -07:00
Michael Schmatz	7f9301e8c6	Setting up read preferences and china specific configuration	2015-03-19 14:18:38 -04:00
Nick Winter	330808f936	Merge branch 'master' into production	2015-03-18 16:21:44 -07:00
Nick Winter	585fa40a8c	Added first draft of campaign info to campaign selector screen.	2015-03-18 16:20:30 -07:00
Nick Winter	103cbe7996	Merge branch 'master' into production	2015-03-16 14:17:22 -07:00
Nick Winter	709c2fc4f1	Added more Artisan permissions for Articles.	2015-03-16 13:54:20 -07:00
Nick Winter	487815b3e6	Merge branch 'master' into production	2015-03-14 11:34:19 -07:00
Nick Winter	ab64a335e4	Another fix for poll handler getting next poll if there are no poll records yet.	2015-03-14 11:30:54 -07:00
Nick Winter	83dcc9ee85	Merge branch 'master' into production	2015-03-14 09:57:54 -07:00
Nick Winter	89bdb3b790	Fixed #2518.	2015-03-14 09:57:31 -07:00
Nick Winter	57e77a0cd7	Upcoming ladder level Zero Sum equalizes all players' heroes and equipment.	2015-03-14 09:39:43 -07:00
Matt Lott	82991f9805	Merge branch 'master' into production	2015-03-13 15:55:32 -07:00
Matt Lott	fde8904fd8	Add backwards compatibility check for Stripe sub search	2015-03-13 15:39:19 -07:00
Matt Lott	af89452b93	Merge branch 'sponsored-subs'	2015-03-13 15:19:20 -07:00
Nick Winter	fa3d2738c4	Merge branch 'master' into production	2015-03-12 11:09:10 -07:00
Nick Winter	be84517010	Enabling another offer.	2015-03-12 11:08:58 -07:00
Nick Winter	a433c30616	Merge branch 'master' into production	2015-03-11 09:01:52 -07:00
Nick Winter	a697b35920	Fixed poll fetching for first poll.	2015-03-11 09:01:40 -07:00
Nick Winter	7d59221b9c	Merge branch 'master' into production	2015-03-10 22:45:03 -07:00
Nick Winter	9c99fc455a	A few poll fixes.	2015-03-10 09:45:21 -07:00
Nick Winter	8c1de9dfa2	Added user index for siterefs.	2015-03-09 17:50:36 -07:00
Nick Winter	497a6c6541	Merge branch 'master' into production	2015-03-09 16:34:37 -07:00
Nick Winter	dc5fb0af14	Sending a couple more offers in the next-steps emails.	2015-03-09 16:32:29 -07:00
Nick Winter	f198f8e35b	Merge branch 'master' into production	2015-03-09 10:11:12 -07:00