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

1239 commits

Author SHA1 Message Date
Scott Erickson
4658c3000f Extended getLatestVersion for Handler to also be able to accept project parameters. 2014-07-18 16:12:27 -07:00
Scott Erickson
52447f9e22 Fixed the avatar endpoint handling when the user object DNE. 2014-07-18 16:12:27 -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
337de506dd Removed mail task from server mapping 2014-07-17 07:15:14 -07:00
Michael Schmatz
2a865a0ca0 Remove testing conditions 2014-07-16 19:49:48 -07:00
Michael Schmatz
c717e609ea Initialize value of this.redisNotAvailable 2014-07-16 19:46:30 -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
Michael Schmatz
3a405e22f3 Changed name of mail sent collection 2014-07-16 12:12:54 -07:00
Michael Schmatz
449f1e1afc Updated locking/release procedure 2014-07-16 12:12:44 -07:00
Michael Schmatz
bb3c583300 Add approved date to job profile 2014-07-16 10:51:45 -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
Scott Erickson
9893f39ad1 Handling merge conflict. 2014-07-14 10:04:07 -07:00
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Ruben Vereecken
8e82702348 Fixed an async case that failed a test only sometimes 2014-07-13 21:32:25 +02: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
Tery Lim
bc3b0645ea Remove extra require and minor cleanup 2014-07-13 23:18:55 +08:00
Scott Erickson
a3c524424c Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users 2014-07-10 11:13:28 -07:00
Michael Schmatz
2eeb7ec5aa Make random games come from all levels 2014-07-10 10:42:59 -07:00
Ruben Vereecken
9e296b7c3d Added a test case for unsetting slugs (and fixed related bug) 2014-07-10 18:24:02 +02:00
Ruben Vereecken
94210fc461 Anonymous users are now silently renamed upon signup in case of conflict 2014-07-10 18:00:32 +02:00
Ruben Vereecken
6e593b2ec0 User name slugs can now be unset by emptying their name 2014-07-10 10:46:41 +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
Ruben Vereecken
a8353cb7ff Anonymous users can have the same name 2014-07-09 21:34:35 +02:00
Scott Erickson
d74a778f67 Made creating components open to everyone! 2014-07-09 12:21:32 -07:00
Ruben Vereecken
ac95d775e6 Users can now be gotten by slug 2014-07-09 20:23:05 +02:00
Scott Erickson
a7690f0931 Fixed #1198 2014-07-09 10:10:43 -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
Scott Erickson
02890d5a6d Enabled edits to components by non-admins (creation is still off limits). 2014-07-07 14:22:59 -07:00
Michael Schmatz
b76239b4e9 Replaced candidate avatars on employer page 2014-07-07 10:29:35 -07:00
Ruben Vereecken
ea3d1fee74 Starting on achievement overview style 2014-07-07 15:03:28 +02:00
Ruben Vereecken
51bc8e5a7c Merged master 2014-07-06 20:07:47 +02:00
Ruben Vereecken
246c39b558 User stats now go through Mongoose middleware 2014-07-05 17:02:48 +02:00
Ruben Vereecken
601c4e2731 Merged with master 2014-07-05 16:47:16 +02:00
Tery Lim
a5476f90ed Minor cleanup for convention and readability 2014-07-05 18:48:08 +08:00
Ruben Vereecken
e904a0a8f7 Achievement recalculation is now covered with tests 2014-07-04 19:27:41 +02:00
Ruben Vereecken
a367082cc4 Corrected statistic logic, wrote test case 2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d added isTranslationPatch method to patches 2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b All edits are now tracked 
intermediate

intermediate
 2014-07-04 19:27:38 +02:00
Ruben Vereecken
b951205681 intermediate 2014-07-04 19:27:38 +02:00
Ruben Vereecken
838012a2cf Wrote and tested articleEdits recalculation 2014-07-04 19:27:38 +02:00
Ruben Vereecken
6ae505e8a1 stats.articleEdits are now tracked and tested 2014-07-04 19:27:37 +02:00
Ruben Vereecken
7a07e1feb0 Whoop whoop test for recalculation of gamesCompleted 2014-07-04 19:27:37 +02:00
Ruben Vereecken
7a4c6daec8 stats.gamesCompleted is now tracked in users 2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4 Added achievement preview, exp test, stuff 2014-07-04 19:27:37 +02:00
Ruben Vereecken
1fe2c67ffe Added tests for repeatable achievements, including complicated xp 
Intermediate
 2014-07-04 19:27:37 +02:00
Ruben Vereecken
faf02d8e4b Finally managed a setup that makes the tests succeed 2014-07-04 19:27:37 +02:00
Ruben Vereecken
488d49e286 intermediate 2014-07-04 19:27:37 +02:00
Tery Lim
9090ce7714 Merge master into branch 2014-07-04 22:37:16 +08:00
Michael Schmatz
538344094b Fixed filter behavior 2014-07-03 13:59:10 -07:00
Michael Schmatz
fe328a766b Basic filtering functionality 
Still has a few bugs
 2014-07-02 15:48:26 -07:00
