Commit graph

100 commits

Author SHA1 Message Date
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
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
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
Nick Winter
ae65f07e7e Added some i18n and improved employer page. 2014-04-11 12:49:44 -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
a68f3efb99 Added specific job profile photo support. Improved right column design a bit. 2014-04-10 17:54:28 -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
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
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
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
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
fe8a4901de Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/locale/de.coffee
	bower.json
2014-03-25 17:07:36 +01: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
3e87d54663 I guess we don't edit simulate counts on the client. 2014-03-21 21:14:48 -07:00
dpen2000
a35d0cb651 Implement saving lastLevel in database re #627 2014-03-22 00:01:32 +00:00
dpen2000
b1b0579cb3 Save autocastDelay as a setting on User re #627 2014-03-21 22:46:14 +00:00
Nick Winter
ca1e3742c0 Added simulation counts. 2014-03-20 15:40:02 -07: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
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
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
Dominik Kundel
fca5bbfb1f added aceConfig to user schema 2014-03-14 02:08:31 +01:00
Nick Winter
b560827e32 Working on cleaning up some server errors. 2014-03-11 19:17:58 -07:00
Nick Winter
6055512ac7 Working on ladder updates. 2014-03-10 13:20:00 -07:00
Scott Erickson
feaeb1dc98 Made the wizard icons colored based on user settings. 2014-03-03 10:21:51 -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
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
Scott Erickson
52a6cdf09c Added a route for getting user names by id. 2014-02-17 15:19:19 -08:00
Scott Erickson
126055cad2 Added a url for looking up a user's icon. 2014-02-07 16:11:07 -08:00
Nick Winter
b502c24ece A few updates to the contributors lists. 2014-02-01 08:22:26 -08: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
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