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

339 commits

Author SHA1 Message Date
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
Ruben Vereecken
1a587b607f GET /auth/name/<name> now serves possible free names 2014-07-13 17:47:07 +02:00
Ruben Vereecken
a310afc750 Corrected sending errors in auth 2014-07-10 10:07:36 +02:00
Michael Schmatz
013ace65f6 Basic email structure plus distributed locking system 2014-07-09 16:24:14 -07:00
Michael Schmatz
02ccade43f Removed extraneous code 2014-07-08 16:28:45 -07:00
Michael Schmatz
3ff66d7807 Removed empty file and unused function 2014-07-08 16:26:51 -07:00
Ruben Vereecken
601c4e2731 Merged with master 2014-07-05 16:47:16 +02:00
Ruben Vereecken
7a07e1feb0 Whoop whoop test for recalculation of gamesCompleted 2014-07-04 19:27:37 +02:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Michael Schmatz
e3a87156a2 Send BCC email to employer when contacting candidates 2014-06-24 14:35:30 -07:00
Scott Erickson
573b566580 Fixed the cloudflare config to be in the environmental variables. 2014-06-24 12:29:47 -04:00
Scott Erickson
9a571a6fe7 Fixed the file not 'changing' when overwritten. It was a caching issue. 2014-06-24 11:55:04 -04:00
Nick Winter
b0eb839cf4 Merge pull request #1193 from kumabotz/remove-coffee-extension 
Remove coffee extension
 2014-06-20 20:50:11 -07:00
Nick Winter
c090103126 Fixed employer email address deliverability issue. 2014-06-19 13:42:51 -07:00
Tery Lim
6dd7edadd2 Remove coffee extension 2014-06-19 23:38:07 +08:00
Nick Winter
66e2805a9a Added StackLead integration. Employerified profile backgrounds. 2014-06-14 20:59:28 -07:00
Scott Erickson
8ab69cf833 Merge pull request #1138 from rubenvereecken/search-endpoint 
Search endpoint is now without the /search prefix
 2014-06-12 11:33:28 -07:00
Ruben Vereecken
925594ffe9 Took a detour to write tests for BadMethod. Queue's tests not working yet. 2014-06-12 19:42:36 +02:00
Ruben Vereecken
b66f4984c3 Finished basic functional tests for achievement 2014-06-12 19:42:30 +02:00
Ruben Vereecken
bd2b289943 Recalculate script mainly finished 2014-06-12 19:40:59 +02:00
Ruben Vereecken
bea751eed9 Laid down the basics for an admin server endpoint 2014-06-12 19:40:59 +02:00
Ruben Vereecken
0751581113 Search endpoint is now without the /search prefix 
Intermediate commit for search refactoring
 2014-06-12 19:19:30 +02:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Michael Schmatz
97cbf55695 Simulator fetch random Greed games when queue empty 2014-05-19 18:58:45 -07:00
Michael Schmatz
6f2fd8e293 Verification simulator changes 2014-05-19 10:11:23 -07:00
Scott Erickson
b0292a34d2 Server console outputs recovery password if in development. 2014-05-09 16:33:06 -07:00
Michael Schmatz
bdf6d9e759 Fixed recipient address 2014-05-05 15:41:04 -07:00
Michael Schmatz
bf8feb216a Fixed ladder mail handler 
oh mongoose
 2014-05-05 15:11:00 -07:00
