2738 commits

Author	SHA1	Message	Date
Brian Gough	3e8ad69f3c	make loading of module routes more robust	2017-07-05 11:46:29 +01:00
Brian Gough	5ad3fd769d	preserve original /status message	2017-07-04 12:42:54 +01:00
Brian Gough	b2f676af5a	avoid duplicate routes for /status	2017-07-04 12:41:51 +01:00
Brian Gough	dbbc4966d8	Merge pull request #513 from sharelatex/bg-split-web-and-web-api ... split web and web api	2017-07-04 08:51:00 +01:00
Paulo Reis	86e66bbed1	Merge branch 'master' into pr-angular-1.6.x	2017-07-03 09:50:01 +01:00
Shane Kilkelly	b73b78e570	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2017-06-27 08:24:24 +01:00
Shane Kilkelly	0d5d59bb66	Remove user field from log, var not in scope	2017-06-26 13:56:22 +01:00
Paulo Reis	1bc38b2ea7	Use Angular minified bundle.	2017-06-26 10:07:15 +01:00
Henry Oswald	3da5ef818c	null check subscription for group admin panel	2017-06-22 14:07:07 +01:00
Paulo Reis	ddee75e479	Use a getterSetter to manage int values in settings.	2017-06-20 17:08:53 +01:00
Paulo Reis	eab00c95df	Include Angular 1.6.	2017-06-20 11:49:33 +01:00
Brian Gough	bac275962f	put /ip on web router	2017-06-19 15:54:57 +01:00
Brian Gough	d32a3fbaf5	support status and health check on web and web-api	2017-06-19 15:54:14 +01:00
Brian Gough	02cb0f2295	make compiler health check available on web	2017-06-19 15:52:04 +01:00
Brian Gough	62d6933886	use settings instead of ENV for web/api split	2017-06-15 16:11:20 +01:00
Brian Gough	1ecabaa611	Revert "update pdfjs to v1.8.188" ... This reverts commit 189e48dcc00f530eff674cc4a2b87c06814d45ff.	2017-06-15 11:14:01 +01:00
Shane Kilkelly	5a6415d3f8	Add logging for Labels http actions	2017-06-15 08:56:48 +01:00
Shane Kilkelly	9607174b64	Merge branch 'master' into sk-server-side-labels-loading	2017-06-15 08:49:14 +01:00
Shane Kilkelly	5e37b1dac1	Move logic for selectively loading labels. ... Only load labels if the user has write permission	2017-06-14 13:26:02 +01:00
Brian Gough	9687daf97f	Merge pull request #520 from sharelatex/bg-upgrade-pdfjs-1.8.188 ... upgrade pdfjs 1.8.188	2017-06-13 16:46:10 +01:00
Shane Kilkelly	3b066758bb	Don't load labels for anonymous/read-only users	2017-06-13 14:06:00 +01:00
Shane Kilkelly	b97becc7a2	Change getLabelsForDoc to broadcastLabelsForDoc	2017-06-13 11:38:15 +01:00
Shane Kilkelly	a3dbb16e50	Flush project before getting all project labels	2017-06-13 11:15:26 +01:00
Shane Kilkelly	bd6133aadb	Remove callback-pattern from label parsers	2017-06-13 11:10:21 +01:00
Shane Kilkelly	c25b6b792d	Namespace the document route under /doc/	2017-06-13 10:57:51 +01:00
Shane Kilkelly	26be4f84d0	Re-use parser	2017-06-12 15:15:14 +01:00
Shane Kilkelly	0a491a4f13	Add comment, explain flushing of doc to mongo	2017-06-12 13:09:13 +01:00
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
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
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	c7dbd21cd1	use flag on aceEditor to enable autocomplete features	2017-06-08 09:22:08 +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
Brian Gough	ecf0857756	update pdfjs to v1.8.188	2017-06-06 12:19:13 +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	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	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
Paulo Reis	d4ac91f75e	Use correct handlers in directives.	2017-06-05 10:52:11 +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
Paulo Reis	2a0454f2f1	Integrate aggregate changes with bulk actions.	2017-06-01 15:18:43 +01:00