9204 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shane Kilkelly	ff4991284d	Change docLabelsUpdated socket event to broadcastDocLabels	2017-06-12 13:06:56 +01:00
Shane Kilkelly	234a2d0e21	Remove cruft	2017-06-12 11:37:34 +01:00
Shane Kilkelly	9f9468d0e0	Use lowercase project_id	2017-06-12 11:37:05 +01:00
Shane Kilkelly	c9432a1238	Fix unit tests	2017-06-12 10:09:33 +01:00
Shane Kilkelly	1bb065344c	Move labels into an Angular Service	2017-06-12 09:44:32 +01:00
Shane Kilkelly	56385a798b	Use ide.$http, rather than jquery	2017-06-09 11:41:35 +01:00
James Allen	7137ab643f	Merge pull request #523 from sharelatex/ja-removing-group-holding-accounts ... Use an email based invite system for groups, not holding accounts	2017-06-09 11:36:42 +01:00
Shane Kilkelly	5443b92e7d	Move state management into LabelsMaster on the ide	2017-06-09 11:28:27 +01:00
James Allen	ba3822d1ae	Encode email for URL when deleting invited group email	2017-06-09 10:39:48 +01:00
James Allen	69bc6fc8e4	Maintain backwards compatibility with old holding accounts in removal end points	2017-06-08 16:53:22 +01:00
Paulo Jorge Reis	5849f65852	Merge pull request #524 from sharelatex/pr-non-bindable-value-attrs ... Tell Angular to avoid parsing the value attribute.	2017-06-08 16:13:26 +01:00
Paulo Reis	cc7f44737e	Tell Angular to avoid parsing the value attribute.	2017-06-08 16:02:28 +01:00
Shane Kilkelly	965a46291b	Only fetch labels for uploaded docs, not files	2017-06-08 15:55:17 +01:00
Shane Kilkelly	ff7955dfdb	Update labels when docs are uploaded or removed	2017-06-08 15:12:18 +01:00
James Allen	4cecbae6b6	Use an email based invite system for groups, not holding accounts	2017-06-08 12:12:08 +01:00
Shane Kilkelly	feb1d87de1	Add test for LablesHandler	2017-06-08 10:25:39 +01:00
Shane Kilkelly	3c4a6f06be	Add unit tests for LabelsController	2017-06-08 09:22:26 +01:00
Shane Kilkelly	c7dbd21cd1	use flag on aceEditor to enable autocomplete features	2017-06-08 09:22:08 +01:00
Paulo Jorge Reis	7461429c33	Merge pull request #518 from sharelatex/pr-aggregate-insert-delete ... Aggregate adjacent inserts and deletes	2017-06-07 14:21:58 +01:00
Paulo Reis	240d6d6f6b	Resolve timing issue when triggering selection-related logic.	2017-06-07 14:21:05 +01:00
Paulo Reis	53b18e041f	Trigger selection-related logic after accepting or rejecting changes.	2017-06-07 14:03:58 +01:00
Brian Gough	aa8974dcd6	Revert "use a single pdfjs worker, rotated to avoid leaks" ... This reverts commit f270ef54911acd800d2ffd577080b50ea2fe4aff. Use a new worker on each reload to free up memory.	2017-06-07 13:29:10 +01:00
Paulo Reis	19ecffd654	Merge branch 'master' into pr-aggregate-insert-delete	2017-06-06 17:04:31 +01:00
Paulo Reis	34796b18c5	Add translation keys.	2017-06-06 16:46:36 +01:00
Paulo Reis	afa011c813	Avoid flickering when elements enter the review panel.	2017-06-06 16:11:00 +01:00
Brian Gough	e417a72e0a	remove old version of pdfjs	2017-06-06 15:06:09 +01:00
Paulo Reis	73a67c6617	Add a note on the need of reverse sorting changes when rejecting.	2017-06-06 13:34:48 +01:00
Brian Gough	ecf0857756	update pdfjs to v1.8.188	2017-06-06 12:19:13 +01:00
Brian Gough	ff7e383f08	add compatibility.js from pdfjs repo	2017-06-06 12:18:58 +01:00
Paulo Reis	4504f77aa3	Do bulk rejects in reverse order.	2017-06-06 12:06:43 +01:00
Brian Gough	5aa1e4cc2a	add pdfjs-1.8.188	2017-06-06 11:47:30 +01:00
Paulo Reis	81a5a5311d	Clear selection after bulk actions.	2017-06-06 10:03:33 +01:00
Paulo Reis	af93fc1869	Make aggregate entries work when the review panel is minimised.	2017-06-06 10:00:50 +01:00
Brian Gough	b277ee3254	Merge pull request #511 from sharelatex/bg-handle-web-api-errors ... use a separate error handler for api router errors	2017-06-06 09:22:28 +01:00
Paulo Reis	5a75663a0c	Do bulk rejects in reverse order.	2017-06-05 17:17:47 +01:00
Paulo Reis	e616a62d68	Save entry ids inside entry object, not only as the key.	2017-06-05 16:29:55 +01:00
Shane Kilkelly	f7ad4a4786	WIP: basically working, with client sync	2017-06-05 14:48:50 +01:00
James Allen	cb1745a1e6	Fix redirect in clone project modal	2017-06-05 13:33:32 +01:00
James Allen	d7981fd2d4	Merge pull request #512 from sharelatex/ja-project-name-validation ... Refactor project name validation into one place and restrict /s	2017-06-05 11:55:39 +01:00
Shane Kilkelly	51881dbbcc	Only load labels from current doc if change is local	2017-06-05 11:09:58 +01:00
Paulo Reis	d4ac91f75e	Use correct handlers in directives.	2017-06-05 10:52:11 +01:00
Paulo Reis	6c3cdbcc3a	Remove dead code, backend does not send single change events anymore.	2017-06-05 10:43:03 +01:00
Paulo Reis	8d8bcab1e8	Consolidate change accept and reject code.	2017-06-05 10:41:59 +01:00
Shane Kilkelly	f29320dd93	Add ability to load labels from single document	2017-06-05 09:26:13 +01:00
Shane Kilkelly	4cb41a988a	WIP: initial work on server-side labels	2017-06-02 15:12:59 +01:00
Paulo Reis	e2edf4184f	Explicit naming.	2017-06-02 11:43:43 +01:00
Shane Kilkelly	0e498d5e65	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2017-06-02 09:55:30 +01:00
Shane Kilkelly	51e3a6b3a3	Don't use String.startsWith, use slice instead. ... - String.startsWith is not supported in IE	2017-06-02 09:54:48 +01:00
Paulo Reis	26260fc11f	Prevent aggregation of changes from different users.	2017-06-01 16:33:50 +01:00
Paulo Reis	b2a7686204	DRYness.	2017-06-01 15:28:37 +01:00