Henry Oswald c0a6f0b7ad Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee public/coffee/ide/online-users/OnlineUsersManager.coffee public/coffee/ide/track-changes/directives/infiniteScroll.coffee		2014-07-10 15:15:18 +01:00
..
Authentication	Don't error if user is not logged in when compiling	2014-05-27 12:33:56 +01:00
Blog	blog intergration works	2014-07-10 14:53:53 +01:00
Chat	- hooked up chat throughout the stack	2014-07-08 10:08:38 +01:00
Collaborators	Add in basic share modal	2014-07-01 14:12:28 +01:00
Compile	adjusting unit tests	2014-06-01 19:26:33 +02:00
ConnectedUsers	first simple version of tracking who is active in the editor	2014-07-04 16:18:46 +01:00
Docstore	Don't show diffs of deleted docs (much simpler)	2014-06-06 14:43:45 +01:00
Documents	Don't proxy version number to/from docstore	2014-05-15 12:44:08 +01:00
DocumentUpdater	Add in backend multiple project downloading	2014-06-18 16:37:18 +01:00
Downloads	Add in backend multiple project downloading	2014-06-18 16:37:18 +01:00
Dropbox	refactored project list, and updated sig for findAllUsersProjects to include err	2014-04-08 16:56:34 +01:00
Editor	Sort out escaping issues	2014-07-09 11:05:00 +01:00
Email	added timeouts to email and newsletter as after a few days there are a few open connections still	2014-06-17 18:18:45 +01:00
Errors	Create and style external pages	2014-06-20 17:17:24 +01:00
FileStore	added timeouts to filestore handler	2014-05-08 10:55:44 +01:00
HealthCheck
Newsletter	added timeouts to email and newsletter as after a few days there are a few open connections still	2014-06-17 18:18:45 +01:00
PasswordReset	Fix password reset rate limit to work on ip, not email which changes every request	2014-06-25 10:46:58 +01:00
Project	Update Ace and fix autocomplete	2014-07-09 17:59:04 +01:00
Referal
Security
ServerAdmin	Style login and register forms	2014-06-09 10:19:02 +01:00
Spelling
StaticPages	Create and style external pages	2014-06-20 17:17:24 +01:00
Subscription	Merge branch 'master' into master-redesign	2014-07-08 13:24:48 +01:00
Tags	fixed #100, if tags is not running you should be able to delete a project still	2014-04-16 17:44:57 +01:00
Templates	added redirects from config file in, used for old template paths	2014-07-01 15:44:12 +01:00
ThirdPartyDataStore	Remove deprecated versioning code	2014-05-27 12:56:23 +01:00
TrackChanges	Flush project to track changes when leaving	2014-03-22 09:34:43 +00:00
Uploads	listen on stdout when unzipping, unsticks some zips for some reason...	2014-06-18 18:18:49 +01:00
User	added basic chat handler	2014-07-02 17:28:05 +01:00