Michael Schmatz
c6cc28b976 Various fixes to enable employers page to function correctly 2014-07-02 11:45:00 -07:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Nick Winter
58bf85d234 Simulator handles when there are no Greed matches to randomly simulate. 2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e Exposing Vector z property. Getting ready to use new builtin property documentation. 2014-06-27 00:36:18 -07:00
Michael Schmatz
e3a87156a2 Send BCC email to employer when contacting candidates 2014-06-24 14:35:30 -07:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Nick Winter
8719b80663 Showing expired profiles to admins. 2014-06-24 10:15:38 -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
c9dcc290cb Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes. 2014-06-20 17:19:18 -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
Ruben Vereecken
a1667a0d5e efficient fetching of level sessions 2014-06-19 17:24:07 +02:00
Nick Winter
aa4832791e Made public version of a user's LevelSessions available via endpoint. 2014-06-19 08:07:47 -07:00
Nick Winter
ac6c7292c8 Fixed Gridmancer session linking on profile view. 2014-06-18 12:05:40 -07:00
Nick Winter
4bd02ba6dc ModelModal now grants real ultimate power. 2014-06-17 15:17:25 -07:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Tery Lim
b6c8a170d1 Fix typo for receive 2014-06-17 10:50:56 +08:00
Nick Winter
66e2805a9a Added StackLead integration. Employerified profile backgrounds. 2014-06-14 20:59:28 -07:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -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
dcdcca751f Fiddled with creating xp functions 2014-06-12 19:44:56 +02:00
Ruben Vereecken
fddca03417 Worked on achievement tests 2014-06-12 19:44:55 +02: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
aecf937722 Cleaned up achievement testing environment 
Made sure server sided tests work completely
 2014-06-12 19:41:07 +02:00
Ruben Vereecken
2a5c2020ca Added recalculation button to the achievement editor 2014-06-12 19:41:07 +02:00
Ruben Vereecken
509be067c3 Added support for the operator in LocalMongo 2014-06-12 19:41:00 +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
a61d0e5569 Added support for diminished exp for repeatables. Needs tweaking though. 2014-06-12 19:40:59 +02:00
Ruben Vereecken
2c04025a5a Created a test environment for repeatables 2014-06-12 19:40:59 +02:00
Ruben Vereecken
fef72d8273 Finished Article tests to demonstrate search functionality 2014-06-12 19:19:34 +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
Ruben Vereecken
8e33b6b534 Fixed all server-sided tests 
NEVER. AGAIN
 2014-06-11 20:17:27 +02:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Scott Erickson
9c1213d3c4 Removed the migration plugins. 2014-06-10 15:04:48 -07:00
Scott Erickson
f0ff8c242e Migrating language to codeLanguage on systems and components because they conflict with the search system. 2014-06-10 13:20:14 -07:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Tery Lim
4036532680 Fix indentation 2014-06-09 00:35:35 +08:00
Nick Winter
63a3aa9074 Fixes for browsing profiles by username. 2014-06-07 17:33:14 -06:00
Michael Schmatz
281b6968d6 Make level session selection random 
Rather than weighted random on submission time
 2014-06-05 17:14:26 -07:00
Ruben Vereecken
ed44ab5f7d Improved logging (winston) and admin-only'd the achievement editor 2014-06-02 21:07:23 +02:00
Ruben Vereecken
8d2c62ba84 Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-02 20:34:05 +02:00
Ruben Vereecken
bb57756cd9 Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d8bb802468 Designing the Notify to show level progress 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d766a24e11 Achievements now popup when polled for by the client 2014-06-02 20:33:01 +02:00
Ruben Vereecken
aa3fedeb02 Achievements can have icons. Users now have their scores denormalized 2014-06-02 20:32:00 +02:00
Ruben Vereecken
287019242f Achievement queries are now strings server sided but remain objects for the client 2014-06-02 20:32:00 +02:00
Ruben Vereecken
c26f96f33e Added achievement model and some missing pieces 2014-06-02 20:32:00 +02:00
Ruben Vereecken
a3ca382dcd Used the feedback from Scott to improve endpoints 2014-06-02 20:29:12 +02:00
Ruben Vereecken
2003b37343 Refactored the get user achievements 2014-06-02 20:29:12 +02:00
Ruben Vereecken
0f1c59f2d5 Refactored getAll into regular GET. I.e. /db/achievement 2014-06-02 20:29:12 +02:00
Ruben Vereecken
5e817bb1c7 Added support for repeatable achievements and stringified IDs 2014-06-02 20:29:12 +02:00
Ruben Vereecken
fb9ada6f97 Managed to track the difference between init and save, achievements work now 2014-06-02 20:29:12 +02:00
Ruben Vereecken
51e326efaa Created a GET endpoint for earned achievements by user 2014-06-02 20:29:12 +02:00
Ruben Vereecken
ab13340ec7 Admins can now post achievements 2014-06-02 20:29:12 +02:00
Ruben Vereecken
967e698cb2 Added a getAll handler for achievements 2014-06-02 20:29:12 +02:00
Ruben Vereecken
37b47d35de Got work done on detecting achievements 2014-06-02 20:29:12 +02:00
Ruben Vereecken
f2f4fef1e0 Wrote tests for the local mongo querier 2014-06-02 20:29:11 +02:00
Ruben Vereecken
99927d1345 Started on the local mongo querier 2014-06-02 20:29:11 +02:00
Scott Erickson
3602f67c24 Tweaked how editPath is passed to the server so it doesn't foul up validation. 2014-05-30 14:41:41 -07:00
Nick Winter
104a405453 Trying some error handling for a missing TaskLog error I saw. 2014-05-23 09:24:57 -07:00
Michael Schmatz
8fabbadff3 Fix random game results not being sent back 2014-05-22 09:02:57 -07:00
Nick Winter
48f5347075 Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting. 2014-05-21 21:56:11 -07:00
Michael Schmatz
482965fe0f No reset of scores when session resubmit 2014-05-21 16:58:51 -07:00
Michael Schmatz
d59c163493 Fix selection 2014-05-21 16:51:10 -07:00
Michael Schmatz
7bc4a0451c Weighted random selection of games 2014-05-21 15:34:19 -07:00
Michael Schmatz
47c41e0a6e Added error handling for findNearestBetterSessionID 2014-05-20 15:55:25 -07:00
Michael Schmatz
a6352c214a Add temp error handling for updateSessions 2014-05-20 15:35:44 -07:00
Michael Schmatz
de93dfd357 Stopgap measure for incorrectly formatted session results 2014-05-20 15:12:25 -07:00
Michael Schmatz
6fde166190 Revert "Stop sending out untranspiled code" 
This reverts commit f794ec4a46.
 2014-05-20 14:59:06 -07:00
