Nick Winter
|
8172c3273a
|
Merge branch 'master' into production
|
2014-12-11 20:17:59 -08:00 |
|
Nick Winter
|
194d3ee647
|
Worked around unstable Zoho mail dependencies by switching password recovery and contact emails to Sendwithus.
|
2014-12-11 20:15:24 -08:00 |
|
Nick Winter
|
e4e5267c0f
|
Merge branch 'master' into production
|
2014-12-11 19:07:45 -08:00 |
|
Matt Lott
|
0c81942c71
|
2nd HoC sub sale
|
2014-12-11 18:39:03 -08:00 |
|
Scott Erickson
|
0b81796333
|
Created the Campaign foundation: schema, model, handler.
|
2014-12-11 11:26:28 -08:00 |
|
Matt Lott
|
cc7b1af415
|
Merge branch 'master' into production
|
2014-12-10 16:16:04 -08:00 |
|
Matt Lott
|
d4cfaac7e5
|
Sub price test
|
2014-12-10 16:05:55 -08:00 |
|
Scott Erickson
|
02953d0e6c
|
Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page.
|
2014-12-10 13:42:12 -08:00 |
|
Matt Lott
|
8d7c8dc52a
|
Merge branch 'master' into production
|
2014-12-09 17:33:26 -08:00 |
|
Scott Erickson
|
876a663690
|
Fixed server tests.
|
2014-12-09 13:41:44 -08:00 |
|
Nick Winter
|
07fd54bbb3
|
Merge branch 'master' into production
|
2014-12-09 06:07:17 -08:00 |
|
Nick Winter
|
a97baa2207
|
HoC sale.
|
2014-12-09 06:06:14 -08:00 |
|
Nick Winter
|
96cedec946
|
Merge branch 'master' into production
|
2014-12-08 08:20:43 -08:00 |
|
Nick Winter
|
61f63caa59
|
Trying to fix a server crash I found with bad stripe globals.
|
2014-12-08 08:09:31 -08:00 |
|
Nick Winter
|
b78ade5f28
|
Merge branch 'master' into production
|
2014-12-08 07:08:06 -08:00 |
|
Nick Winter
|
d5f953ae4f
|
Getting rid of indexes on employers and candidates.
|
2014-12-08 07:07:29 -08:00 |
|
Nick Winter
|
7eaef4fd81
|
Merge branch 'master' into production
|
2014-12-06 20:31:34 -08:00 |
|
Scott Erickson
|
aac1aa379e
|
Set up stubs for future subscription sales.
|
2014-12-06 12:38:06 -08:00 |
|
Nick Winter
|
4522f594d6
|
Merge branch 'master' into production
|
2014-12-06 12:05:58 -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
|
f52c524388
|
Merge branch 'master' into production
|
2014-12-05 17:27:40 -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 |
|
Scott Erickson
|
f4e3416918
|
Set up an endpoint for fetching Stripe info.
|
2014-12-05 17:19:52 -08:00 |
|
Scott Erickson
|
e8bb5b824d
|
Tweaked the subscription handler to modify the actual target user, not necessarily the user that is making the changes.
|
2014-12-05 15:49:46 -08:00 |
|
Scott Erickson
|
e03e08692e
|
Merge branch 'master' into production
|
2014-12-05 14:13:21 -08:00 |
|
Scott Erickson
|
209836c172
|
Fixed user patching to not also unsubscribe subscribers.
|
2014-12-05 14:11:38 -08:00 |
|
Nick Winter
|
76ee449693
|
Merge branch 'master' into production
|
2014-12-04 22:22:39 -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
|
338f1d87ea
|
Merge branch 'master' into production
|
2014-12-04 15:24:21 -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 |
|
Nick Winter
|
31ffeaf269
|
Merge branch 'master' into production
|
2014-12-03 16:37:01 -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 |
|
Scott Erickson
|
0893784a75
|
Fixed MailChimp subscription updating from the website.
|
2014-12-03 15:26:39 -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
|
50ec896fd8
|
Added a requiresSubscription property to the levels.
|
2014-12-03 11:46:03 -08:00 |
|
Nick Winter
|
65dde043c7
|
SubscribeModal is in.
|
2014-12-03 09:14:14 -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 |
|
Scott Erickson
|
40ed4e1056
|
Merge branch 'master' into production
|
2014-12-02 13:30:33 -08: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
|
b49d880fd9
|
Merge branch 'master' into production
|
2014-12-01 13:53:40 -08:00 |
|
Nick Winter
|
ffcfec0a6a
|
Trying to shut the server up about some anonymous user who is simulating.
|
2014-12-01 13:53:17 -08:00 |
|
Nick Winter
|
d7700a7154
|
Merge branch 'master' into production
|
2014-11-30 14:38:13 -08:00 |
|
Michael Schmatz
|
3cf80c895e
|
Removed log infos, iPad language selection
|
2014-11-30 16:19:01 -05:00 |
|
Nick Winter
|
2eb8441911
|
Merge branch 'master' into production
|
2014-11-29 13:10:48 -08:00 |
|
Scott Erickson
|
3e0394d0d8
|
Fixed the latest version handler to handle invalid original id inputs.
|
2014-11-29 11:11:40 -08:00 |
|
Nick Winter
|
528dfaa583
|
Merge branch 'master' into production
|
2014-11-29 10:52:59 -08:00 |
|
Scott Erickson
|
1bd70591a0
|
Added new mongodb versions to be allowed.
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
|
2014-11-29 10:46:01 -08:00 |
|
Nick Winter
|
38c092c914
|
Merge branch 'master' into production
|
2014-11-29 10:39:11 -08:00 |
|
Nick Winter
|
891b78eb44
|
Hiding some ThangTypes from view in level editor.
|
2014-11-29 10:34:04 -08:00 |
|
Nick Winter
|
d2aabbdacc
|
A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.
|
2014-11-29 08:43:40 -08:00 |
|
Nick Winter
|
383f215b36
|
Merge branch 'master' into production
|
2014-11-28 19:40:00 -08:00 |
|
Scott Erickson
|
31214e854e
|
Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.
|
2014-11-28 17:49:41 -08:00 |
|
Nick Winter
|
4b45385571
|
Working on paper dolls.
|
2014-11-28 12:11:59 -08:00 |
|
Michael Schmatz
|
980b5f7580
|
Merge branch 'master' into production
Conflicts:
server_setup.coffee
|
2014-11-28 14:40:07 -05:00 |
|
Michael Schmatz
|
6cb46aafa8
|
Link to Papertrail logs in error messages
|
2014-11-28 14:37:55 -05:00 |
|
Michael Schmatz
|
897fe6c63e
|
Improved error handling
|
2014-11-28 11:44:03 -05:00 |
|
Michael Schmatz
|
2574549a78
|
Improved error handling
|
2014-11-28 11:37:31 -05:00 |
|
Michael Schmatz
|
3475770f13
|
Merge branch 'master' into production
|
2014-11-28 11:09:07 -05:00 |
|
Michael Schmatz
|
0ac0065753
|
Fixed payments
|
2014-11-28 11:07:37 -05:00 |
|
Nick Winter
|
915a3243f5
|
Added feature image hair and thumb slots to the ThangType.
|
2014-11-26 16:29:48 -08:00 |
|
Nick Winter
|
53c6da5ef8
|
Allowing upload of paper doll images for items.
|
2014-11-26 14:18:17 -08:00 |
|
Nick Winter
|
318b499e3e
|
Merge branch 'master' into production
|
2014-11-26 12:57:10 -08:00 |
|
Scott Erickson
|
c4fdcab6fe
|
The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.
|
2014-11-26 12:02:42 -08:00 |
|
Nick Winter
|
98d8a2cfb3
|
Merge branch 'master' into production
|
2014-11-25 16:54:36 -08:00 |
|
Scott Erickson
|
790217f227
|
Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent.
|
2014-11-25 16:22:06 -08:00 |
|
Nick Winter
|
ab6251281e
|
Added a payment-received HipChat notification.
|
2014-11-25 13:20:09 -08:00 |
|
Scott Erickson
|
8f55b9bc1b
|
Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal.
|
2014-11-25 12:43:17 -08:00 |
|
Nick Winter
|
621764aa0c
|
Merge branch 'master' into production
|
2014-11-25 09:28:54 -08:00 |
|
Nick Winter
|
98f1eec10c
|
Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs.
|
2014-11-25 09:28:50 -08:00 |
|
Michael Schmatz
|
a3a3aea6aa
|
Merge branch 'master' into production
|
2014-11-25 11:21:30 -05:00 |
|
Michael Schmatz
|
2b8006ff83
|
Fixing more crashing bugs
|
2014-11-25 11:20:39 -05:00 |
|
Michael Schmatz
|
3ab8620745
|
Merge pull request #1798 from codecombat/master
Fixed a few crashing bugs
|
2014-11-25 10:57:31 -05:00 |
|
Michael Schmatz
|
30e08e2c99
|
Fixed a few crashing bugs
|
2014-11-25 10:52:20 -05:00 |
|
Michael Schmatz
|
2300cab908
|
Merge pull request #1797 from codecombat/master
Merge master into production
|
2014-11-25 10:02:51 -05:00 |
|
Michael Schmatz
|
d56f594d58
|
Better error handling
|
2014-11-24 20:07:29 -05:00 |
|
Nick Winter
|
16e264788a
|
Trying to workaround a crash I saw in the logs for GitHub auth.
|
2014-11-24 14:38:54 -08:00 |
|
Nick Winter
|
38c3ed8856
|
Merge branch 'master' into production
|
2014-11-23 20:13:43 -08:00 |
|
Matt Lott
|
c16b0f97bf
|
Update sync PVP to use transpiledCode
|
2014-11-22 20:48:07 -08:00 |
|
Scott Erickson
|
03705825d9
|
Made the GET /db/* endpoints generally accessible without needing to have a user object associated with the request.
|
2014-11-22 18:41:06 -08:00 |
|
Nick Winter
|
472b05a5e0
|
Merge branch 'master' into production
|
2014-11-21 13:09:02 -08:00 |
|
Scott Erickson
|
e5b87e5158
|
Tweaked, re-enabled achievement specs.
|
2014-11-21 10:59:48 -08:00 |
|
Scott Erickson
|
c77d38d59f
|
Made sure Apple receipts can't be re-used with different accounts.
|
2014-11-21 10:34:37 -08:00 |
|
Nick Winter
|
527d9355e7
|
Merge branch 'master' into production
|
2014-11-21 10:05:01 -08:00 |
|
Nick Winter
|
4de71507a8
|
Fixed winston require in EarnedAchievement handler.
|
2014-11-21 10:04:50 -08:00 |
|
Nick Winter
|
66f946a881
|
Merge branch 'master' into production
|
2014-11-20 22:17:41 -08:00 |
|
Scott Erickson
|
b86e3c30dc
|
Set up level achievements to be created manually by the client, hopefully making them a bit more stable.
|
2014-11-20 22:09:54 -08:00 |
|
Nick Winter
|
a15f25e155
|
Merge branch 'master' into production
|
2014-11-20 22:02:18 -08:00 |
|
Nick Winter
|
2393165d9a
|
Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found.
|
2014-11-20 21:57:47 -08:00 |
|
Nick Winter
|
29cbf16dd7
|
Merge branch 'master' into production
|
2014-11-20 19:32:37 -08:00 |
|
Michael Schmatz
|
f84e92595b
|
Changed UDID to identifierForVendor
|
2014-11-20 20:03:24 -05:00 |
|
Scott Erickson
|
a18537b065
|
Added the ability to assign a user an iOS UDID, and login with it.
|
2014-11-20 15:54:15 -08:00 |
|
Scott Erickson
|
fae09aad00
|
Turned on double optin for MailChimp.
|
2014-11-20 14:31:50 -08:00 |
|
Nick Winter
|
df51e28a1d
|
Fixed camera zoom killing coordinate hover unnecessarily.
|
2014-11-20 11:37:10 -08:00 |
|
Nick Winter
|
bfeb1457a1
|
Merge branch 'master' into production
|
2014-11-19 18:36:40 -08:00 |
|
Scott Erickson
|
13de055c0b
|
Set up a basic achievements list modal for the world map.
|
2014-11-19 14:56:40 -08:00 |
|
Nick Winter
|
2574f85f3e
|
Merge branch 'master' into production
|
2014-11-17 21:30:57 -08:00 |
|
Nick Winter
|
bf71893ddf
|
Significantly reduced memory usage and simulation time by further limiting the amount of Thangs which even start tracking ThangState in the first place.
|
2014-11-17 21:30:44 -08:00 |
|
Scott Erickson
|
95dca575d1
|
Set up stripe on the server and site to allow purchases through the website.
|
2014-11-17 15:15:08 -08:00 |
|