Commit graph

239 commits

Author SHA1 Message Date
Henry Oswald
5cf756969e blog wip 2014-07-09 19:49:39 +01:00
Henry Oswald
6dc9d32104 Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
	public/coffee/app/main.coffee
2014-07-08 11:14:56 +01:00
Henry Oswald
581d9ec925 - hooked up chat throughout the stack
- removed lots of console.logs
- working on the auto scrol, doesn't quite work yet
2014-07-08 10:08:38 +01:00
James Allen
068d88ec0b Style bonus page 2014-07-07 15:54:40 +01:00
James Allen
452098ca68 Redirect to register if not registered on plans page 2014-07-07 14:05:07 +01:00
James Allen
7947eb28ad Remove ab test from plans page 2014-07-07 12:30:19 +01:00
Henry Oswald
d1f907cee5 first simple version of tracking who is active in the editor 2014-07-04 16:18:46 +01:00
Henry Oswald
de010cf971 added error logging 2014-07-04 13:29:59 +01:00
Henry Oswald
0d02241b46 linked chat into the editor real time contorller 2014-07-04 13:20:30 +01:00
Henry Oswald
9c35cfd693 very start of chat controllers done 2014-07-04 13:05:55 +01:00
Henry Oswald
77246b2a07 added query string support onto get requests for limit and before 2014-07-02 17:37:30 +01:00
Henry Oswald
8670b543b9 added basic chat handler 2014-07-02 17:28:05 +01:00
Henry Oswald
978e3262b5 added redirects from config file in, used for old template paths 2014-07-01 15:44:12 +01:00
Henry Oswald
000be22f16 Merge branch 'master-redesign' into master-redesign-templates-and-blog
Conflicts:
	app/views/project/editor.jade
2014-07-01 15:23:05 +01:00
Henry Oswald
17537b0d7a client side js for templates loads and works 2014-07-01 14:27:20 +01:00
James Allen
be48ab2a30 Add in basic share modal 2014-07-01 14:12:28 +01:00
Henry Oswald
53fa15d3db added basic error handling around templates rendering 2014-06-30 17:27:13 +01:00
Henry Oswald
27a97b7fa8 build titles for tempaltes page in web 2014-06-30 17:19:25 +01:00
Henry Oswald
b80f751cb2 templates works basically, needs error handling and few little improvments 2014-06-30 17:08:54 +01:00
James Allen
afb953a489 Display cursor name labels 2014-06-26 11:19:05 +01:00
James Allen
9dfbb36a83 Update project settings over http 2014-06-25 13:51:02 +01:00
James Allen
d214b5dc5e Merge branch 'master' into master-redesign 2014-06-25 12:14:26 +01:00
James Allen
5aa7daa951 Fix password reset rate limit to work on ip, not email which changes every request 2014-06-25 10:46:58 +01:00
James Allen
d2ac9a1e9f Add in auto complete 2014-06-24 21:09:20 +01:00
James Allen
f154f17704 Wire up fontSize and mode settings 2014-06-24 20:46:00 +01:00
James Allen
5cef41fdbd Allow selecting of theme 2014-06-24 20:28:53 +01:00
James Allen
242a866bce Rename files 2014-06-22 20:08:56 +01:00
James Allen
f931df6084 Allow creation of folders 2014-06-22 14:39:38 +01:00
James Allen
f41534ee4d Add in creating of files to editor 2014-06-22 12:10:42 +01:00
James Allen
6d0053e709 Start rebuilding editor 2014-06-21 22:20:37 +01:00
James Allen
a64b9eb82e Create and style external pages 2014-06-20 17:17:24 +01:00
James Allen
a2bb89b579 Merge branch 'master' into master-redesign 2014-06-20 11:18:43 +01:00
James Allen
81845dec32 Wire up account settings forms 2014-06-20 11:15:25 +01:00
James Allen
0ef7e54ad3 Allow partial updates to user settings 2014-06-20 09:42:43 +01:00
James Allen
1bcc0a4554 Send 204 rather than redirect when leaving a project 2014-06-19 13:11:01 +01:00
Henry Oswald
85befe0d57 listen on stdout when unzipping, unsticks some zips for some reason... 2014-06-18 18:18:49 +01:00
James Allen
2b349039c3 Add in backend multiple project downloading 2014-06-18 16:37:18 +01:00
James Allen
b837a4e9f3 Merge branch 'master' into master-redesign 2014-06-18 15:26:09 +01:00
James Allen
70c51cb947 Merge branch 'master' into master-redesign 2014-06-18 10:56:30 +01:00
Henry Oswald
e0be5ef01b 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
James Allen
750b524771 Don't get user id from possibly deleted session 2014-06-17 17:45:07 +01:00
Henry Oswald
426b699865 links in emails use site url 2014-06-17 16:28:52 +01:00
James Allen
aa8969c652 Merge and fix external forms 2014-06-17 16:19:40 +01:00
Henry Oswald
2d55f080d6 get algolia to pull app id and api key from settings file 2014-06-17 12:25:49 +01:00
Henry Oswald
cc1b9472b2 don't show the user details area on project list if algolia instituions has not be setup 2014-06-17 11:59:57 +01:00
James Allen
c56648ab80 Merge branch 'master' into master-redesign
Conflicts:
	app/views/project/list.jade
	public/coffee/list.coffee
	public/stylesheets/less/list.less
	public/stylesheets/less/style.less
2014-06-17 11:54:29 +01:00
Henry Oswald
3350b99ccf removed a couple of annoying console.log logs 2014-06-17 10:26:56 +01:00
James Allen
65a1f03768 Send project owner details to client 2014-06-16 13:34:38 +01:00
James Allen
9c5f63817e Send accessLevel info to client 2014-06-16 12:47:39 +01:00
James Allen
6305ac16f4 Work in progress of doing project list with Angular 2014-06-12 15:22:49 +01:00