Michael Schmatz
f794ec4a46 Stop sending out untranspiled code 2014-05-20 14:33:01 -07:00
Michael Schmatz
e732e7227c Made both game selections random 2014-05-20 12:45:25 -07:00
Michael Schmatz
aba0120e88 Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	server/queues/scoring.coffee
 2014-05-19 19:04:47 -07:00
Michael Schmatz
97cbf55695 Simulator fetch random Greed games when queue empty 2014-05-19 18:58:45 -07:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Michael Schmatz
6f2fd8e293 Verification simulator changes 2014-05-19 10:11:23 -07:00
Michael Schmatz
a46714b1b6 Patching bug if newScoreObject is incomplete 2014-05-17 12:02:34 -07:00
Michael Schmatz
e631bae248 Level session playtime logging 2014-05-16 15:27:46 -07:00
Michael Schmatz
5b93414862 Add playtime, opponent name, totalScore to match 2014-05-16 14:52:49 -07:00
Michael Schmatz
0bb1422d6c Switch spectate and level view to use transpiled code 2014-05-15 15:18:17 -07:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
Michael Schmatz
4e268d8dc6 Add codeLanguage to level session 2014-05-14 16:41:02 -07:00
Michael Schmatz
1e0f220352 Send out transpiled code with simulator task 2014-05-14 16:01:08 -07:00
Scott Erickson
7a381df348 Merge branch 'feature/thangload' 2014-05-14 11:48:19 -07:00
Michael Schmatz
a1360d6cb8 Include transpiled code in submission process 2014-05-14 11:42:15 -07:00
Nick Winter
1aa72541ff Merged master into feature/thangload. 2014-05-12 09:57:31 -07:00
Scott Erickson
b0292a34d2 Server console outputs recovery password if in development. 2014-05-09 16:33:06 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Scott Erickson
e87592059b Fixed saving user properties. Mentioned in #958 (was the source of the conflict error) but I don't think is related. 2014-05-07 12:25:05 -07:00
Scott Erickson
cde50a241f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-05 17:47:32 -07:00
Michael Schmatz
1793d9a882 Fixed testing logic 2014-05-05 17:33:47 -07:00
Scott Erickson
056f081cdb Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide 
Conflicts:
	app/views/modal/signup_modal.coffee
 2014-05-05 16:48:35 -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
aee90c72bb Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel. 2014-05-02 17:03:30 -07:00
Scott Erickson
b9f4093b08 Set up the LevelLoader to load names instead of whole ThangTypes. 2014-04-28 14:58:58 -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
ed556f50be Added reserved word checking for names. 2014-04-28 14:09:29 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Nick Winter
e89e1154bf Merge pull request #917 from dpen2000/patch-2 
Fix #916
 2014-04-27 20:26:32 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Scott Erickson
3dc3f62473 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/views/editor/components/main.coffee
 2014-04-25 14:31:58 -07:00
Nick Winter
ef30498985 Improved bad sendwithus error logging. 2014-04-25 11:12:52 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
0dbcc861bf Various tweaks to employer signup 2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
dpen2000
a37c45e8b0 Fix #916 2014-04-25 00:56:34 +01:00
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -07:00
Nick Winter
bc244fc53a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 11:09:18 -07:00
Nick Winter
73f39095e6 Upgraded table sorter. 2014-04-24 11:09:01 -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
Nick Winter
d4cf31c8fe Improved admin view of pending candidates. 2014-04-23 10:21:58 -07:00
Scott Erickson
b390b38054 Fixed a couple bugs and tests. 2014-04-23 09:19:07 -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
Scott Erickson
1e50ef36ce Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming 2014-04-21 12:53:11 -07:00
Scott Erickson
c754f7b943 Merge branch 'master' into feature/loading-views 2014-04-21 11:53:18 -07:00
Nick Winter
05dfa21a93 Fixed #872. Removed permissions check on old versions of document for version history, because we're not selecting any sensitive fields anyway. 2014-04-19 17:52:17 -07:00
Ting-Kuan
692693c181 Merge branch 'master' into feature/loading-views 
Conflicts:
	app/locale/en.coffee
	app/views/editor/level/edit.coffee
	app/views/kinds/CocoView.coffee
	app/views/play/ladder/ladder_tab.coffee
	app/views/play/ladder_view.coffee
	app/views/play/level/level_loading_view.coffee
 2014-04-19 01:15:04 -04:00
Nick Winter
bff71800b7 Added script to send out initial recruitment intro email. 2014-04-18 17:17:41 -07:00
dpen2000
b20f8fd260 Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee 2014-04-18 21:06:57 +01:00
Nick Winter
f38d17c64f Protected candidates from view by employers they work(ed) at. 2014-04-18 12:48:13 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Scott Erickson
8adca4a1da Added a transactional email for when changes are made, to notify watchers. 2014-04-17 17:30:55 -07:00
Scott Erickson
ed0c7e1412 Creators of documents are automatically added as watchers. Added a patch creation email for watchers. 2014-04-17 17:09:01 -07:00
Scott Erickson
21e8d7b26f Fixed patches denormalization. 2014-04-17 15:44:19 -07:00
Ting-Kuan
b7439ed1ca Fix loading bar and retry block in ladder_view, #857. 2014-04-17 16:54:26 -04:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Ting-Kuan
070e354eee Handler for test. 2014-04-17 12:56:21 -04:00
Scott Erickson
02a7381fa9 Fixed the watch buttons for levels and components. 2014-04-16 11:02:40 -07:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
dpen2000
a74f89c30c Implement rank column in simulators leaderboard 2014-04-15 23:13:10 +01:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
e49344bd87 A few job profile fixes and cleanup. 2014-04-15 10:45:54 -07:00
Scott Erickson
b59e974a2e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-15 09:02:03 -07:00
Scott Erickson
06a61d214e Fixed server tests. 2014-04-15 09:01:51 -07:00
Michael Schmatz
5223661b66 Made spectate mode use top 20 players only 2014-04-14 14:28:29 -07:00
Michael Schmatz
6c4349df70 Improved simulation leaderboard performance 2014-04-14 11:39:31 -07:00
Michael Schmatz
415e34e701 Fixed isRanking and reduced logging 2014-04-14 11:01:55 -07:00
Michael Schmatz
b40e4dca37 Simulation leaderboard aggregation framework and local fixes 2014-04-14 08:46:46 -07:00
Nick Winter
ba38509a1d Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-13 15:29:22 -07:00
Nick Winter
af0b8aa5e2 A few fixes and cleanup for #831. 2014-04-13 15:28:16 -07:00
Michael Schmatz
e32524536e Quick fix for crashing server 
Undo when investigating which schema does this
 2014-04-13 14:06:29 -07:00
