12 commits

Author	SHA1	Message	Date
Nick Winter	0125c46dc2	Resolved merge conflict.	2014-03-12 08:29:42 -07:00
Ruben Vereecken	2a86daaa2a	Added Version History to Thang Types	2014-03-12 15:22:15 +01:00
Ruben Vereecken	8709cdc472	Finished Article History	2014-03-11 19:33:27 +01:00
Scott Erickson	a6c4fe8d02	Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master	2014-03-05 20:04:14 -08:00
Ruben Vereecken	0aa8e7bb7d	Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet	2014-03-03 22:21:56 +01:00
Ruben Vereecken	ee920afea9	Disabled buttons for non-owners in Article Editor	2014-03-03 21:13:02 +01:00
Nick Winter	a8ef87c9ea	Fixed a few bugs; re-enabled protectAPI for Brawlwood.	2014-03-02 16:06:22 -08:00
Scott Erickson	ec7028af60	Fixed uploading images for articles.	2014-02-26 19:30:37 -08:00
Scott Erickson	2a19da5ba2	More memory fixes.	2014-02-11 14:58:45 -08:00
Scott Erickson	9da955d1a2	Set up a backup system for the editor using localStorage.	2014-01-26 14:46:25 -08:00
Nick Winter	70cd16cee4	Fixing bug with application require for now. Shoutout for Firebase.	2014-01-06 23:45:33 -08:00
Nick Winter	6009df26de	Ready for action, sir!	2014-01-03 10:32:13 -08:00