Scott Erickson
32ba4a8f75 Added a handler for fetching names of versioned docs by originals. 2014-04-28 14:31:11 -07:00
Scott Erickson
42fb19fe3a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 10:46:10 -07:00
Scott Erickson
767af42c3f Fixed #905. 2014-04-24 10:45:52 -07:00
Michael Schmatz
b0865ce3d1 Hotfix for CLA submissions permissions 2014-04-24 08:45:42 -07:00
Scott Erickson
f7035d4220 Added an unsubscribe url for recruit notifications. 2014-04-22 19:27:39 -07:00
Scott Erickson
f57be1ae52 Migrated to the new email system, along with a setting for recruit notifications. 2014-04-21 16:15:23 -07:00
Nick Winter
072729acc3 Non-admins can save (but not overwrite) file uploads. 2014-04-12 13:03:46 -07:00
Scott Erickson
30f785f7cf Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Scott Erickson
97a7bc7614 Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
Michael Schmatz
b182afd413 Fixed cron ladder auth 2014-04-10 17:50:39 -07:00
Nick Winter
7a35a6248f Adding contact form for employers to contact candidates. 2014-04-10 14:59:32 -07:00
Scott Erickson
c382889748 Bunch of server changes, mainly adding all the JSON schema validation and fixing tests. 2014-04-08 14:10:50 -07:00
Michael Schmatz
17c1bb7344 Fixed transactional mail auth and added 2 week email 2014-04-07 09:51:32 -07:00
Scott Erickson
0a78368217 Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it. 2014-04-02 13:12:24 -07:00
Nick Winter
29e7b8e5c1 Fixed mail to correctly capture the matches. 2014-03-22 09:48:36 -07:00
Michael Schmatz
13a74ba560 Added resimulateAllSessions route 2014-03-22 09:17:14 -07:00
Nick Winter
dfcdcaa678 No email addresses for non-admins on CLA submissions. 2014-03-21 17:20:47 -07:00
Nick Winter
ba66dbf5a1 Adding CLAs view. 2014-03-21 16:22:47 -07:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07:00
Michael Schmatz
6dcbaddbbd Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/views/play/spectate_view.coffee
 2014-03-15 09:20:44 -07:00
Michael Schmatz
2c6e667bb7 Added API for queue messages count 2014-03-15 09:20:13 -07:00
Nick Winter
95cd3782a1 Oops, don't keep sending ladder updates just to me. 2014-03-15 07:45:44 -07:00
Nick Winter
6e9945040f Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now. 2014-03-13 19:20:22 -07:00
Nick Winter
4f0805ce1e I changed the semantics of the i18n fallback to not hit 'text' for other properties, so updated a test. 2014-03-13 18:50:52 -07:00
Michael Schmatz
291f5eb02f Disabled authentication for now 2014-03-13 18:41:58 -07:00
Michael Schmatz
edb28f6caf Changed cron handler IP check 2014-03-13 16:11:44 -07:00
Nick Winter
9d8b8e7395 Probably too mean to tell users that their password is wrong three times, so just once will do. 2014-03-13 10:27:32 -07:00
Michael Schmatz
23f62e5598 Added ip checks on cron mail route 2014-03-12 08:11:48 -07:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Nick Winter
bba3c78107 Ties are not victories in the emails. 2014-03-11 13:20:52 -07:00
Nick Winter
eac219a2be Inserted score history graph into ladder update emails. 2014-03-10 22:03:33 -07:00
Nick Winter
32baf2ae79 Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes. 2014-03-10 21:30:46 -07:00
Nick Winter
6ce65488aa Added simple rank history graph. Improving ladder update mail. 2014-03-10 20:22:25 -07:00
Nick Winter
6055512ac7 Working on ladder updates. 2014-03-10 13:20:00 -07:00
Nick Winter
3d71fcbc70 Wins, losses, and realizing that I'm not doing server code right. 2014-03-09 18:46:11 -07:00
Nick Winter
82857fd080 Was able to send out some emails. 2014-03-08 21:29:41 -08:00
Nick Winter
f05e8432a9 Starting work on ladder update emails. 2014-03-08 18:49:09 -08:00
Scott Erickson
9726840d8a Trying to handle a case where a user did not have their user account created. 2014-03-04 12:21:02 -08:00
Scott Erickson
881ec1a4b3 Added a fix for files with spaces. 2014-03-03 17:03:02 -08:00
Michael Schmatz
b648098c95 Implemented espionage mode 2014-02-26 14:14:43 -08:00
Scott Erickson
e63763d539 Made the server resistant to req.user being undefined sometimes. 2014-02-24 20:27:38 -08:00
Scott Erickson
2be752ceed Refactored user creation to /auth/whoami, and made the app call that first, so only one user is created. Fixed #318. Think this also fixes #406. 2014-02-24 11:12:52 -08:00
Michael Schmatz
92bec1a95c Added pairwise utility route 2014-02-24 07:50:53 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Michael Schmatz
24043eaee9 Refactored queue files and moved scoring queue out of commons queue 2014-02-06 14:32:35 -08:00
Michael Schmatz
609547a37c Refactored queue routing structure 2014-02-06 13:25:11 -08:00
Michael Schmatz
3ccaa6796a Improved routes and put in session access 2014-02-05 16:41:01 -08:00
Michael Schmatz
b174b10642 Added message class for SQS, basic scoring routes 2014-02-05 15:07:15 -08:00
Michael Schmatz
308f34bc76 Merge branch 'feature/task-queue' of github.com:codecombat/codecombat into feature/task-queue 
Conflicts:
	server_setup.coffee
 2014-02-05 09:42:25 -08:00