Aditya Raisinghani
abb402c68a Changes to fix infinite posting. 2014-04-13 21:41:53 +05:30
Aditya Raisinghani
ffd057899e Removed anon name collisions and reset anon user name if name is taken in interim. 2014-04-13 17:55:49 +05:30
dpen2000
ec3c292b72 Implement simulators leaderboard 2014-04-13 02:35:58 +01:00
Nick Winter
08616def10 Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available. 2014-04-12 14:53:09 -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
Scott Erickson
5a794306fe Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas 2014-04-12 08:53:24 -07:00
Scott Erickson
6eab5003f8 Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419 Fixed the level editor so you can save again. 2014-04-12 08:48:49 -07:00
Aditya Raisinghani
3078036da1 Deleted updated schemas. 2014-04-12 15:33:57 +05:30
Aditya Raisinghani
e04787475c Rebased master to get updated schemas and added patch schema 2014-04-12 15:16:42 +05:30
Aditya Raisinghani
b932bf1e7c Deleted schemas from /server and modified files to point to /app/schemas 2014-04-12 14:45:59 +05:30
Aditya Raisinghani
6fb5b59a01 Refactored schemas to be in /app 2014-04-12 14:33:55 +05:30
Scott Erickson
35fe47bbac Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
Scott Erickson
308adec7c7 Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
 2014-04-11 22:52:00 -07:00
Scott Erickson
34bf484bf2 Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
Nick Winter
fc9d30ccae Smarter fix for #810, since not all 24-character strings are like MongoDB ids. 2014-04-11 20:38:34 -07:00
Nick Winter
99ead5d193 #223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff. 2014-04-11 19:51:20 -07:00
Michael Schmatz
7ddd84248b Simulator fixes! 
Fixed memory bug with aggregation framework
 2014-04-11 17:11:57 -07:00
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -07:00
Nick Winter
ca13324e99 Resolved merge conflicts. 2014-04-11 11:32:51 -07:00
Scott Erickson
2c67df355c Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 
Conflicts:
	app/initialize.coffee
	bower.json
 2014-04-11 10:33:22 -07:00
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
Nick Winter
a68f3efb99 Added specific job profile photo support. Improved right column design a bit. 2014-04-10 17:54:28 -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
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128 Added some autocompleters for job profile Treema. Projects are now entirely links. 2014-04-10 11:58:51 -07:00
Michael Schmatz
a796d88967 Fixed tutorial modal for nonexistent tutorials 2014-04-10 11:42:22 -07:00
Nick Winter
26cebf7e7e Fixing some recruitment profile bugs. 2014-04-09 18:10:30 -07:00
Nick Winter
dd46f9d039 Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks. 2014-04-09 16:46:44 -07:00
Nick Winter
f17775cc10 Implemented George's jobs page design. 2014-04-09 13:14:52 -07:00
Scott Erickson
2f988ba485 Made the server side of the patch system. 2014-04-08 19:26:19 -07:00
Scott Erickson
ff73aecf08 Turned off sendwithus API during testing. 2014-04-08 19:08:33 -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
Nick Winter
b96bca8c18 Finished most of basic features for job profiles. 2014-04-07 17:58:02 -07:00
Nick Winter
9af6694054 More work on the job profiles. 2014-04-07 15:21:05 -07:00
Alexei Nikitin
630c44135a Work on wizard settings 2014-04-07 21:44:47 +04:00
Michael Schmatz
17c1bb7344 Fixed transactional mail auth and added 2 week email 2014-04-07 09:51:32 -07:00
Alexei Nikitin
6175a2af22 Update article model 2014-04-07 19:15:49 +04:00
Nick Winter
1b79de0d86 Loading active candidate profiles from the database into a table for employers. 2014-04-06 17:01:56 -07:00
Nick Winter
5c8c7fff1d Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower. 2014-04-05 17:05:03 -07:00
Michael Schmatz
7019bb6dea Added score histogram to ladder tab 2014-04-04 13:38:36 -07:00
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Michael Schmatz
f59cb9a743 Removed giant commented code section 2014-04-02 15:02:06 -07:00
Michael Schmatz
33e14ac406 Refactored simulator, removed duplication bug 
This merge is going to be terrible
 2014-04-02 15:00:45 -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
ddf0636e7e Revert logic for deleting model properties that interfered with signup. 2014-04-01 23:16:50 -07:00
Nick Winter
9e947ce7ab Fix for c94a7e for #356 2014-04-01 13:31:59 -07:00
Nick Winter
626a689553 Raised search fetch limit to head off exploding ThangType list. #377 2014-04-01 13:20:15 -07:00
Nick Winter
c94a73e066 Fixed #356. 2014-04-01 12:13:11 -07:00
Nick Winter
8c013c1192 Fixed 101: added level completion status to /play. 2014-03-31 15:48:22 -07:00
Nick Winter
389323953b Fixed #180. 2014-03-31 13:56:13 -07:00
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02:00
Nick Winter
05fed5f79b Fixed #29. 2014-03-28 13:51:52 -07:00
Nick Winter
ff7e2d5d47 Fixed #728. 2014-03-28 11:02:23 -07:00
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/de.coffee
	bower.json
 2014-03-25 17:07:36 +01:00
