Nick Winter
899aae5798
Consolidated extra resources.
2015-07-10 14:20:25 -07:00
Nick Winter
40e1e6b2ac
Merge branch 'master' into production
2015-06-30 11:28:11 -07:00
Nick Winter
270340a79f
Removed Learnable.
2015-06-24 09:18:13 -07:00
Nick Winter
bc8e0945a1
Merge branch 'master' into production
2015-06-17 18:17:22 -07:00
Matt Lott
5c240d89cd
Cancel recipient subscriptions immediately
2015-06-17 16:35:30 -07:00
Matt Lott
b27a4539f1
Merge branch 'master' into production
2015-06-05 10:38:20 -07:00
Imperadeiro98
a85e6fb695
Removed unnecessary full stop
2015-06-02 21:34:01 +01:00
Matt Lott
9828bd5d1d
Sponsored sub cleanup on unsubscribe
...
Sponsored subscriptions can be partially set up when the incremental
subscription charge fails. This cleans up the sponsored subscriptions
when one of the recipient subscriptions is cancelled.
Related to #2786
2015-05-28 16:56:13 -07:00
Nick Winter
5c70321741
Merge branch 'master' into production
2015-05-25 14:05:19 -07:00
Nick Winter
bb17621b47
Don't let the server die when a sponsored subscription's sponsor can't be found.
2015-05-25 14:03:07 -07:00
Nick Winter
28b44f9535
Merge branch 'master' into production
2015-05-25 09:58:39 -07:00
Nick Winter
bebe2dde21
Adding a log to check out what's going on with updating of sponsored subscriptions.
2015-05-25 09:58:25 -07:00
Matt Lott
627884a608
Merge branch 'master' into production
2015-05-12 15:25:34 -07:00
Nick Winter
b7d1ab2b01
Not sending HipChat messages for level load errors. Not sending level load errors for level editor loads. Not sending more than one level load error report per session.
2015-05-11 18:53:42 -07:00
Matt Lott
d016f7d791
Merge branch 'master' into production
2015-04-28 10:32:50 -07:00
Nick Winter
a4964ea36e
Reduced transactional email sends a bit.
2015-04-27 15:06:26 -07:00
Nick Winter
9d0d07df06
Merge branch 'master' into production
2015-04-25 17:38:16 -07:00
Nick Winter
80af32180c
Fixed #1638 : detect and automatically report unrecoverable world loading errors, plus adding better instructions for checking dev console. We can't recover yet, but having eyes on it will hopefully give us better visibility on this kind of error.
2015-04-25 17:29:02 -07:00
Nick Winter
c8c11df64e
Merge branch 'master' into production
2015-04-20 11:20:58 -07:00
Nick Winter
dc90481a5c
Fixed #2458 , I think.
2015-04-18 19:57:37 -07:00
Nick Winter
ebf87e5a12
Merge branch 'master' into production
2015-04-10 18:07:47 -07:00
Nick Winter
fc43803588
Fixed ladder match links in ladder update emails.
2015-04-10 08:17:51 -07:00
Matt Lott
4da477c72f
Merge branch 'master' into production
2015-04-07 10:06:20 -07:00
Nick Winter
7f41ad6c52
Added OSTraining and Breakout Mentors resources.
2015-04-07 09:25:42 -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
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
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
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
Matt Lott
82991f9805
Merge branch 'master' into production
2015-03-13 15:55:32 -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
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
2cf23fc481
Merge branch 'master' into production
2015-03-04 17:08:55 -08:00
Nick Winter
1c88881b44
Hooked up a next-steps email to be sent on day two.
2015-03-04 17:08:45 -08:00
Nick Winter
6868dafb84
Merge branch 'master' into production
2015-02-25 18:41:56 -08:00
Nick Winter
4e11870be0
Fixed bug with anonymous players' email addresses not making it through.
2015-02-25 17:39:54 -08:00
Nick Winter
96959169ee
Merged db.coffee.
2015-02-18 09:07:49 -08:00
Aman Kumar
f7450c214c
Added user info to db server error
2015-02-17 22:54:49 +05:30
Aman Kumar
c76241be40
Added user info to db error
2015-02-17 14:42:12 +05:30
Nick Winter
7ce0a3dba1
Merge branch 'master' into production
2015-02-05 09:36:18 -08:00
Nick Winter
a189e32948
Refactored sending of HipChat room messages.
2015-02-04 16:17:53 -08:00
Nick Winter
9287df1398
Merge branch 'master' into production
2015-01-27 20:36:53 -08:00
Nick Winter
2e09a94736
Asking for feedback when cancelling subscriptions.
2015-01-26 16:48:32 -08:00
Nick Winter
181842e97b
Merge branch 'master' into production
2015-01-13 13:10:47 -08:00
Scott Erickson
f9a01db985
Added a delete endpoint for files. Fixes #33 .
2015-01-12 13:37:01 -08:00
Nick Winter
1b047a7088
Merge branch 'master' into production
2015-01-09 13:48:30 -08:00
Imperadeiro98
68ed142bd6
Update auth.coffee
2015-01-08 19:27:37 +00:00
Nick Winter
3ba746094a
Merge branch 'master' into production
2015-01-07 15:04:54 -08:00
Nick Winter
1455dc0550
Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet.
2015-01-07 12:25:43 -08:00
Nick Winter
a7b39c981b
Merge branch 'master' into production
2014-12-24 11:03:01 -08:00
Nick Winter
d6b5c14123
Give me thine email addresses correctly, dear contact handler.
2014-12-24 11:02:52 -08:00
Nick Winter
4f80d2a977
Merge branch 'master' into production
2014-12-23 08:20:45 -08:00
Nick Winter
759e193f29
Pulling email from user in contact form if they gave an invalid email reply-to.
2014-12-23 08:20:35 -08:00
Nick Winter
20ae570959
Merge branch 'master' into production
2014-12-20 13:43:36 -08:00
Nick Winter
08cb87c84d
Automatically take screenshots when submitting contact form from level view.
2014-12-19 18:37:42 -08:00
Nick Winter
52b2917db5
Merge branch 'master' into production
2014-12-19 17:28:18 -08:00
Nick Winter
6ac0bea5ca
Beefing up contact form data population.
2014-12-19 17:27:58 -08:00
Nick Winter
98ab756835
Merge branch 'master' into production
2014-12-18 22:22:54 -08:00
Nick Winter
0635d1dccf
Fixed typo in contract emails.
2014-12-18 22:22:44 -08:00
Nick Winter
5492e0b62a
Merge branch 'master' into production
2014-12-18 20:39:29 -08:00
Nick Winter
59b433d863
Upgrading contact form context a bit.
2014-12-18 20:39:15 -08:00
Nick Winter
d801ed61ce
Separating contact emails into premium subscriber support and basic general support.
2014-12-18 20:35:14 -08:00
Matt Lott
e573f0344c
Merge branch 'master' into production
2014-12-18 00:21:28 -08:00
Nick Winter
fe0c89e433
Reverting 1167655f
and 30ed0a0e
to re-enable the analytics log handler.
2014-12-17 21:54:56 -08:00
Nick Winter
2ea47cf83b
Fixed #1952 (unsubscribing from specific ladder update emails).
2014-12-17 19:38:36 -08:00
Matt Lott
8ec583109a
Merge branch 'master' into production
2014-12-17 14:29:17 -08:00
Matt Lott
6ab74f9dab
Disable analytics.users.active
2014-12-17 14:17:50 -08:00
Matt Lott
71e66c4d61
No hipchat for analytics.log.event post errors
2014-12-17 10:57:19 -08:00
Nick Winter
60076d09c1
Merge branch 'master' into production
2014-12-15 10:05:41 -08:00
Nick Winter
9ec4b741c4
Fixed CLA permissions check.
2014-12-15 10:02:05 -08:00
Nick Winter
7fb0784921
Merge branch 'master' into production
2014-12-14 13:37:58 -08:00
Nick Winter
753acb1299
Added 'github' permission type to allow access to CLAs view.
2014-12-14 13:37:43 -08:00
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
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
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
cd3bb690f4
Created stripe subscription logic.
2014-12-02 20:02:35 -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
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
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
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
Michael Schmatz
2300cab908
Merge pull request #1797 from codecombat/master
...
Merge master into production
2014-11-25 10:02:51 -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
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
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
Nick Winter
b2e6bcf872
Merge branch 'master' into production
2014-10-02 17:04:47 -07:00
Nick Winter
16ff8c6601
Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails.
2014-10-02 12:10:24 -07:00
Michael Schmatz
858b24a73d
Removed superfluous comment
2014-09-27 09:06:53 -04:00
Nick Winter
1a46d4345d
Merge pull request #1584 from ThatOtherPerson/log-user-ips
...
Log last-used IP in User object
2014-09-23 17:10:00 -07:00
Nick Winter
c54bf3553f
Added basic JSONP support for /auth/whoami public properties.
2014-09-22 14:56:02 -07:00
David Beckley
2acebb54c6
Fix #1005
2014-09-21 23:02:06 -07:00
Nick Winter
77e7efebeb
Fixed #1385 : no more redundant fallback localization files.
2014-08-30 19:30:33 -07:00
Nick Winter
24d3d189df
Made espionage mode simpler, and added an admin user lookup.
2014-08-30 17:09:57 -07:00
Nick Winter
4d24233b0d
Fixed #1356 .
2014-08-30 15:19:42 -07:00
Nick Winter
832402af6e
Merged/tweaked GitHub login.
2014-08-26 08:37:11 -07:00
Ruben Vereecken
40818fd7bc
GitHub Login implemented
2014-08-15 16:20:45 +02:00
Matt Lott
9b79e2ca27
Instrument user code problems
2014-08-14 13:32:00 -07:00
Ruben Vereecken
47f00f9b5e
Added achievement deleting and automatic achievement filling
2014-08-08 17:20:07 +02:00
Ruben Vereecken
30a6cf1cca
Merged in name changes from master
2014-07-29 17:28:13 +02:00
Ruben Vereecken
3191c87cf1
Added recalculation for patches. Struggled with translations. Won't recalculate those probably
2014-07-24 14:41:06 +02:00
Ruben Vereecken
ebfe1fc1c0
Proofed admin endpoint some more, no more dangling connections
2014-07-23 13:06:51 +02:00
Michael Schmatz
984be9980e
Put minimum candidates available before employer email
2014-07-21 08:32:44 -07:00
Michael Schmatz
ab4424c7ac
Changed employer reminder to send every 14 days
2014-07-21 08:13:09 -07:00
Michael Schmatz
37b8790b58
Added task text and candidate name to task emails
2014-07-21 08:02:53 -07:00
Ruben Vereecken
1c6da9711b
Added the Recently Played collection and endpoint
2014-07-21 14:36:10 +02:00
Michael Schmatz
1d5078ad10
Changed https to http in curation email
2014-07-18 19:22:01 -07:00
Michael Schmatz
cd0d81438d
Add recruitment task reminder emails
2014-07-18 16:26:55 -07:00
Michael Schmatz
321bce121c
Edited task schema
2014-07-18 14:50:31 -07:00
Michael Schmatz
8c3613dfc7
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
server/routes/mail.coffee
2014-07-18 11:07:11 -07:00
Michael Schmatz
a6ab977034
Add candidate finish reminder email
2014-07-18 11:05:37 -07:00
Nick Winter
8813a7f545
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec
Restored legacy candidates view
2014-07-17 13:16:17 -07:00
Michael Schmatz
0561235da2
Have no emails send to employers who haven't logged in
2014-07-17 09:50:18 -07:00
Michael Schmatz
e4d4c973da
Minor fixes to email system
2014-07-17 09:28:34 -07:00
Michael Schmatz
ccb2ad67ac
Merge pull request #1342 from codecombat/feature/mail-system
...
Feature/mail system
2014-07-17 07:18:39 -07:00
Michael Schmatz
58a80f2512
Removed old comment
2014-07-17 07:17:25 -07:00
Michael Schmatz
2a865a0ca0
Remove testing conditions
2014-07-16 19:49:48 -07:00
Michael Schmatz
d821e459d1
Encode/decode emails as URIs
...
This helps to handle special characters like plusses.
2014-07-16 19:46:06 -07:00
Michael Schmatz
fc4568a100
Fixed misc bugs
2014-07-16 17:02:40 -07:00
Michael Schmatz
ae23679a26
Hard code mail tasks and add unsubscribe
2014-07-16 16:37:06 -07:00
Michael Schmatz
24bcfd9f26
Reviewed code, almost ready for release
2014-07-16 15:50:31 -07:00
Michael Schmatz
59a35c844f
Made mail system resilient to redis failures
2014-07-16 14:29:30 -07:00
Michael Schmatz
5c0c25ebd1
Async must not break upon sendwithus failure
2014-07-16 13:56:23 -07:00
Michael Schmatz
3c257a488d
Employer candidates available email completed
2014-07-16 13:54:05 -07:00
Michael Schmatz
67f2eeb584
Progress on employer new candidates available email
2014-07-16 13:14:09 -07:00
Michael Schmatz
e218c2297d
Some emails working
2014-07-16 12:13:21 -07:00
Ruben Vereecken
6219697295
Worked in scott's comments and got tests working again
2014-07-16 12:48:51 +02:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02:00
Scott Erickson
8fb26ce8fb
Fixed a server error caused by the recent removal of trailing slashes on urls I think.
2014-07-14 10:11:49 -07:00
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00