Commit graph

6 commits

Author SHA1 Message Date
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
James Allen
7fb8154c6e Improve loading screen 2014-07-10 13:41:54 +01:00
James Allen
f2b8a5971f Don't do a scope.apply on every change 2014-07-09 20:32:03 +01:00
James Allen
c93902345a Remove all console.log debug statements 2014-07-09 16:18:09 +01:00
Henry Oswald
0080809489 merge/moving js stuff around half done 2014-07-08 12:32:50 +01:00
James Allen
8ed03694c3 Add missing files 2014-07-08 12:02:26 +01:00