Commit graph

13 commits

Author SHA1 Message Date
Scott Erickson
53579b2632 Merge branch 'master' into feature/jsondiffpatch
Conflicts:
	app/templates/editor/level/save.jade
	app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
Scott Erickson
a3951b0fa7 Extended the save version modal to allow submitting patches. 2014-04-10 13:09:44 -07:00
Scott Erickson
3c832d3707 Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks. 2014-04-10 11:13:33 -07:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
GlenDC
95c81e4672 Found more duplicate i18n tags and applied it both to the ar.coffee and nl.coffee file 2014-01-19 17:19:19 +01:00
GlenDC
6c46dc3fda Tracked down common used i18n tags and applied it already on the nl.coffee file 2014-01-19 17:00:41 +01:00
Nick Winter
60850d5c48 Updated some tags. Added a script to copy tags from en.coffee. 2014-01-14 10:29:23 -08:00
Nick Winter
00f4699ce5 Further fixes for save modals. 2014-01-10 17:32:29 -08:00
Scott Erickson
ecd9ed8fef Fixed the save version modal. 2014-01-10 17:11:13 -08:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00