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
..
binary-files	Add missing files	2014-07-08 12:02:26 +01:00
chat	remove gravtar compute function as we are not using it, this is done in the chat api	2014-07-08 14:19:27 +01:00
connection	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-10 15:15:18 +01:00
directives	Fix synctex controls with new Ace	2014-07-10 14:36:04 +01:00
editor	Fix synctex controls with new Ace	2014-07-10 14:36:04 +01:00
file-tree	Remove all console.log debug statements	2014-07-09 16:18:09 +01:00
online-users	Remove all console.log debug statements	2014-07-09 16:18:09 +01:00
pdf	Fix synctex controls with new Ace	2014-07-10 14:36:04 +01:00
permissions	Add missing files	2014-07-08 12:02:26 +01:00
services	Add missing files	2014-07-08 12:02:26 +01:00
settings	Add missing files	2014-07-08 12:02:26 +01:00
share	Remove all console.log debug statements	2014-07-09 16:18:09 +01:00
track-changes	Remove all console.log debug statements	2014-07-09 16:18:09 +01:00