Michael Schmatz
5c328d09f5 Added scoring and queue modules 2014-02-05 09:39:14 -08:00
Michael Schmatz
177eb60e48 Merge pull request #342 from codecombat/master 
Merge server refactor into task queue
 2014-02-05 09:38:18 -08:00
Sébastien Moratinos
f58acf0fbb rename some variables 2014-02-04 23:28:21 +01:00
Sébastien Moratinos
baf5ada19d use a mapping for handlers, schemas, and routes 2014-02-04 23:27:24 +01:00
Sébastien Moratinos
23a07303e3 move database setup (mongodb) out of db route (http endpoint) 2014-02-04 23:26:04 +01:00
Michael Schmatz
a3b17c7d86 Put in basic client-side routes and created server side scoring routing file 2014-02-04 10:07:14 -08:00
Michael Schmatz
3256a5d65d Added support for replica set 2014-02-03 08:56:32 -08:00
Sébastien Moratinos
f27db34976 add server auth test (reset password) 2014-02-03 00:08:52 +01:00
Sébastien Moratinos
8895f12aff Fix error 500 when resetting password if bad input. 2014-02-03 00:08:07 +01:00
Scott Erickson
46dd4044aa I'm pretty sure it's working now. 2014-01-24 17:42:47 -08:00
Scott Erickson
eafa82357c MailChimp webhook fix. 2014-01-24 17:35:34 -08:00
Scott Erickson
3122dd9594 More tweaks to the mail module. 2014-01-24 17:19:20 -08:00
Scott Erickson
7bc6d0f6ed No longer returning error messages when given bad input, because then MailChimp won't accept it as a webhook. 2014-01-24 13:55:23 -08:00
Scott Erickson
c4114f9f92 More fixes. 2014-01-24 13:47:25 -08:00
Scott Erickson
ced57ac35d More tweaks. 2014-01-24 13:22:56 -08:00
Scott Erickson
dd9c4007a2 Reverting back to super log mode cause it stopped working. 2014-01-24 13:14:31 -08:00
Scott Erickson
79032b1c35 Couple remaining fixes. 2014-01-24 12:54:15 -08:00
Scott Erickson
4450747671 Finished setting up the mailchimp webhook. 2014-01-24 12:53:41 -08:00
Scott Erickson
a71b688a15 Fixed the mailchimp webhook. 2014-01-24 12:39:05 -08:00
Scott Erickson
95186cc5ae Much improved the mailchimp webhook. 2014-01-24 12:23:14 -08:00
Scott Erickson
b2366c50af Came up with a better hacky logging system. 2014-01-24 11:55:44 -08:00
Scott Erickson
62770c35df Added a test webhook for MailChimp. 2014-01-24 11:48:00 -08:00
Scott Erickson
004e7cc79e Refactored some mail functions and constants to a new common module. 2014-01-24 11:47:14 -08:00
Sébastien Moratinos
bbfc0eff69 server db route (handlers and schemas) 
- use associative arrays to store path/filename
- add more test for schemas
 2014-01-23 23:06:12 +01:00
Sébastien Moratinos
e7ca7c4c1a remove unused modules 2014-01-23 01:01:45 +01:00
Sébastien Moratinos
729cd300b7 server reorganize files and folder by features 
- move and rename files
- use associative arrays which store handlers for 'dynamically'
  load module from de db route
- store models_path in test/server/common,
  a global model variable has the same name that the filename of the model
 2014-01-23 01:01:40 +01:00
Sébastien Moratinos
771099d43e server : move routes files (HTTP endpoint) in a new "routes" folder 2014-01-23 01:01:30 +01:00