Michael Schmatz
83bfc28a9e Partially refactored scoring callback pyramid of hell 2014-03-24 10:58:43 -07:00
Nick Winter
b922b9dd20 Increased number of matches played. 2014-03-23 15:34:38 -07:00
Scott Erickson
72b88a3ee9 First pass on setting up gplus friends on the ladder page. 2014-03-23 09:30:01 -07:00
Nick Winter
29e7b8e5c1 Fixed mail to correctly capture the matches. 2014-03-22 09:48:36 -07:00
Michael Schmatz
d0232a36d9 Added resimulateSession method 2014-03-22 09:19:21 -07:00
Michael Schmatz
13a74ba560 Added resimulateAllSessions route 2014-03-22 09:17:14 -07:00
Michael Schmatz
9e535e19c6 Added resimulateAllSessions route 2014-03-22 09:05:53 -07:00
Nick Winter
3e87d54663 I guess we don't edit simulate counts on the client. 2014-03-21 21:14:48 -07:00
Nick Winter
5abe0746ba Merge pull request #648 from dpen2000/lastLevel 
Implement saving lastLevel in database re #627
 2014-03-21 17:27:31 -07:00
Nick Winter
dfcdcaa678 No email addresses for non-admins on CLA submissions. 2014-03-21 17:20:47 -07:00
dpen2000
a35d0cb651 Implement saving lastLevel in database re #627 2014-03-22 00:01:32 +00:00
Nick Winter
f0640dd2e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1 Adding CLAs view. 2014-03-21 16:22:47 -07:00
dpen2000
b1b0579cb3 Save autocastDelay as a setting on User re #627 2014-03-21 22:46:14 +00:00
Michael Schmatz
e56748d2f6 Tweaking scoring queue algorithms 2014-03-20 18:51:11 -07:00
Scott Erickson
29b51c470c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-20 17:03:19 -07:00
Scott Erickson
f7e1b338a6 Removed a line for debugging the ladder friends fetching handler. 2014-03-20 17:03:06 -07:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07:00
Scott Erickson
6e9daf59c9 Merge remote-tracking branch 'origin/master' 2014-03-20 14:40:29 -07:00
Scott Erickson
22555790b5 Set up a trimmed down leaderboard showing just top players and your rank. 2014-03-20 14:40:17 -07:00
Michael Schmatz
4d617d44f6 Fixed queue 2014-03-20 11:31:26 -07:00
Michael Schmatz
64aa6c95fd Changed timeouts and initial session visibility time 2014-03-20 08:47:40 -07:00
Michael Schmatz
9e8a31f2df Removed sort by scheduled visibility time 2014-03-20 08:44:41 -07:00
Scott Erickson
034a18c960 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-19 19:43:55 -07:00
Scott Erickson
5f45c5cf27 Added a handler for looking up friends on a leaderboard. 2014-03-19 19:42:42 -07:00
Nick Winter
9713f7d142 Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow 2014-03-19 18:01:49 -07:00
Michael Schmatz
f479e71cb9 Added score skipping for under 30 2014-03-18 14:25:22 -07:00
Michael Schmatz
0576389ce2 Lowered ratio requirements 2014-03-18 13:16:35 -07:00
Michael Schmatz
326b39b633 Dramatically raised ratio requirements 2014-03-18 13:14:06 -07:00
Mikhail Koltsov
a28eedc229 nothing 2014-03-17 22:45:59 +04:00
Dominik Kundel
c55b608886 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/templates/play/level/modal/editor_config.jade
 2014-03-17 19:39:38 +01:00
Nick Winter
833c310a91 Merge pull request #579 from ItsLastDay/popover 
Fix for issue #496
 2014-03-17 04:30:57 -07:00
Scott Erickson
eee8fbba2c New level page with new artwork. 2014-03-16 16:59:48 -07:00
Nick Winter
125ffa9f43 Merged 2014-03-16 10:06:47 -07:00
IngridMorstrad
37e3cd65da User now set to admin at signup instead of login 2014-03-16 21:56:29 +05:30
Mikhail Koltsov
160c99b2b8 whatever 2014-03-16 19:11:55 +04:00
Mikhail Koltsov
0474b2ceb5 localhost default user = admin 2014-03-16 16:15:26 +04:00
IngridMorstrad
4db433c062 Fixes #566, admin on localhost by default 2014-03-16 17:25:19 +05:30
Dominik Kundel
46133ab85d added select statement for programming language 2014-03-15 22:00:29 +01:00
Michael Schmatz
613439d175 Changed response for count API 2014-03-15 09:40:58 -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
Michael Schmatz
6e9e3ccc3c Another hot fix for #550 2014-03-14 14:41:39 -07:00
Michael Schmatz
7d150d96e8 Hotfix for #550 2014-03-14 14:27:43 -07:00
Michael Schmatz
07a0057e72 Removed defaults on schema for ladder-related things 2014-03-14 13:20:42 -07:00
Michael Schmatz
075ea23be9 Fixed random sessions fetching 2014-03-14 12:54:54 -07:00
Scott Erickson
39ed6c3a43 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-14 11:58:42 -07:00
Scott Erickson
eee4934d1b Put back the sort for the leaderboard handler. 2014-03-14 11:57:17 -07:00
Michael Schmatz
71aa6cc2c6 Added random session pair choosing 
Due to a bug I cannot test this immediately
 2014-03-14 11:30:06 -07:00
