codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-02-16 08:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
codecombat/app
History
Ting-Kuan 508b570fea Merge branch 'master' into feature/loading-views 
Conflicts:
	.gitignore
	app/locale/en.coffee
	app/models/SuperModel.coffee
	app/views/editor/thang/edit.coffee
	app/views/kinds/CocoView.coffee
2014-04-12 17:07:30 -04:00
..
assets Merge branch 'feature/jsondiffpatch' 2014-04-11 22:52:58 -07:00
collections Added a patches view. 2014-04-11 14:19:17 -07:00
lib Merge branch 'master' into feature/loading-views 2014-04-12 17:07:30 -04:00
locale Merge branch 'feature/jsondiffpatch' 2014-04-12 08:52:35 -07:00
models Merge branch 'master' into feature/loading-views 2014-04-12 17:07:30 -04:00
schemas Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00
styles Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-11 23:08:26 -07:00
templates Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-12 08:52:50 -07:00
views Merge branch 'master' into feature/loading-views 2014-04-12 17:07:30 -04:00
application.coffee Pull from upsatream. 2014-04-04 12:52:22 -04:00
initialize.coffee Removed an import that no longer exists. 2014-04-11 13:18:05 -07:00
treema-ext.coffee Fixed a couple bugs in custom TreemaNodes. 2014-04-08 17:13:05 -07:00