codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-28 01:55:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
codecombat/app/styles/editor
History
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
..
achievement Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
article Ready for action, sir! 2014-01-03 10:32:13 -08:00
component Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
level Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
thang Reined in an overzealous css rule. 2014-08-12 09:04:36 -07:00
delta.sass Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
editor.sass Small styling fix. 2014-08-10 13:07:06 -07:00
patch.sass Added data merge conflict handling. 2014-04-11 21:11:52 -07:00
patches.sass Reworked LevelView loading priorities to try to get world simulating earlier. 2014-05-02 12:32:41 -07:00
related-achievements.sass Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00