Nick Winter
5c76ca71e3 Added configuring of behaviors to the editor config. 2014-03-14 10:14:48 -07:00
Nick Winter
c28d2bb576 Merge pull request #545 from dkundel/master 
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
 2014-03-14 07:35:11 -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
Dominik Kundel
fca5bbfb1f added aceConfig to user schema 2014-03-14 02:08:31 +01: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
d44e1aad6a That's not how Mongoose select strings work, now, is it? 2014-03-11 21:48:11 -07:00
Nick Winter
218c542a5a Realized why scoring chains were ending early. 2014-03-11 21:16:53 -07:00
Nick Winter
b7ae1f7e25 The sessions should set isRanking false when they win. 2014-03-11 19:40:22 -07:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Nick Winter
2b487eeed8 Using /db/thang.type instead of /db/thang_type in URLs, for consistency. 2014-03-11 18:30:25 -07:00
Darredevil
a6c508a442 Added descripton 2014-03-12 02:20:28 +02:00
Darredevil
b1d61d3681 Added GetALLToLocations and KeepALLFromLocations schemas 2014-03-12 02:11:22 +02:00
Nick Winter
392534878a Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase. 2014-03-11 16:31:39 -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
93028483b9 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-10 13:20:10 -07:00
Nick Winter
6055512ac7 Working on ladder updates. 2014-03-10 13:20:00 -07:00
Michael Schmatz
d4abad88a2 Removed leaderboard mongo sort 2014-03-10 12:57:27 -07:00
Michael Schmatz
2ed83f4b40 Sped up my_sessions using projection, bypassing auth 2014-03-10 10:56:36 -07:00
Michael Schmatz
69b902f62a Added support for score history 2014-03-10 08:14:28 -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
Darredevil
af2b43a309 Changed description of "Get to Locations" 2014-03-09 15:09:22 +02: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
Nick Winter
085fb82cc9 Fixed a multiplayer link and debug mark alpha. 2014-03-07 21:02:10 -08:00
Michael Schmatz
2f378106ca Added checking level ladder status before submitting 2014-03-07 18:16:50 -08:00
Alexei Nikitin
98b36d299c Update article model 2014-03-08 05:05:35 +04:00
Scott Erickson
990a2e34e5 Utilizing the new level type property in the level handler. 2014-03-07 15:15:49 -08:00
Scott Erickson
2f68e64dc5 Almost forgot to add to the level handler the new properties. 2014-03-07 13:14:27 -08:00
Scott Erickson
17231bce06 Added showsGuide and type properties to level. 2014-03-07 13:13:58 -08:00
Michael Schmatz
45cd7e31ca Made simulator level-independent 2014-03-06 18:48:41 -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
Nick Winter
df95e8c784 Experimenting with using compress() in production. 2014-03-03 16:19:35 -08:00
Scott Erickson
feaeb1dc98 Made the wizard icons colored based on user settings. 2014-03-03 10:21:51 -08:00
Scott Erickson
5bb56ac818 Merge branch 'feature/new-ladder-view' 2014-03-03 09:05:52 -08:00
Michael Schmatz
8399667b49 Fixed submit date checks 2014-03-03 08:47:11 -08:00
Michael Schmatz
239ca83a84 Perhaps buggy fix to scheduling 2014-03-02 19:11:42 -08:00
Michael Schmatz
81466675ec Scheduling fixes 2014-03-02 18:55:10 -08:00
Nick Winter
82b250b9a3 protectAPI off again for Brawlwood, too slow for now. 2014-03-02 17:51:57 -08:00
Scott Erickson
956e2b3c40 Set up the my matches tab in the new ladder view. 2014-03-02 13:24:41 -08:00
Michael Schmatz
488be26fd3 Tweaked ratio calculation 2014-03-01 16:56:04 -08:00
Michael Schmatz
e69e23115f Improvements to game scheduling, removed cap 2014-03-01 16:52:19 -08:00
Scott Erickson
4de425bd58 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-28 13:59:33 -08:00
Michael Schmatz
24b25b2d27 Replaced project-dota with level id and major version 2014-02-28 13:50:48 -08:00
Scott Erickson
2894d4f39c Set up session-repeating scripts. 2014-02-28 11:28:23 -08:00
Scott Erickson
7c734d6bc9 Added an async name checker for the wizard settings modal. 2014-02-27 14:42:11 -08:00
Scott Erickson
d5fce3ee99 Added a handler for fetching a user id given a name. 2014-02-27 14:07:11 -08:00
Michael Schmatz
f82483b905 Changed session scheduling 2014-02-26 17:31:01 -08:00
Michael Schmatz
b648098c95 Implemented espionage mode 2014-02-26 14:14:43 -08:00
Michael Schmatz
a052180250 Improved match scheduling 2014-02-26 12:14:02 -08:00
Scott Erickson
45e6fadfe2 Added a property to prevent scripts from running after certain other scripts have run. 2014-02-25 10:50:40 -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
Nick Winter
cc8a8cabd5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02 Upgrading docs return value schema. Added button template for tutorial and screencast on ladder. 2014-02-20 11:57:04 -08:00
Scott Erickson
8184d0b9d3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-20 11:43:46 -08:00
Scott Erickson
b53fa8db89 Fixed the level handler to allow editing of goals. 2014-02-20 11:42:01 -08:00
Michael Schmatz
aa43d5ddca Added server side submitted code equality check 2014-02-20 10:32:32 -08:00
Michael Schmatz
7c5192820f Put more security on the session submissions and improved simulation status rendering 2014-02-20 09:44:44 -08:00
Michael Schmatz
e593fd23b4 Improved interface for simulating games 2014-02-20 08:06:14 -08:00
Michael Schmatz
11a4c1b6fd Typecast rank to a number 2014-02-19 14:26:49 -08:00
Scott Erickson
07c0edcefe Fixed the level session schema submitDate property. 2014-02-19 08:18:40 -08:00
Michael Schmatz
dc70fec977 Merge pull request #385 from codecombat/redis 
Merge redis into master
 2014-02-18 12:53:57 -08:00
