codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 10:35:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
codecombat/app
History
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
..
assets Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
collections Fixed #405 with a sledgehammer--just loading all Components before loading level editor. 2014-03-15 12:31:39 -07:00
lib Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 2014-04-11 10:32:19 -07:00
locale Merged the jobs in. Look out for Treema bugs from the last four months. 2014-04-11 10:20:12 -07:00
models Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 2014-04-11 10:32:19 -07:00
styles Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 2014-04-11 10:32:19 -07:00
templates Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 2014-04-11 10:32:19 -07:00
views Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch 2014-04-11 10:32:19 -07:00
application.coffee Fixed #418, no more print/save dialogues evaaarr. 2014-04-02 14:42:34 -07:00
initialize.coffee 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
treema-ext.coffee Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00