2763 commits

Author	SHA1	Message	Date
James Allen	5c8442a86f	Allow configureable brand prefix with overleaf styles	2017-08-07 17:01:59 +02:00
Shane Kilkelly	05c5b4f9c5	Merge branch 'master' into sk-fully-hide-trackchanges	2017-08-03 15:20:20 +01:00
Shane Kilkelly	670d4438dc	If track-changes is not enabled, don't show hotkeys for it.	2017-08-03 15:16:54 +01:00
James Allen	86a38df6e0	Merge pull request #563 from sharelatex/pr-support-html-encoded-i18n ... Support HTML encoded i18n	2017-08-03 10:36:35 +02:00
James Allen	ef9b3e06ee	Merge pull request #568 from sharelatex/ja-validate-contact-form ... Validate and add error status to contact form	2017-08-03 10:35:48 +02:00
James Allen	3d9da02815	Merge pull request #555 from sharelatex/sk-password-policy ... Enforce stricter password policy.	2017-08-03 10:35:00 +02:00
James Allen	28838eff60	Merge pull request #567 from sharelatex/ja-admin-panel-additions ... Some refactoring and methods needed to support the admin panel	2017-08-03 10:34:33 +02:00
James Allen	66d18bcbcd	Validate and add error status to contact form	2017-08-02 14:59:03 +02:00
James Allen	10f362a77a	Add SubscriptionUpdater.deleteSubscription	2017-08-02 09:59:45 +02:00
Shane Kilkelly	ba3550759d	Persist autoPairDelimiters setting.	2017-07-31 08:36:13 +01:00
Paulo Reis	4849c705de	Optionally ask the translate local method to HTML encode; use it in the problematic tooltip.	2017-07-28 17:31:28 +01:00
Shane Kilkelly	0f131d940d	Enforce stricter password policy. ... - Check minimum password lengths - Set default policy to 6-128 chars	2017-07-24 11:06:47 +01:00
Shane Kilkelly	4c637301f7	Add rate-limit to change-password action	2017-07-21 11:07:05 +01:00
Shane Kilkelly	8e55b77055	Move recurly callback to the public api router.	2017-07-20 13:51:11 +01:00
Shane Kilkelly	b00a30b2c5	Merge remote-tracking branch 'origin/pr-fix-tag-ordering'	2017-07-20 10:24:55 +01:00
Paulo Reis	35de3ee0ab	Fix typo in ng-repeat directive.	2017-07-19 10:34:50 +01:00
Shane Kilkelly	a4992891d0	Add an error handler to Raven loader. ... This should allow app to continue to work if loading Raven times out.	2017-07-18 14:41:44 +01:00
Shane Kilkelly	04c94760f5	Merge branch 'sk-auto-pair-braces' into sk-ac-improvements-integration	2017-07-06 14:39:28 +01:00
Shane Kilkelly	009cadb8b8	Change translation for autoPairDelimiters setting	2017-07-06 14:32:30 +01:00
Shane Kilkelly	34b2012727	Enable (optional) auto-pairing for latex mode	2017-07-06 11:06:51 +01:00
Brian Gough	0ae93db08b	use ApiErrorHandler on public api	2017-07-05 15:06:23 +01:00
Brian Gough	1dbeebabd2	move status and health checks to public api router	2017-07-05 14:50:38 +01:00
Brian Gough	845ee51a67	rename apiRouter -> privateApiRouter in router	2017-07-05 14:43:41 +01:00
Brian Gough	bd83d94f64	rename apiRouter -> privateApiRouter in Modules	2017-07-05 14:41:14 +01:00
Brian Gough	29b40ad824	add public api router	2017-07-05 14:32:55 +01:00
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