Michael Schmatz
d02d09ae36 Simulation fixes 2014-02-18 11:46:14 -08:00
Scott Erickson
52a6cdf09c Added a route for getting user names by id. 2014-02-17 15:19:19 -08:00
Michael Schmatz
c5655074e3 Merge branch 'master' into redis 
Conflicts:
	server/queues/scoring.coffee
 2014-02-17 14:41:35 -08:00
Michael Schmatz
75d8888c92 Refactored scoring 2014-02-17 14:39:21 -08:00
Michael Schmatz
2be3286e06 Added sessionID and userID to session schema 2014-02-17 12:44:04 -08:00
Scott Erickson
1ebae24c03 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-17 12:40:34 -08:00
Michael Schmatz
b4f75c6274 Added titles and descriptions for schema 2014-02-17 12:28:19 -08:00
Scott Erickson
1c49e475b9 Merge remote-tracking branch 'origin/master' 2014-02-17 12:00:39 -08:00
Michael Schmatz
3b5d881c46 Changed schema date to proper format 2014-02-17 09:24:46 -08:00
Michael Schmatz
302a13b6e7 Added submitDate to session schema 2014-02-17 09:23:49 -08:00
Scott Erickson
72b6bcb7ed Temp fix for the number of thang types exploding recently. 2014-02-17 09:22:12 -08:00
Michael Schmatz
9b53873414 Updated session schema for session aggregation 2014-02-17 08:51:12 -08:00
Scott Erickson
0fb2018f2a Added project query param to getLatestVersion. 2014-02-15 14:09:30 -08:00
Scott Erickson
7eee28422a Fixed the submitting of scores to only allow logged in users to get on the leaderboard. 2014-02-15 10:31:24 -08:00
Michael Schmatz
643cafc89f Refactored level handler and level session schema 2014-02-14 14:55:30 -08:00
Michael Schmatz
ca7376b794 Worked around mongoose toObject 
Also tried elementary memory leak fix
 2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628 Set up the ladder to be able to compete against other sessions. 2014-02-13 16:42:35 -08:00
Michael Schmatz
128df09ce3 Fixed session by converting toObject 2014-02-13 16:29:02 -08:00
Nick Winter
9a835ffc0a Re-enabled spell tab entry docs. 2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e Added continuous simulation and fix for "no team" 2014-02-13 15:59:40 -08:00
Michael Schmatz
d6e99273bc Quick fix for team not being detected 2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba Merged in Scott's changes manually 2014-02-13 15:14:10 -08:00
Michael Schmatz
480de71eb6 Leaderboard is starting to work 2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395 Scoring queues mostly working 2014-02-13 12:59:24 -08:00
Scott Erickson
ccbb521b59 Set up a temporary hack to get 2014-02-13 10:42:25 -08:00
Michael Schmatz
14530b779a Refactored scoring submissions, added beginnings of spectator view 2014-02-13 10:37:44 -08:00
Nick Winter
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Scott Erickson
2f48925e86 Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values. 2014-02-12 12:27:02 -08:00
Michael Schmatz
76b949ac1e Various changes before merge 2014-02-11 15:47:06 -08:00
Michael Schmatz
58bfddeebf Background simulation is now showing signs of life! 2014-02-11 12:58:23 -08:00
Michael Schmatz
c0d43ea32b Merge branch 'master' into feature/task-queue 2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3 Simulation button 2014-02-10 17:09:51 -08:00
Michael Schmatz
0cbf669474 Added teamSpells persistence 2014-02-10 16:31:21 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Scott Erickson
3f2fde0fa9 Tweaked the level schema nextLevel property to only be an object. 2014-02-10 12:11:53 -08:00
Michael Schmatz
824af18e39 Improved Mongo queueing and various refactors 2014-02-10 10:30:08 -08:00
Michael Schmatz
8c2926c300 Replaced capped collection with 1-hour expiry index 2014-02-08 14:21:37 -08:00
Michael Schmatz
aabc8324c1 Session ranking is now functional 
Need to add database persistence next
 2014-02-08 14:21:16 -08:00
Michael Schmatz
9742923ad6 Fixed typo 2014-02-08 10:18:41 -08:00
Michael Schmatz
b9569a310a Implemented task logging and new score calculations 2014-02-08 10:11:43 -08:00
Scott Erickson
126055cad2 Added a url for looking up a user's icon. 2014-02-07 16:11:07 -08:00
Michael Schmatz
350384f5cb Implementing task log object 2014-02-07 15:52:24 -08:00
Scott Erickson
0365998658 Began work on a ladder view. 2014-02-07 15:51:05 -08:00
Michael Schmatz
73b0d98538 Merge branch 'master' into feature/task-queue 
Conflicts:
	server/commons/mapping.coffee
 2014-02-07 14:31:34 -08:00
Michael Schmatz
f87d25c192 Updated level session schema to contain scoring metrics 2014-02-07 14:29:20 -08:00
Michael Schmatz
ecf578ad3c Prototyped client response methods, refactored queue routes 2014-02-07 14:24:42 -08:00
Michael Schmatz
4b0e384668 Refactored and added sample objects/errors 2014-02-07 12:36:56 -08:00
Scott Erickson
fa809308b2 Set up some new session handlers for the upcoming multiplayer, allowing one session for each team. 2014-02-07 11:50:40 -08:00
Scott Erickson
9105888685 Added a team property to the level session schema. 2014-02-07 11:49:37 -08:00
Scott Erickson
cde7a4798f Added team as a property to goals in the level schema. 2014-02-06 16:03:08 -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
Sébastien Moratinos
8e841b397d delete unused code on server 2014-02-06 00:16:47 +01:00
Michael Schmatz
b174b10642 Added message class for SQS, basic scoring routes 2014-02-05 15:07:15 -08:00
Scott Erickson
966155593c Various fixes. 2014-02-05 11:03:32 -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
9401a4370e Merge branch 'feature/task-queue' into feature/level-runner-interface 
Conflicts:
	server.coffee
	server/db.coffee
 2014-02-04 10:26:16 -08: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
