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

43 commits

Author SHA1 Message Date
Michael Schmatz
f84e92595b Changed UDID to identifierForVendor 2014-11-20 20:03:24 -05:00
Scott Erickson
a18537b065 Added the ability to assign a user an iOS UDID, and login with it. 2014-11-20 15:54:15 -08:00
Scott Erickson
fae09aad00 Turned on double optin for MailChimp. 2014-11-20 14:31:50 -08:00
Scott Erickson
95dca575d1 Set up stripe on the server and site to allow purchases through the website. 2014-11-17 15:15:08 -08:00
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Nick Winter
ae14bd1ced Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564. 2014-09-20 15:18:21 -07:00
Nick Winter
851ad43b45 Made some more User properties private. 2014-09-10 21:56:21 -07:00
Scott Erickson
5fc7caec64 Disabling an error that occurs on the dev server with the partial db. 2014-09-03 17:26:43 -07:00
Scott Erickson
1c5db3f2b7 First round of getting the site to use the new defaults system, in particular the job profile view. 2014-08-23 11:07:52 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements 
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
 2014-08-13 10:43:42 +02:00
Nick Winter
9a1dd412c9 Added Delighted feedback emails. 2014-08-09 23:11:26 -07:00
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
Ruben Vereecken
5d66560673 Merge remote-tracking branch 'upstream/master' into achievements_progress 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
	server/levels/sessions/LevelSession.coffee
 2014-08-05 11:55:46 +02:00
Nick Winter
84ccde9fd3 Merged User editableProperties move with adding savedEmployerFilterAlerts to editableProperties. 2014-08-04 12:48:41 -07: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
19d59ac8ff Refactored Users and Level Sessions to have private properties: 2014-07-22 20:07:00 +02:00
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +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
ac95d775e6 Users can now be gotten by slug 2014-07-09 20:23:05 +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
Ruben Vereecken
a367082cc4 Corrected statistic logic, wrote test case 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
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07: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
d8bb802468 Designing the Notify to show level progress 2014-06-02 20:33:01 +02:00
Ruben Vereecken
f2f4fef1e0 Wrote tests for the local mongo querier 2014-06-02 20:29:11 +02:00
Nick Winter
e89e1154bf Merge pull request #917 from dpen2000/patch-2 
Fix #916
 2014-04-27 20:26:32 -07:00
Nick Winter
ef30498985 Improved bad sendwithus error logging. 2014-04-25 11:12:52 -07:00
dpen2000
a37c45e8b0 Fix #916 2014-04-25 00:56:34 +01:00
Scott Erickson
b390b38054 Fixed a couple bugs and tests. 2014-04-23 09:19:07 -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
06a61d214e Fixed server tests. 2014-04-15 09:01:51 -07:00
Scott Erickson
30f785f7cf Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
Aditya Raisinghani
b932bf1e7c Deleted schemas from /server and modified files to point to /app/schemas 2014-04-12 14:45:59 +05:30
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
IngridMorstrad
4db433c062 Fixes #566, admin on localhost by default 2014-03-16 17:25:19 +05:30
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Scott Erickson
004e7cc79e Refactored some mail functions and constants to a new common module. 2014-01-24 11:47:14 -08: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
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
Renamed from server/models/User.coffee (Browse further)