8245 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Henry Oswald	4f91e40875	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-16 15:53:12 +01:00
Henry Oswald	f3f53a99d0	Templates state resets on modal close so if the api comes back it will work	2014-07-16 15:50:27 +01:00
James Allen	f7e69cebfd	Make progress bars distinct site-wide	2014-07-16 15:37:22 +01:00
James Allen	14a9d0838e	Get line wrapping of long tag names sorted	2014-07-16 15:24:30 +01:00
James Allen	1d79f3bec3	Don't close folder menu on modal pop up	2014-07-16 15:04:37 +01:00
James Allen	a924f2a928	Rephrase shared projects	2014-07-16 15:01:06 +01:00
James Allen	f34811fbf6	Add new folder link in side bar	2014-07-16 14:59:52 +01:00
Henry Oswald	735bc9e53d	show message when can not talk to templates api	2014-07-16 13:36:02 +01:00
Henry Oswald	abc4306e06	merge	2014-07-16 13:35:15 +01:00
James Allen	4b3610746e	Use native select box style in left menu	2014-07-16 12:09:19 +01:00
Henry Oswald	eb58bb7c5a	all template buttons in editor are disabled on publish/unpublish	2014-07-16 12:04:33 +01:00
James Allen	fce271f827	Fix unit tests	2014-07-16 12:01:15 +01:00
James Allen	60174ffb09	Style closed page	2014-07-16 11:59:54 +01:00
James Allen	2dc43b504c	Style 404 page	2014-07-16 11:59:25 +01:00
Henry Oswald	6982ec63ae	changed get template details to findOne	2014-07-16 11:56:22 +01:00
James Allen	9e0d5ff890	Use permissions.admin, not hasPermission(...)	2014-07-16 11:50:03 +01:00
Henry Oswald	cd60817592	made getting templates details parallel	2014-07-16 11:37:17 +01:00
James Allen	4a139949f2	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-16 11:29:02 +01:00
James Allen	8f08823d34	Sort out fingerprints and pdf.js worker path	2014-07-16 11:28:52 +01:00
Henry Oswald	91ca726e66	get template details now includes the markdown description of the project	2014-07-16 11:27:47 +01:00
James Allen	eb818be2df	Use Ace in no-conflict mode	2014-07-16 11:07:18 +01:00
Henry Oswald	c8c0030b7c	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-16 11:02:53 +01:00
Henry Oswald	46377aea3d	the template link in the left menu is only shown to owners/admins	2014-07-16 11:02:45 +01:00
James Allen	1d7a595c6c	Small chat scroll tweaks	2014-07-16 10:52:06 +01:00
James Allen	3f840a80da	Merge pull request #84 from dfelder/patch-2 ... Update latex.js	2014-07-15 21:26:49 +01:00
James Allen	e0266e309f	Put project link in header	2014-07-15 20:44:13 +01:00
James Allen	604a877f12	Load chat messages in reasonable sized chunks	2014-07-15 18:50:46 +01:00
James Allen	2a3ff3c523	Fix unit tests	2014-07-15 18:33:59 +01:00
James Allen	81eca79613	Deep watch messages to catch all updates	2014-07-15 18:32:18 +01:00
James Allen	57409df92b	Remove dead code	2014-07-15 18:26:30 +01:00
James Allen	7318f4c2d3	Merge branch 'master-redesign' of github.com:sharelatex/web-sharelatex into master-redesign	2014-07-15 18:25:29 +01:00
James Allen	b9f2b02594	Sort out scroll in chat	2014-07-15 18:25:12 +01:00
Henry Oswald	c93c8b3f7d	got basic client side templates	2014-07-15 17:56:09 +01:00
Henry Oswald	d39b8a0a05	fixed broken chat test	2014-07-15 14:28:39 +01:00
Henry Oswald	ef4b7f7036	Merge branch 'master-redesign' of https://github.com/sharelatex/web-sharelatex into master-redesign	2014-07-15 12:15:15 +01:00
James Allen	cf0ff6e97a	Hide chat in editor	2014-07-15 10:56:01 +01:00
Daniel Felder	6015788e41	Update latex.js ... Temporary fix. I proposed the same change to the official repo.	2014-07-15 01:44:39 +02:00
Henry Oswald	9f82e63a8f	changed :project_id to :Project_id	2014-07-14 22:11:41 +01:00
Henry Oswald	0aa6a206e7	added name and email to connected user data and example get request for chat	2014-07-14 16:23:31 +01:00
Henry Oswald	4a71b38721	added route for getting connected users	2014-07-14 16:16:01 +01:00
Henry Oswald	e6dfef6225	added getting connected users controller	2014-07-14 16:01:58 +01:00
Henry Oswald	b0cf0666fa	changed the redis stuf to multi	2014-07-14 15:38:55 +01:00
Henry Oswald	d13676dab2	cursor data is stored in redis	2014-07-14 15:30:55 +01:00
Henry Oswald	61b7bea203	added ttl to the users set to keep redis clean from inactive projects	2014-07-14 13:20:29 +01:00
Henry Oswald	2b2b995340	refactored updateClientPosition to use async	2014-07-14 12:58:55 +01:00
Henry Oswald	5093820a5f	Merge branch 'master-redesign' into master-redesign-templates-and-blog	2014-07-14 12:42:03 +01:00
Henry Oswald	13aaf042d9	connected user manager logic works correctly	2014-07-14 12:41:06 +01:00
James Allen	e4d9d03f55	Improve feedback on login/register forms	2014-07-11 17:08:19 +01:00
James Allen	1c5778e2c4	List number of changes in diff	2014-07-11 16:34:12 +01:00
James Allen	76415ae02b	Show labels for tracked changes above and below	2014-07-11 16:17:59 +01:00