Nick Winter
b502c24ece A few updates to the contributors lists. 2014-02-01 08:22:26 -08:00
Michael Schmatz
563c442e81 Added tests, moved some functions into module.exports 2014-01-31 11:09:15 -08:00
Nick Winter
d46716eec4 Merge pull request #299 from p-buse/eventcheck-regexp 
Added Regular Expression Event Checker
 2014-01-31 07:58:13 -08:00
Nick Winter
6e40fa09a6 Updated some Bootstrap event names. 2014-01-30 16:36:36 -08:00
Paul Buser
8881a880ea Merge branch 'master' of https://github.com/codecombat/codecombat into eventcheck-regexp 2014-01-29 23:57:47 -05:00
Scott Erickson
5173e7990b Added effect system to the component schema. 2014-01-29 12:28:57 -08:00
Michael Schmatz
4d1c772719 Refactored files and server 2014-01-27 11:14:44 -08:00
Michael Schmatz
45634e9413 Fixed queue bug and wrote tests 2014-01-25 10:10:03 -08: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
Michael Schmatz
6f2461c8be Starting to test queue class 2014-01-24 17:25:02 -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
Michael Schmatz
c00321208d MongoQueue nearing completion 2014-01-24 12:57:18 -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
Michael Schmatz
750a2f6d0d Rewriting mongo queue 2014-01-24 11:20:44 -08:00
Paul Buser
30d8eb8256 Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-23 21:56:23 -05:00
Scott Erickson
dceb48ab04 Merge branch 'packagebyfeature' of https://github.com/smoratinos/codecombat into feature/server-refactor 2014-01-23 18:30:49 -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
Michael Schmatz
7c6974955a Ditching mubsub, moving to a slower yet more extensible method of local queueing 2014-01-23 12:37:18 -08:00
Michael Schmatz
1c2eeff399 Unifying SQS with mubsub interface 2014-01-23 10:52:43 -08:00
Scott Erickson
72360be965 MailChimp tweak. 2014-01-23 09:28:21 -08:00
Michael Schmatz
671f6d6ffd Refactored and simplified 2014-01-22 23:48:47 -08:00
Michael Schmatz
d9b2a36875 More refactoring, added message loop example 2014-01-22 23:41:26 -08:00
Michael Schmatz
ccd94f0f1f Refactored and added more functionality to remote queue class 2014-01-22 23:13:14 -08:00
Michael Schmatz
9157bd150d Starting to receive messages from SQS! 2014-01-22 21:41:29 -08:00
Michael Schmatz
3df58843c6 Updated environment variable names 2014-01-22 18:41:14 -08:00
Michael Schmatz
2373d97137 Put in configuration, aws-sdk, subclassing Queue 2014-01-22 18:29:02 -08:00
Michael Schmatz
a62427fe34 Added aws-sdk and created queue file 2014-01-22 17:48:11 -08: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
Paul Buser
2b7d18bbfa Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-21 21:32:17 -05:00
Scott Erickson
e61d31f48c Level editor displays thangs in a more orderly fashion. 2014-01-20 23:02:23 -08:00
Scott Erickson
fabb40384c Added 'kind' as a property to thang types. 2014-01-20 22:38:52 -08:00
Scott Erickson
222fa6100b Set up the level editor to lazily load thang types. 2014-01-20 17:20:04 -08:00
Scott Erickson
dad21e0338 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-20 09:13:30 -08:00
Scott Erickson
d1176f7ee6 Fixed getDocumentForIdOrSlug to be better at recognizing slugs. 2014-01-20 09:13:18 -08:00
Michael Schmatz
5bc2814342 Fixed CLA signing bug 
Fat arrows to the rescue!
 2014-01-18 10:16:58 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Scott Erickson
9ba8fe451c Fixed errors to run 'res.end()' 2014-01-17 10:30:47 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus. 
Created a 'notification' email subscription.
 2014-01-17 09:53:17 -08:00
Sébastien Moratinos
fa218f7167 refactor server http errors 
- error.coffee centralize all http errors response
- unauthorized = 401 and forbiden = 403
 2014-01-14 23:19:34 +01:00
Paul Buser
b0ad3f5700 Add regex event checker in level.coffee 2014-01-13 16:56:08 -05:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
Scott Erickson
391207d00f Fixes for unit portraits. 2014-01-08 22:30:00 -08:00
Sébastien Moratinos
00cffa2570 undo a line wrapping, because this change the logic in common schema. 2014-01-08 22:48:19 +01:00
Sébastien Moratinos
abb20a6b8a code style : wrap some lines that exceeds 120 characters, replace some '=>' by '->' 2014-01-08 20:27:13 +01:00
Scott Erickson
94cb6ea4e1 Fixed up the search optimization and installed thang portraits into the level editor. 2014-01-06 17:11:57 -08:00
Scott Erickson
68313b42ba Searches now use projections, way faster. 2014-01-06 15:44:20 -08:00
Scott Erickson
f656a4f4cf Set up portrait uploading for thangs. 2014-01-06 12:37:35 -08:00
Scott Erickson
a99073fc5e Fixed account recovery on dev server. 2014-01-06 12:14:12 -08:00
Scott Erickson
1ad9f5e283 Fixed the CLA date property setting. 2014-01-05 16:02:50 -08:00
Scott Erickson
9f5c7634ee Turned off mailchimp API calls during development. 2014-01-03 14:30:39 -08:00
Scott Erickson
ff3e2ba37f Turned off sending mail on the dev environment. 2014-01-03 14:28:26 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00