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
..
blog	blog intergration works	2014-07-10 14:53:53 +01:00
general	Create and style external pages	2014-06-20 17:17:24 +01:00
info	Intial open source comment	2014-02-12 10:23:40 +00:00
layout	Provide more config options for nav and footer entries	2014-07-08 12:51:11 +01:00
project	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-10 15:15:18 +01:00
referal	Style bonus page	2014-07-07 15:54:40 +01:00
subscriptions	Improve styling of project list with long titles and labels	2014-07-09 11:51:21 +01:00
templates	client side js for templates loads and works	2014-07-01 14:27:20 +01:00
user	Use Angular 1.30 and only update emails on blur	2014-07-09 14:53:30 +01:00
view_templates	templates works basically, needs error handling and few little improvments	2014-06-30 17:08:54 +01:00
admin.jade	Intial open source comment	2014-02-12 10:23:40 +00:00
changelog.jade	Intial open source comment	2014-02-12 10:23:40 +00:00
layout.jade	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-10 15:15:18 +01:00
modals.jade	Allow deleting of projects forever	2014-06-04 12:45:04 +01:00
restore.jade	changed team@sharelatex.com to support@sharelatex.com	2014-06-18 14:47:29 +01:00
templates.jade	Merge branch 'master' into master-redesign	2014-06-06 15:10:57 +01:00
tests.jade	Intial open source comment	2014-02-12 10:23:40 +00:00