codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 19:36:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6736 commits 27 branches 0 tags 134 MiB
Commit graph

184 commits

Author SHA1 Message Date
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