646 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Henry Oswald	521c7f9485	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-08 12:45:13 +01:00
Henry Oswald	60cc16dbe6	fixed broken paths to ace editor stuff from moving things around	2014-07-08 12:43:07 +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
James Allen	b9909bbd84	Sort out front end coffee/js files and minification	2014-07-08 12:01:32 +01:00
Henry Oswald	32b5e39681	chat scoll works fairly well using scroll glue	2014-07-08 11:56:44 +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	8525bf4a72	Get group admin page working with angular and new style	2014-07-07 18:06:12 +01:00
James Allen	c542116b41	Fix role autocomplete	2014-07-07 16:25:18 +01:00
James Allen	5d62775ab6	Fix auto complete in user profile	2014-07-07 16:22:38 +01:00
James Allen	068d88ec0b	Style bonus page	2014-07-07 15:54:40 +01:00
James Allen	41ef675999	Improve UX of user profile	2014-07-07 14:58:12 +01:00
James Allen	452098ca68	Redirect to register if not registered on plans page	2014-07-07 14:05:07 +01:00
James Allen	5f48105b04	Style subscription management pages	2014-07-07 13:43:36 +01:00
James Allen	7947eb28ad	Remove ab test from plans page	2014-07-07 12:30:19 +01:00
James Allen	b3bfa2dc26	Add plans page	2014-07-07 12:27:58 +01:00
Henry Oswald	34ac6b03cd	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-07 10:54:50 +01:00
Henry Oswald	d1f907cee5	first simple version of tracking who is active in the editor	2014-07-04 16:18:46 +01:00
James Allen	e0c25a8cc3	Don't group far apart messages together	2014-07-04 15:47:48 +01:00
James Allen	773b457d24	Group messages from the same person together	2014-07-04 15:46:21 +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	86a9d08e5c	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-04 13:06:47 +01:00
Henry Oswald	9c35cfd693	very start of chat controllers done	2014-07-04 13:05:55 +01:00
James Allen	97065e8547	CSS tweaks	2014-07-03 17:19:57 +01:00
James Allen	5dd3f828e3	Open current selection when leaving track changes	2014-07-03 17:12:23 +01:00
James Allen	ac0f05a9e4	Create binary file preview	2014-07-03 17:05:50 +01:00
James Allen	af870c8269	Style project name and allow renaming	2014-07-03 16:18:49 +01:00
James Allen	a8d371d2f6	Sort out permissions and displaying anonymous users	2014-07-03 15:05:35 +01:00
James Allen	58e4e92d84	Add in upgrade pop up to history	2014-07-03 11:18:15 +01:00
James Allen	a13ee00e91	Allow dragging into the root folder	2014-07-03 11:01:41 +01:00
James Allen	a4afc70f9b	Show saving notifications	2014-07-02 17:41:07 +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
James Allen	b61da1a9f0	Handle out of sync errors with a pop-up	2014-07-02 17:04:29 +01:00
James Allen	e870d7190b	Improve reconnecting message	2014-07-02 16:41:29 +01:00
Henry Oswald	b81fac1cf4	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-02 15:58:30 +01:00
Henry Oswald	ba4d585854	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-02 15:56:22 +01:00
James Allen	f256c96195	Add in chat view with stubbed data	2014-07-02 15:56:09 +01:00
James Allen	926b31b337	Fix a few ui bugs	2014-07-02 13:29:56 +01:00
James Allen	ab09a865b8	Add in chat pane and sort out layout resizing	2014-07-02 13:23:04 +01:00
James Allen	83666be910	Disabled pdf download if not available	2014-07-02 11:06:20 +01:00
James Allen	f86c9cf853	Move all editor manager binding logic into the managers	2014-07-02 10:59:18 +01:00
James Allen	f5e5e55457	Don't capture all click events	2014-07-02 10:58:06 +01:00
Henry Oswald	55d20e8abd	change format of algolia settings	2014-07-01 16:45:20 +01:00
James Allen	b51af73516	Fix a few issues with ace autocomplete and cursors	2014-07-01 16:36:30 +01:00
James Allen	beae4f2424	Style settings side panel	2014-07-01 16:03:14 +01:00
Henry Oswald	8f6dac77d0	added asset proxying from templates in, used for old images etc which people linked to	2014-07-01 16:00:42 +01:00
James Allen	7cfbaaca36	Style settings side panel	2014-07-01 15:57:55 +01:00