4857 commits

Author	SHA1	Message	Date
hugh-obrien	8d72fc78fc	send licences graph request to v1 for data instead of analytics	2018-08-22 18:31:29 +01:00
Henry Oswald	ab1848d0ae	Add a trusted filter for iframe downloads (#836) ... * add trusted helper to iframe downloads	2018-08-22 14:47:15 +01:00
Paulo Reis	a15706ce24	Merge branch 'master' into pr-v2-light-theme	2018-08-22 11:19:01 +01:00
Shane Kilkelly	7f7b10aa09	Sanitize display of system messages. ... When showing system-messages, use default Angular sanitizer, also, on the admin panel itself, show the verbatim text of the message. This solves a mild Stored-XSS vulnerability whereby a user could put `<script>` tags in a message. We don't want that, but we do want to be able to use basic html tags.	2018-08-22 10:15:50 +01:00
Hugh O'Brien	eeadd1e9bb	Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms ... Tell v1 confirmation status of affiliation emails	2018-08-22 08:34:33 +01:00
Jessica Lawshe	484d7acbc8	Merge pull request #817 from sharelatex/jel-mixins ... Add a mixin for FAQ search and move links mixin file	2018-08-21 11:44:30 -05:00
Jessica Lawshe	b145ca5d5c	Merge pull request #791 from sharelatex/jel-pagination ... Add pagination mixin and color variables	2018-08-21 11:44:15 -05:00
Paulo Reis	54e0a7cfd2	Merge branch 'master' into pr-change-free-history-limits	2018-08-21 11:23:28 +01:00
Henry Oswald	473063cf3d	set rclient.expire for server ttl even when there is no server id	2018-08-21 10:36:18 +01:00
Alasdair Smith	d99a42e678	Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login ... Allow for redirection of unlinked SL account to /user/login_to_ol_v2	2018-08-21 10:13:52 +01:00
Jessica Lawshe	09efced352	Add pagination mixin and color variables	2018-08-20 09:25:33 -05:00
Paulo Jorge Reis	53a9a174a2	Merge pull request #821 from sharelatex/as-account-deletion-note ... Add message about deleting SL account affecting v2 account	2018-08-20 13:58:50 +01:00
Shane Kilkelly	034586b296	Flush source project to mongo before linked-file create/refresh	2018-08-20 12:19:59 +01:00
Jessica Lawshe	45cc278acb	Add FAQ search mixin	2018-08-17 16:31:06 -05:00
Jessica Lawshe	f8b85cb848	Move link mixins to mixins folder	2018-08-17 16:12:24 -05:00
Timothée Alby	9d3e649710	Merge pull request #825 from sharelatex/ta-skip-affiliation-on-create ... Skip Affiliation on Create	2018-08-17 17:50:17 +02:00
Tim Alby	8d6505b518	log institutions API errors	2018-08-17 17:48:00 +02:00
Tim Alby	f5513f36ca	add param to skip affiliation creation on user create	2018-08-17 17:48:00 +02:00
Jessica Lawshe	5b5ece37a5	Handle sixpack timeouts and include variant in metabase segmentation ... Render default when sixpack timesout Only convert when variant exists Use Angular cookies module to add variant cookie, which is used on the new subscription page.	2018-08-17 10:29:45 -05:00
Paulo Reis	96aa418b94	Show upgrade prompts when the free history limit is hit.	2018-08-17 16:04:31 +01:00
Paulo Reis	fc424aee9e	Adapt styles to avoid layout breaking/showing options that do not make sense when no history entries are loaded.	2018-08-17 15:31:59 +01:00
Alasdair Smith	9bc3fa2df0	Pass req to preDoPassportLogin module hook	2018-08-17 12:04:05 +01:00
Alasdair Smith	b9e63421a8	Merge pull request #814 from sharelatex/as-fix-delete-modal-copy ... Fix delete wording on archive modal	2018-08-16 16:33:30 +01:00
Alasdair Smith	38689dbb1d	Merge pull request #802 from sharelatex/as-sl-redirect ... Add feature flag for redirecting SL to v2	2018-08-16 16:32:55 +01:00
Alasdair Smith	3b31125a62	Add message about deleting account affecting v2 ... Only show on SL and if the user has linked accounts	2018-08-16 14:11:43 +01:00
hugh-obrien	96ffeef73d	send fixed confirmed date to v1 for affiliations	2018-08-16 13:50:34 +01:00
hugh-obrien	55597b9279	inform v1 when confirming affiliation emails	2018-08-16 13:50:34 +01:00
Paulo Reis	02701a996d	Merge branch 'master' into pr-history-labels-part-2	2018-08-16 11:56:36 +01:00
Paulo Reis	652be9efe6	Slightly adapt the markup for the generic history error.	2018-08-16 11:41:19 +01:00
Henry Oswald	5ed95694da	Merge pull request #801 from sharelatex/ho-mailchimp ... Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.	2018-08-16 11:40:39 +01:00
Paulo Reis	23bb866988	Show an error message when history fails to load updates.	2018-08-16 11:26:34 +01:00
Henry Oswald	1e1f26b350	Merge pull request #818 from sharelatex/ho-backendgroup-config ... configure backend group name via config files	2018-08-16 10:37:14 +01:00
Henry Oswald	af6e7758d3	configure backend group name via config files	2018-08-15 15:26:22 +01:00
Alasdair Smith	985344c0d7	Use redirect setting instead of re-using setting that coincidentally would be flipped on the same day	2018-08-15 15:22:06 +01:00
Alasdair Smith	fc0b9df14c	Add feature flag for redirecting SL to v2	2018-08-15 15:22:05 +01:00
Jessica Lawshe	2c9977d26e	Add analytics to link mixins	2018-08-14 12:06:28 -05:00
Jessica Lawshe	cf532b93d8	Merge pull request #784 from sharelatex/jel-portals ... Add styling and mixins for portals	2018-08-14 12:00:36 -05:00
Timothée Alby	5e488dcab7	Merge pull request #813 from sharelatex/ta-enable-affiliations-ui ... Enable Affiliations UI	2018-08-14 16:40:35 +02:00
Paulo Reis	663ca275cb	Add i18n.	2018-08-13 17:09:18 +01:00
Alasdair Smith	bd94e55ce9	Handle archive and leave action	2018-08-13 14:25:38 +01:00
Alasdair Smith	009c5c363b	Also fix modal body for archiving projects	2018-08-13 14:25:38 +01:00
Alasdair Smith	5836c029c8	Show archive heading if archiving and on OL	2018-08-13 14:25:38 +01:00
Alasdair Smith	274ac8b1ba	Another fix	2018-08-13 14:25:38 +01:00
Alasdair Smith	db16fad6c9	Fix	2018-08-13 14:25:38 +01:00
Alasdair Smith	085c2529d9	Inject isOverleaf setting globally	2018-08-13 14:25:38 +01:00
Tim Alby	bfb2f636cd	enable affiliations UI	2018-08-13 14:59:39 +02:00
Paulo Reis	2ee42af1de	Change strategy to store selected label; improve the history toolbar layout to accomodate larger labels; fix issues with layout not being updated when changing history view modes.	2018-08-13 13:39:25 +01:00
Brian Gough	19dfe5fc8b	intial version of user setting for texlive imageName	2018-08-13 10:53:43 +01:00
Alasdair Smith	d7a341f59b	Merge pull request #808 from sharelatex/ta-import-affiliations ... Allow confirmed_at date to be specified	2018-08-13 09:47:10 +01:00
Alasdair Smith	4e484912bb	Merge pull request #804 from sharelatex/as-update-project-import-modal ... Update copy in v1 import modal now that more features are supported	2018-08-13 09:46:18 +01:00
James Allen	a9a6dcf82a	Move template modal to template module	2018-08-10 17:17:00 +01:00
James Allen	ff506b2b03	Make publishing and viewing templates separate features	2018-08-10 17:16:49 +01:00
James Allen	0f8fe53bc9	Allow confirmed_at date to be specified	2018-08-10 17:48:43 +02:00
Paulo Reis	a5c6f81573	Merge branch 'master' into pr-history-labels-part-2	2018-08-10 15:57:32 +01:00
Tim Alby	197e7ce8ab	refactor institutions getter	2018-08-10 13:40:25 +02:00
Paulo Reis	7e86218b21	Allow multiple events to trigger layout external resizes.	2018-08-10 11:28:17 +01:00
Alasdair Smith	7830a5f69d	Update copy in v1 import modal now that more features are supported	2018-08-09 13:21:11 +01:00
Paulo Reis	4f4ab57958	Use controller binding in the label tooltip.	2018-08-09 12:05:00 +01:00
Paulo Reis	d6ab993519	Dont hide history entries while loading.	2018-08-09 12:00:53 +01:00
Paulo Reis	d59fe61a83	Handle sorting of labels; keep selection between view changes.	2018-08-09 11:03:00 +01:00
James Allen	69e8eddff0	Merge pull request #796 from sharelatex/pr-history-labels-ui ... History labels UI	2018-08-09 10:50:28 +01:00
Hugh O'Brien	0af23718ba	Merge pull request #749 from sharelatex/hb-activate-submit-modal ... Activate publish modal	2018-08-09 09:44:41 +01:00
James Allen	9cbb51bbbc	Merge pull request #793 from sharelatex/sk-sl-login-v2 ... If we're creating v1 accounts, don't allow login for users already linked up	2018-08-08 15:51:25 +01:00
Henry Oswald	df161d3ece	change newsletter log to info on process boot	2018-08-08 14:32:36 +01:00
Henry Oswald	c68366155e	remove sanitize = require('sanitizer') not used anywhere	2018-08-08 14:14:56 +01:00
Henry Oswald	687637eec7	change email address in newsletter when changing default email ... put mongo_id into mailchimp merge fields	2018-08-08 13:50:03 +01:00
Paulo Reis	f2b957e5b3	Add history labels view.	2018-08-08 13:46:43 +01:00
Paulo Reis	cd853abb3c	Load labels list from the backend.	2018-08-08 11:02:14 +01:00
Paulo Reis	7e8e2a89ae	Create history labels list component.	2018-08-08 11:01:51 +01:00
Paulo Reis	9a27a39f55	Make tooltip optional in the label component.	2018-08-08 11:01:20 +01:00
Henry Oswald	6208e9f2d0	add changeEmail function to newsletter manager ... not actually called	2018-08-07 21:38:31 +01:00
Henry Oswald	6cf1f71604	add newsletter checkbox to user register forms	2018-08-06 17:43:03 +01:00
Brian Gough	efcd3577ce	avoid clobbering imported image names	2018-08-06 16:56:44 +01:00
Henry Oswald	fa37caef58	remove null check on mailchimp at top of file ... I didn't like the if statment being after the require, mailchimp could also be null and called elsewhere by acident	2018-08-06 12:37:18 +01:00
Paulo Reis	b0261970fc	Make label removal also work in compare mode.	2018-08-06 11:26:22 +01:00
Paulo Reis	e0707253a7	Remove debug lines and unneeded HTML.	2018-08-06 11:03:15 +01:00
Paulo Reis	bd6dcc007b	Remove prototype code.	2018-08-06 11:00:45 +01:00
Brian Gough	7da8a926bb	increase bodyparser limit to 64kb ... 16kb is not enough for bibtex files with more escaping.	2018-08-06 10:52:10 +01:00
Henry Oswald	17a63258c6	changed newsletter to use mailchimp	2018-08-04 17:52:12 +01:00
Shane Kilkelly	d8c9a96619	If we're creating v1 accounts, don't allow login for users already linked up	2018-08-03 14:58:29 +01:00
Paulo Reis	f418929dcf	Adjust i18n.	2018-08-02 16:28:13 +01:00
Paulo Reis	2c2bb4c130	Add i18n; avoid injecting unneeded dependencies.	2018-08-02 16:28:13 +01:00
Paulo Reis	dc235b91d9	Fix some issues with the label tooltip in compare mode.	2018-08-02 16:28:13 +01:00
Paulo Reis	a8ee879746	Use history label component; restrict label deletion to label owners.	2018-08-02 16:28:13 +01:00
Paulo Reis	d21f6ef624	Label handling in compare mode.	2018-08-02 16:28:13 +01:00
Paulo Reis	5a64313e24	Add label delete functionality; styles.	2018-08-02 16:28:13 +01:00
Paulo Reis	3a80c34078	Basic label support (showing labels in the entries list; creating labels via a modal).	2018-08-02 16:28:13 +01:00
Hugh O'Brien	22b664da1a	Merge pull request #792 from sharelatex/hb-fetch-export-zips ... Fetch export zips	2018-08-02 13:50:11 +01:00
James Allen	b1228b7eb2	Merge pull request #789 from sharelatex/mm-exports-specify-clsi-image ... Add compiler and imageName to export API request	2018-08-01 11:43:20 +01:00
Henry Oswald	89efa7e83e	add null check on response	2018-07-31 13:07:57 +01:00
Henry Oswald	5bb3acc1eb	fix metrics sending to clsi	2018-07-31 12:56:35 +01:00
hugh-obrien	8792e600d2	authenticate publish menu zip downloads	2018-07-31 12:43:39 +01:00
hugh-obrien	3532a29d50	allow fetching of export zips	2018-07-30 19:14:59 +01:00
Henry Oswald	b04c7d2ffe	send clsi response codes to graphite	2018-07-30 18:16:52 +01:00
Ersun Warncke	426c391153	set options and method for request, pass cookies and form body	2018-07-27 10:43:03 -04:00
Michael Mazour	ddbe1a5b22	Add compiler and imageName to export API request	2018-07-27 15:42:37 +01:00
Jessica Lawshe	c7941ac00e	Links mixins	2018-07-26 10:35:48 -05:00
Henry Oswald	3cf060dbac	Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal	2018-07-26 16:04:23 +01:00
Henry Oswald	d484c36c6d	improve clsi logging	2018-07-26 16:04:14 +01:00
Tim Alby	66bcdbcac9	institution upgrade	2018-07-26 13:01:44 +02:00
Tim Alby	63c7f756ce	refactor into InstitutionsAPI	2018-07-26 13:01:42 +02:00
James Allen	7dc82597e1	Merge pull request #765 from sharelatex/ja-update-email-in-v1 ... Update email in v1 when setting as default in v2	2018-07-26 10:58:57 +01:00
James Allen	f99b6b6f0a	Merge pull request #746 from sharelatex/ta-refresh-features ... Refresh Features After Confirming Email	2018-07-24 10:04:48 +01:00
James Allen	4130a934a3	Merge pull request #779 from sharelatex/ho-ClsiCookieManager-bug-fix ... fix router issue where ClsiCookieManager isn't calling a function to set	2018-07-24 10:04:41 +01:00
James Allen	faf36f0265	Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels ... Add v2 history labels endpoints	2018-07-24 10:04:13 +01:00
James Allen	5b989f0a8e	Merge pull request #759 from sharelatex/sk-login-with-v1-credentials ... Login with v1 credentials	2018-07-24 10:04:02 +01:00
Henry Oswald	e79501340c	fix router issue where ClsiCookieManager isn't calling a function to set ... the backend	2018-07-23 16:05:26 +01:00
Alberto Fernández-Capel	8fb9554c3f	Revert "Revert "add v2 history labels endpoints""	2018-07-20 15:36:03 +01:00
Alberto Fernández-Capel	f260f42466	Revert "add v2 history labels endpoints"	2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel	da632c3117	Merge pull request #750 from sharelatex/hof-labels ... add v2 history labels endpoints	2018-07-20 11:07:29 +01:00
Henry Oswald	413721ebf9	look at more chars for if the server is in dark mode ... v2-dark.overleaf.com also needs to be marked as dark	2018-07-18 13:49:53 +01:00
Alasdair Smith	d36d3f2a0e	Actually enable rich text	2018-07-18 09:26:03 +01:00
Alasdair Smith	ffe3bc2977	Switch review panel to use richTextEnabled variable	2018-07-18 09:26:03 +01:00
Alasdair Smith	62f69a4bcd	Fix case sensitivity	2018-07-18 09:26:03 +01:00
Alasdair Smith	9cd3f32365	Use hasFeature function instead of new standalone function	2018-07-18 09:26:03 +01:00
Alasdair Smith	4202b9c717	Use hard-coded feature flag for rich text	2018-07-18 09:26:03 +01:00
Alasdair Smith	fba0cd04f5	Fix TC underlines being offset because review panel above editor toolbar	2018-07-17 17:34:09 +01:00
Shane Kilkelly	299de369e5	Refactor the way logins are finished off and sessions established	2018-07-17 16:27:24 +01:00
Jessica Lawshe	64a257dae2	Merge pull request #708 from sharelatex/jel-mathjax ... MathJax - library path, directive, and use `Safe` extension	2018-07-17 09:32:06 -05:00
James Allen	4435eab423	Update affiliations UI to show specific errors for conflicting emails	2018-07-17 11:12:47 +01:00
James Allen	2c25cbaf25	Update error handling on backend	2018-07-17 11:12:09 +01:00
Alberto Fernández-Capel	e7738b851d	Merge pull request #764 from sharelatex/afc-import-managers ... Import managers	2018-07-17 10:10:51 +01:00
Alberto Fernández-Capel	5821d2c981	Merge pull request #755 from sharelatex/afc-import-team-names ... Import team names	2018-07-17 10:05:38 +01:00
James Allen	ca97698724	Handle v1 response when email is already in use	2018-07-16 17:27:01 +01:00
Hayden Faulds	f6def039bf	code review feedback	2018-07-16 16:06:17 +01:00
Hayden Faulds	04bb83f3de	add v2 history labels endpoints	2018-07-16 16:06:17 +01:00
Alberto Fernández Capel	66b492ba5f	Use id to find subscription ... It's the new method signature.	2018-07-16 14:42:41 +01:00
James Allen	d0f77abc70	Update email in v1 when setting default in v2	2018-07-16 13:26:52 +01:00
James Allen	b150a7b4ae	Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments ... Affiliations UI, second round	2018-07-16 10:08:47 +01:00
Alberto Fernández Capel	a72dec4b6e	Merge remote-tracking branch 'origin/master' into afc-multiple-managers	2018-07-16 09:45:11 +01:00
Shane Kilkelly	b4f8108277	Move the pre-login async code into a helper function	2018-07-13 11:51:11 +01:00
Alberto Fernández Capel	0bf807fa9f	Remove SubscriptionLocator.getManagedSubscription ... It was used as a kind of access control check, but it's clearer if the check is in the only controller that actually needs it.	2018-07-13 11:47:26 +01:00
James Allen	a238c74440	Remove inline style	2018-07-13 11:19:49 +01:00
Alasdair Smith	b00cad19ff	Merge pull request #751 from sharelatex/as-fix-loading-toolbar ... Fix bug where loading panel was showing over toolbar	2018-07-13 11:17:46 +01:00
James Allen	452d698a47	ng-show -> ng-if	2018-07-13 11:17:05 +01:00
Alberto Fernández Capel	79ada88b13	Add team name to subscription model	2018-07-13 11:15:58 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
Alberto Fernández Capel	46a1cdc510	Use the admin_ids array to query for subscriptions	2018-07-13 09:38:58 +01:00
James Allen	d7e0b8c369	Show unconfirmed email status in UI and add link to resend confirmation	2018-07-12 17:13:26 +01:00
James Allen	33b28db061	Add backend endpoint for resending confirmation email	2018-07-12 16:39:04 +01:00
Paulo Reis	59008b4a51	Show university custom departments when changing affiliations; fix Features typo.	2018-07-12 16:37:09 +01:00
Paulo Reis	a759828ece	Update feature flag for affiliations; use it in the router; minor style adjustments.	2018-07-12 16:37:09 +01:00
Paulo Reis	85cf518457	Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies.	2018-07-12 16:37:09 +01:00
Paulo Reis	c817094a2d	Add i18n keys; minor style adjustments.	2018-07-12 16:37:09 +01:00
Paulo Reis	4d1b6c6ba8	Add error handling.	2018-07-12 16:37:09 +01:00
Paulo Reis	c630c5d952	Preemptively remove front-end data when removing user emails.	2018-07-12 16:37:09 +01:00
Paulo Reis	19b57571bf	Basic affiliation change implementation.	2018-07-12 16:37:08 +01:00
Paulo Reis	1514e5e071	Isolate affiliations form in a component.	2018-07-12 16:37:08 +01:00
Alberto Fernández Capel	abcfa0b0d2	Store manager ids in an array	2018-07-12 16:35:27 +01:00
Alasdair Smith	ba6560ce04	Fix bug where loading panel was showing over toolbar	2018-07-12 11:18:09 +01:00
hugh-obrien	367b16a3ab	removes checking params for submit modal	2018-07-11 16:36:03 +01:00
Alasdair Smith	dc56ffb8a6	Improve copy	2018-07-11 15:22:20 +01:00
Alasdair Smith	b1a47ddae4	Improve copy	2018-07-11 15:15:22 +01:00
Alasdair Smith	538aba323a	Add first pass at unsupported message and style	2018-07-11 15:15:22 +01:00
Alasdair Smith	00c089448e	Add review panel unsupported message	2018-07-11 15:15:22 +01:00
Alasdair Smith	9d81cf20f9	Add new unsupported class to control visibility while rich text is open	2018-07-11 15:15:22 +01:00
Tim Alby	35cb3924e2	refresh features after confirming email	2018-07-11 14:57:35 +02:00
Alberto Fernández Capel	40c1f67561	Check that the subscription is a group before exporting it to csv ... I removed this check by mistake, just taking it back.	2018-07-11 12:10:43 +01:00
Alberto Fernández Capel	4e8185d369	Use the id in methods that modify a subscription ... This will make it easier to allow a user to manage multiple groups.	2018-07-11 09:56:36 +01:00
Tim Alby	791dc0df5b	check institution features on features update	2018-07-10 17:53:37 +02:00
James Allen	cb449f4b75	Delete a subscription on expiry, rather than set personal plan code	2018-07-10 10:31:25 +01:00
Paulo Reis	2ef1b4904d	Bootstrap the light theme.	2018-07-09 15:45:09 +01:00
James Allen	f5ea7f2d77	Merge pull request #730 from sharelatex/sk-handle-orphaned-mendeley-linked-files ... Add a new error type to LinkedFiles: FileCannotRefreshError	2018-07-06 11:06:51 +01:00
James Allen	7a1bb30952	Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation ... Don't consider current features when assigning bonus	2018-07-06 11:06:34 +01:00
James Allen	dad4bad9eb	Merge pull request #700 from sharelatex/ew-fix-undefined-last-name ... fix undefined last name	2018-07-06 11:06:12 +01:00
Tim Alby	b78212290a	handle dynamic Proxy URLs	2018-07-06 12:03:47 +02:00
James Allen	b902821c07	Return blank features, not default features if no bonuses	2018-07-06 09:09:41 +01:00
Tim Alby	cfd5c65be4	add affiliation before confirming email	2018-07-05 16:02:55 +02:00
Tim Alby	9d4df4271a	try adding affiliation on user creation	2018-07-05 16:01:15 +02:00
Tim Alby	3e1d61438f	add endpoint to endorse affiliation	2018-07-05 15:59:36 +02:00
Timothée Alby	08aab38470	Merge pull request #725 from sharelatex/ta-disable-emails-endpoint ... Disable Emails Endpoint when externalAuthenticationSystemUsed is True	2018-07-05 15:57:31 +02:00
Timothée Alby	958012533d	Merge pull request #724 from sharelatex/ta-parse-email ... parse email in UserUpdater	2018-07-05 15:57:20 +02:00
Shane Kilkelly	f125a755bf	Add a new error type to LinkedFiles: FileCannotRefreshError	2018-07-05 12:13:07 +01:00
Hugh O'Brien	a230b5efab	Merge pull request #720 from sharelatex/mm-export-v1projectid ... Include project's and user's v1 ID in export requests	2018-07-05 12:12:35 +01:00
Tim Alby	3581aa3ccb	disable emails endpoint when externalAuthenticationSystemUsed is true	2018-07-04 15:19:15 +02:00
Shane Kilkelly	0777e44abf	Merge branch 'sk-linked-files-mendeley'	2018-07-04 12:16:39 +01:00
Shane Kilkelly	b32c9be8ca	Linked files from Mendeley.	2018-07-04 10:05:03 +01:00
Tim Alby	3a541307b4	parse email in UserUpdater	2018-07-03 20:59:38 +02:00
Alberto Fernández-Capel	f1ef053caf	Merge pull request #705 from sharelatex/afc-import-team-from-v1 ... Changes to allow importing a team from v1	2018-07-03 13:39:19 +01:00
Alberto Fernández-Capel	d904622b05	Merge pull request #695 from sharelatex/sk-fix-validation-on-refresh-output-file ... Fix validation of project-output-file, no build_id when imported from v1	2018-07-03 13:38:59 +01:00
Alberto Fernández-Capel	a1c49b0cf9	Merge pull request #694 from sharelatex/sk-linked-files-warning-when-no-projects ... Add a warning message when there are no other projects to choose.	2018-07-03 13:38:33 +01:00
Michael Mazour	235534d269	Also include user's v1 ID in export requests	2018-07-03 10:15:51 +01:00
Douglas Lovell	260f927980	Merge pull request #719 from sharelatex/dcl-test-fix ... Small repair to SubscriptionController Test	2018-07-02 13:16:10 -03:00
Alasdair Smith	04a98c4d91	Merge pull request #697 from sharelatex/pr-user-affilitations ... User affiliations	2018-07-02 11:36:04 +01:00
Michael Mazour	8436b67260	Include project's v1 ID in export requests ... If a project was imported from v1, include its v1 ID when making an export request back to v1. Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.	2018-07-02 11:12:42 +01:00
Douglas Lovell	1df5b0b942	Fixup mixed indentation	2018-06-29 19:36:59 -03:00
Alberto Fernández Capel	d76a6ae710	Ensure overleaf settings is defined before linking to the v1 subscription page	2018-06-29 15:33:03 +01:00
Paulo Reis	d021cd8e3f	Add role hints and deparment hints (when not provided by the uni).	2018-06-28 16:37:36 +01:00
Alberto Fernández Capel	18ded60619	Fix unit tests	2018-06-28 15:28:44 +01:00
Alberto Fernández Capel	193579070c	Ensure features are updated for users but not for stubs	2018-06-28 13:25:04 +01:00
Tim Alby	fe0fdd11bf	call v1 affiliation deletion endpoint with POST instead of DELETE	2018-06-28 13:48:28 +02:00
Tim Alby	1d80878bf8	delete affiliations on user deletion	2018-06-28 13:47:19 +02:00
Tim Alby	837f614df4	refactor affiliation requests	2018-06-28 13:47:16 +02:00
Jessica Lawshe	a34dcef8b7	Use express local for MathJax path	2018-06-27 17:27:27 -05:00
Jessica Lawshe	90986c1ade	Express local for MathJax path	2018-06-27 17:26:39 -05:00
Paulo Reis	270c67df5f	Move affiliations form and table into specific file.	2018-06-27 17:08:25 +01:00
Paulo Reis	d1467784bb	Avoid showing a comma when the user only has department info.	2018-06-27 14:21:03 +01:00
Alberto Fernández Capel	c19fc6d245	Fetch the whole user doc ... Other attributes are needed to calculate features.	2018-06-27 12:52:47 +01:00
Alberto Fernández Capel	7e5ababe66	Ensure we can import both user and user stubs to teams	2018-06-27 12:09:58 +01:00
Tim Alby	60009c6346	fix delete endpoint	2018-06-26 19:50:12 +02:00
Jessica Lawshe	9f5e976539	Merge pull request #681 from sharelatex/jel-cms-meta-and-btn ... CMS: control of metadata	2018-06-26 08:19:57 -05:00
Ersun Warncke	193d497d66	fix undefined last name	2018-06-26 07:50:31 -04:00
James Allen	156c417df0	Don't consider current features when assignin bonus	2018-06-26 11:26:07 +01:00
Shane Kilkelly	c5defc9203	Update wording, tell user to create another project	2018-06-26 09:54:58 +01:00
James Allen	fbfb0d6472	Remove conflicting .modal class from upload alerts	2018-06-26 09:09:10 +01:00
Paulo Reis	70b3df5a0e	Remove logs.	2018-06-25 17:32:39 +01:00
Paulo Reis	e7f819fbdd	Hide affiliations UI behind feature flag.	2018-06-25 17:06:23 +01:00
Paulo Reis	8ac6f4d6f4	Use v1 proxy; even more style adjustments.	2018-06-25 16:13:43 +01:00
Paulo Reis	b92dc98b99	Merge branch 'master' into pr-user-affilitations	2018-06-25 14:13:26 +01:00
Paulo Reis	00dfcf66c6	More styling adjustments.	2018-06-25 13:44:43 +01:00
Henry Oswald	c1a8d8b31a	Merge branch 'master' into ho-clsi-double-backend	2018-06-25 13:43:40 +01:00
Tim Alby	7a3fcf6d2c	change error message on email update failure	2018-06-25 13:47:22 +02:00
Tim Alby	c6de896bb5	decorate emails list with affiliation data	2018-06-25 13:47:04 +02:00
Tim Alby	e41391fb4a	ignore affiliations if v1 is not configured	2018-06-25 13:45:46 +02:00
Tim Alby	d3b2a2650f	add/remove affiliations when adding/removing emails	2018-06-25 13:45:46 +02:00
Shane Kilkelly	04be842b30	Fix validation of project-output-file, no build_id for imported v1 projects	2018-06-25 12:27:56 +01:00
Shane Kilkelly	b3d17fc753	Add a warning message when there are no other projects to choose.	2018-06-25 11:48:05 +01:00
Tim Alby	b65ba388ba	replace OldAssetProxy	2018-06-25 12:36:51 +02:00
Shane Kilkelly	f6424ada40	Merge pull request #655 from sharelatex/sk-linked-files-output-redux ... Linked files from project output	2018-06-25 10:28:29 +01:00
Jessica Lawshe	af2417bdc5	Move metadata to separate file and update metadata existence check	2018-06-22 13:42:01 -05:00
Paulo Reis	a1da24a86d	Styling adjustments.	2018-06-22 16:07:54 +01:00
James Allen	0a2fe7e941	Merge pull request #687 from sharelatex/ja-fix-subscription-upsell ... Fix check for hasSubscription	2018-06-22 15:59:51 +01:00
James Allen	be13ed7beb	Merge pull request #689 from sharelatex/ja-use-app-name-in-upgrade ... Remove hardcoded ShareLaTeX reference in upgrade blurb	2018-06-22 15:59:41 +01:00
James Allen	c004cdb200	Remove hardcoded ShareLaTeX reference in upgrade blurb	2018-06-22 14:24:41 +01:00
James Allen	0edd2b5fe7	Fix check for hasSubscription	2018-06-22 14:10:20 +01:00
Shane Kilkelly	d76c6c2c22	Merge pull request #682 from sharelatex/sk-copy-linked-file-data-on-clone ... Copy linkedFileData when cloning a project	2018-06-22 13:22:45 +01:00
Shane Kilkelly	096d3f28a1	Move the handleError function into the LinkedFilesController	2018-06-22 13:09:18 +01:00
Shane Kilkelly	ebe828aa62	Refactor, and remove the source_project_display_name prop from linkedFileData	2018-06-22 13:09:18 +01:00
Shane Kilkelly	dfb4898be5	Move getFileById to the LinkedFilesHandler module	2018-06-22 13:09:18 +01:00
Shane Kilkelly	c8012f2968	Cleaner import of errors	2018-06-22 13:09:18 +01:00
Shane Kilkelly	6058f3ef9b	Refactor the LinkedFiles/Agent system, and track build_id for output files	2018-06-22 13:09:18 +01:00
Shane Kilkelly	d93eb448e3	Move Clsi logic to ClsiManager	2018-06-22 13:09:18 +01:00
Shane Kilkelly	67dcbff450	Remove linked-files items from the left-menu test controls	2018-06-22 13:09:18 +01:00
Shane Kilkelly	708e809df6	Use errors from ProjectFileAgent	2018-06-22 13:09:18 +01:00
Shane Kilkelly	2ade78783b	Add acceptance test for refreshing output file from v1 project	2018-06-22 13:09:18 +01:00
Shane Kilkelly	a313184c71	Handle linked-output-files from v1 imports	2018-06-22 13:09:18 +01:00
Shane Kilkelly	48a4f6c4c4	Fix error handling for failing to get output file	2018-06-22 13:08:13 +01:00
Shane Kilkelly	7fc99a38f8	Better styling on the output-files toggle	2018-06-22 13:08:13 +01:00
Shane Kilkelly	6672a20c2b	Enable switching between source and output files	2018-06-22 13:08:13 +01:00
Shane Kilkelly	64ec90f34f	Move the isOutputFilesMode flag onto the scope	2018-06-22 13:08:13 +01:00
James Allen	5717496685	Create unified new file modal with linked files	2018-06-22 13:08:13 +01:00
Shane Kilkelly	87474ce060	Remove commentary	2018-06-22 13:08:13 +01:00
Shane Kilkelly	d4beba24b6	Backend for project output file agent	2018-06-22 13:08:13 +01:00
Shane Kilkelly	e916d96792	WIP: basic backend for project-output-file agent	2018-06-22 13:08:13 +01:00
Shane Kilkelly	ead245721b	Mostly working selection of output files from another project	2018-06-22 13:08:13 +01:00
Shane Kilkelly	60ca298db3	WIP	2018-06-22 13:08:13 +01:00
Paulo Reis	9bc70d479c	Use university-provided list of departments when available.	2018-06-22 11:24:14 +01:00
Shane Kilkelly	5abb745e05	Copy linkedFileData when cloning a project	2018-06-22 10:00:39 +01:00
Alberto Fernández-Capel	d36dbfda07	Merge pull request #665 from sharelatex/afc-import-team-invites ... Add method to import invites	2018-06-22 09:55:19 +01:00
Paulo Reis	62ab9dbb98	Rearrange layout to have the new affiliation form within the affiliations table.	2018-06-21 17:18:01 +01:00
Paulo Reis	b16ebc1843	Read user email from the URL in DELETE requests.	2018-06-21 17:16:42 +01:00
Timothée Alby	caee25d85d	Revert "Replace OldAssetsProxy"	2018-06-21 15:52:20 +02:00
Timothée Alby	c30cdf955b	Merge pull request #666 from sharelatex/ta-smart-proxy ... Replace OldAssetsProxy	2018-06-21 14:35:16 +02:00
James Allen	46fbf0c641	Merge pull request #672 from sharelatex/ja-refactor-email-templating ... Refactor email templating	2018-06-21 10:28:26 +01:00
James Allen	4608a59e3d	Store OneTimeTokens in mongo rather than redis	2018-06-21 10:22:08 +01:00
James Allen	0dcbc5facb	Send out confirmation emails on register and record confirmedAt date	2018-06-21 10:21:15 +01:00
James Allen	74ca0c4220	Refactor email template system	2018-06-21 10:19:12 +01:00
Paulo Reis	147d74d92a	Integrate e-mails table with backend.	2018-06-20 14:22:06 +01:00
Henry Oswald	4cb78a5797	move start time inside each clsi request as they are run in series now	2018-06-20 14:15:42 +01:00
Paulo Reis	917776aede	Change the UI to gradually show needed fields for affiliations.	2018-06-20 11:37:55 +01:00
Henry Oswald	e60157094b	improve logging for 2 compile backends	2018-06-20 11:07:34 +01:00
Tim Alby	bbed5fca9a	simplify proxy	2018-06-20 10:58:19 +02:00
Paulo Reis	c0241df15c	Rewrite service and controller code to send the correct payload according to use case (no uni; known uni; new uni).	2018-06-19 17:10:55 +01:00
Alasdair Smith	8de9e9fae4	Use error type instead of error message to check v1 connection error	2018-06-19 16:25:56 +01:00
Alasdair Smith	82a8e37071	Handle V1 connection refused when getting v1 subscription	2018-06-19 16:25:31 +01:00
Alasdair Smith	8492373a14	Add V1ConnectionError	2018-06-19 16:24:27 +01:00
Henry Oswald	b5581c4d40	Merge branch 'master' into ho-clsi-double-backend	2018-06-19 14:55:18 +01:00
Jessica Lawshe	ad50db858e	Merge pull request #664 from sharelatex/jel-pricing-plans-event ... Plans and Pricing Google Analytics events	2018-06-19 08:48:12 -05:00
Michael Mazour	0246631443	Add public API endpoints to reach CLSIs ... - `/api/clsi/compile/:submission_id` - `/api/clsi/compile/:submission_id/build/:build_id/output/:file` Also per review: - DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest - Include submission_id in a log message - Don't include timeout in limits when getting file	2018-06-19 12:04:02 +01:00
James Allen	a3e92a8867	Merge pull request #658 from sharelatex/ja-enable-subscriptions ... Add message explaining Collaborator subscription to v1 users	2018-06-19 08:37:50 +01:00
Tim Alby	3d272ca297	replace OldAssetProxy	2018-06-18 18:37:58 +02:00
Alberto Fernández Capel	81c102b501	Add method to import invites	2018-06-18 14:48:27 +01:00
Jessica Lawshe	fe225fbbd3	Include event label when features table viewed	2018-06-15 16:29:42 -05:00
Paulo Reis	3ddb8d0bef	Add affiliations UI.	2018-06-15 11:33:47 +01:00
Henry Oswald	5f8985811d	mvp to send requests to 2 backends	2018-06-14 17:41:30 +01:00
Timothée Alby	55112dc7dc	Merge pull request #648 from sharelatex/hb-export-status ... Export status endpoint	2018-06-14 13:59:11 +02:00
Timothée Alby	984d81f5b8	Merge pull request #649 from sharelatex/ta-emails-endpoints ... Add Emails Endpoints	2018-06-14 13:59:00 +02:00
James Allen	eda031023c	Update subscription thank you page to remove ShareLaTeX references	2018-06-14 10:15:20 +01:00
hugh-obrien	0321780eba	adding tests for exports status checker	2018-06-14 09:44:05 +01:00
hugh-obrien	fb9ca430de	export status endpoint	2018-06-14 09:44:05 +01:00
James Allen	1e7601d647	Add null check to subscription dash	2018-06-14 09:03:14 +01:00
James Allen	e5bd7ce551	Add message explaining Collaborator subscription to v1 users	2018-06-13 17:22:34 +01:00
James Allen	82c6d9b293	Merge pull request #629 from sharelatex/ja-display-subscriptions ... Link subscriptions to v1	2018-06-13 13:55:57 +01:00
Henry Oswald	b24b110037	Merge pull request #647 from sharelatex/ho-clsi-domain ... PDF download takes optional domain paramater	2018-06-13 11:30:17 +01:00
Henry Oswald	02110064f7	Merge branch 'master' into ho-clsi-domain	2018-06-13 10:32:51 +01:00
Shane Kilkelly	3baf0836bc	Support project-linked-files originating from imported v1 projects	2018-06-13 10:02:54 +01:00
James Allen	b00a79ff1c	Redirect to v1 plans page from v2	2018-06-12 13:52:47 +01:00
James Allen	a417dc8ff4	v1Subscription -> v1Subscriptions	2018-06-12 13:52:47 +01:00
James Allen	034e50760e	Add flag that can disable plans page	2018-06-12 13:52:47 +01:00
James Allen	ce60e6941c	Check with v1 before allowing a new subscription	2018-06-12 13:52:47 +01:00
James Allen	9d84263463	Fetch subscription details from v1 and display to user	2018-06-12 13:52:46 +01:00
James Allen	1d7accabdd	Update group notification for new group invite URL	2018-06-12 09:54:54 +01:00
James Allen	f7532e5854	Merge pull request #619 from sharelatex/afc-email-tokens ... Use emails with tokens for team invites	2018-06-12 08:30:23 +01:00
James Allen	dbd6ea30e9	Improve robustness of email validation	2018-06-11 15:22:42 +01:00
James Allen	ed5bc70350	Tweak front-end layout	2018-06-11 14:20:46 +01:00
James Allen	155102df64	Use Error classes, and ensure invited_emails is cleared on new invite	2018-06-11 14:20:35 +01:00
James Allen	b716f59442	Remove deprecated removeEmailInviteFromGroup	2018-06-11 14:19:47 +01:00
Tim Alby	97c145433e	use EmailHelper.parseEmail on registration ... Also changed EmailHelper to use the regexp already used in UserRegistrationHandler rather than the `mimelib` package as it is deprecated.	2018-06-11 12:31:18 +02:00
Tim Alby	e614ed9248	add emails endpoints	2018-06-11 10:35:23 +02:00
Henry Oswald	75c9489c06	PDF Downloads work, not tested on large pdf's yet	2018-06-08 17:17:00 +01:00
Tim Alby	5438a565b9	use multiple emails when relevant	2018-06-08 17:53:45 +02:00
Tim Alby	31827ae6b5	add emails attribute on user creation	2018-06-08 17:53:45 +02:00
Jessica Lawshe	07aedaa92b	Merge pull request #645 from sharelatex/jel-add-cms ... Existence check for data from CMS	2018-06-08 10:14:23 -05:00
Jessica Lawshe	43da34098e	Existence check	2018-06-08 10:07:44 -05:00
Jessica Lawshe	ba5b3bb06a	Merge pull request #581 from sharelatex/jel-add-cms ... Add CMS	2018-06-08 07:18:03 -05:00
Jessica Lawshe	d57660aeb5	Merge pull request #632 from sharelatex/jel-plans-pricing-fix ... Plans and Pricing fixes	2018-06-08 07:17:28 -05:00
Alberto Fernández Capel	59688efb56	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-08 12:21:17 +01:00
Alberto Fernández-Capel	e7e429a963	Merge pull request #605 from sharelatex/afc-update-user-references ... Add method to update user references	2018-06-08 11:29:25 +01:00
Alberto Fernández Capel	57775e60b1	Merge remote-tracking branch 'origin/master' into afc-update-user-references	2018-06-08 11:28:58 +01:00
Alberto Fernández-Capel	10da4fc5f7	Merge pull request #585 from sharelatex/afc-team-overleaf-id ... Add overleaf id to the Subscription (team) schema	2018-06-08 11:27:15 +01:00
Alberto Fernández Capel	5159f6f33d	Check the subscription is in a group plan before adding new members	2018-06-08 09:58:51 +01:00
Timothée Alby	7cdcd725fd	Revert "Use Multiple Emails"	2018-06-07 18:44:59 +02:00
Alberto Fernández Capel	c4250e601e	Minor copy change Registered -> Accepted invite	2018-06-07 16:53:19 +01:00
Alberto Fernández Capel	85f4a31585	Proper coffee syntax	2018-06-07 16:49:17 +01:00
Jessica Lawshe	484ee9ad61	Should not AB test when signed up before 2018-06-06	2018-06-07 10:30:21 -05:00
Alberto Fernández Capel	a3bb99d755	Honour invited_emails for the team being ... We'll remove them soon, but we want to keep them for a while so recent invites can join their teams.	2018-06-07 16:22:38 +01:00
Alberto Fernández Capel	670f24ef6f	Simplify method name	2018-06-07 16:12:02 +01:00
Alberto Fernández Capel	30b935befd	Prevent double rendering error	2018-06-07 16:12:02 +01:00
Alberto Fernández Capel	d1b1e6c299	Do not include the Licence ending in domain invites ... So the message reads like "University of Notre Dame has invited you to join a team on Overleaf" instead of ""University of Notre Dame licence..."	2018-06-07 16:12:02 +01:00
Alberto Fernández Capel	88d12b43ac	Make CTA message match regular message	2018-06-07 16:12:02 +01:00
Alberto Fernández Capel	5e70825c94	Rename view variable to invite ... Makes the meaning more explicit	2018-06-07 16:12:02 +01:00
Hugh O'Brien	6f5c777163	Merge pull request #622 from sharelatex/hb-take-emis-names-as-input ... Take user entered first and last names for EMIS	2018-06-07 15:52:33 +01:00
Timothée Alby	f422b7242d	Merge pull request #603 from sharelatex/ta-use-multi-emails ... Use Multiple Emails	2018-06-07 15:40:43 +02:00
Alberto Fernández Capel	6639f61a43	Remove extra space between rows	2018-06-07 14:05:10 +01:00
James Allen	c2ef93b212	Merge pull request #610 from sharelatex/ja-sync-from-v2 ... Tell v1 when refreshing features in v2	2018-06-07 13:30:34 +01:00
hugh-obrien	c684fc3383	fix first/last name check bug	2018-06-07 12:57:01 +01:00
Alberto Fernández Capel	959db80177	Check all emails to prevent invite duplicates	2018-06-07 12:49:46 +01:00
Alasdair Smith	f3c871a972	Merge pull request #640 from sharelatex/as-fix-leave-quick-action ... Show leave quick action instead of archive for unowned projects	2018-06-07 11:44:36 +01:00
Alberto Fernández Capel	566c41cafd	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-07 11:40:03 +01:00
Alberto Fernández Capel	1fc047d08e	Fix invitation resend	2018-06-06 17:11:25 +01:00
Alasdair Smith	8f71b104c5	Fix bug where unowned project would show archive quick action instead of leave ... If the user does not own the project, the project can only be left, not archived. Previously the quick action button was only showing the archive icon but clicking the button would correctly leave the project. This is confusing, so this commit corrects to show the leave icon for projects not owned by the current user	2018-06-06 16:59:13 +01:00
Alberto Fernández Capel	4885b70016	Better translation key	2018-06-06 16:33:01 +01:00
Alberto Fernández Capel	06efe1910b	Replace hardcoded string	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	b308dcef63	Clean up markup ... - Avoid nested rows without cols in them - Use .row-spaced instead of empty rows to space content	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	553878064b	Resend email if the user has already been invited	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	16cb5e0d35	Propagate the error further up the stack ... Useful for error reporting and metrics.	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	8a317b5bfe	Better wording	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	e753ef3af5	Invite users in the invited_emails array ... We'll remove that attribute soon, but for the time being we want users to still be able to join the team.	2018-06-06 15:36:53 +01:00
Tim Alby	3cb499a3c2	add comment	2018-06-06 15:46:41 +02:00
Tim Alby	e4da748257	add filter to query on emails attribute	2018-06-06 14:52:09 +02:00
Tim Alby	813289f5de	use multiple emails when relevant	2018-06-06 11:45:01 +02:00
Tim Alby	c5530163f5	add emails attribute on user creation	2018-06-06 11:45:01 +02:00
Tim Alby	1f6fcafce6	remove default emails attribute on user model	2018-06-06 11:11:57 +02:00
Jessica Lawshe	679d91c4d2	Update default plans view conditional ... Fixes a flash of unwanted content on Firefox	2018-06-05 12:58:18 -05:00
Alberto Fernández Capel	6fb6119ca8	Merge remote-tracking branch 'origin' into afc-email-tokens	2018-06-05 15:42:17 +01:00
Tim Alby	613c9193e3	implement multi emails logic	2018-06-05 16:42:12 +02:00
Jessica Lawshe	b63384cbf1	Merge pull request #537 from sharelatex/jel-pricing-plans ... Plans and pricing variant	2018-06-05 09:30:43 -05:00
Paulo Reis	bfad95ae61	File restore button needs to be smaller to fit the new toolbar height.	2018-06-05 13:59:27 +01:00
Paulo Reis	4088c164c9	Update translations; use underscores for keys.	2018-06-05 11:15:39 +01:00
Paulo Reis	8e5032fb34	Merge branch 'master' into pr-v2-history-ui	2018-06-05 10:55:42 +01:00
Paulo Reis	1624639bc8	Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui	2018-06-05 10:32:06 +01:00
Paulo Reis	f858786f2d	Add i18n.	2018-06-05 10:14:16 +01:00
Jessica Lawshe	10cf5825a5	Add plans variant ... Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and will use a ‘ instead of “ Also, move repeated elements to partials	2018-06-04 14:42:26 -05:00
Jessica Lawshe	64ead238e4	Add meta tags	2018-06-04 09:51:35 -05:00
hugh-obrien	54ce196500	test custom first and last name for exports	2018-06-04 13:16:21 +01:00
hugh-obrien	4c5f186ca2	take custom first and last names from export UI	2018-06-04 13:16:21 +01:00
Alberto Fernández Capel	58c4e72b2a	Update references to UserLocator ... UserLocator was refactored in another branch: UserLocator -> UserGetter	2018-06-01 16:53:16 +01:00
Alberto Fernández Capel	25d7196570	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-01 16:49:47 +01:00
Alberto Fernández Capel	b0b2546e43	Remove dead code	2018-06-01 16:45:36 +01:00
Alberto Fernández Capel	a73a869d03	I can haz some grammar	2018-06-01 16:17:11 +01:00
Alberto Fernández Capel	7fcdf68296	Remove dead code	2018-06-01 16:05:44 +01:00
Alberto Fernández Capel	3bd18715db	Add some tests	2018-06-01 15:37:09 +01:00
Alberto Fernández Capel	89735f4b8e	Keep method name for compatibility	2018-06-01 15:36:00 +01:00
James Allen	cfbb5c8f24	Remove some dead code	2018-06-01 14:55:07 +01:00
Hugh O'Brien	a79c9b94a8	Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web ... Extract v1 templates code to web	2018-06-01 11:29:36 +01:00
Alberto Fernández Capel	9b18e58b68	Choose a better method name ... This method is now only notifying users about a potential domain licence	2018-06-01 11:28:06 +01:00
Alberto Fernández Capel	385fec1914	Clean up code that uses invited_emails	2018-06-01 11:23:25 +01:00
Alberto Fernández Capel	1c485c1884	Improve error handling	2018-05-31 16:42:09 +01:00
Alberto Fernández Capel	d262de14d6	Use team invites to join domain licensed teams	2018-05-31 16:15:47 +01:00
Brian Gough	fef667a738	Merge pull request #614 from sharelatex/ja-restrict-restore ... Don't allow read-only users to restore	2018-05-31 15:52:40 +01:00
Brian Gough	c4f3a12ce5	add missing locking to copyFileFromExistingProject	2018-05-31 14:51:32 +01:00
Alberto Fernández Capel	39c8595c27	Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin ... To not cause confusion with team invites. They are not really an invite because they are user initiated, but more of a user choosing to join a team.	2018-05-31 14:25:47 +01:00
James Allen	f5367985c3	Don't allow read-only users to restore	2018-05-31 13:44:37 +01:00
hugh-obrien	d47e845367	add v1 template tests	2018-05-31 13:26:54 +01:00
Alberto Fernández Capel	11edfde153	Accept & revoke team invites	2018-05-31 11:54:50 +01:00
hugh-obrien	7f86ddc72c	extract v1 templates code to web	2018-05-31 11:12:31 +01:00
Shane Kilkelly	d3ae276091	Merge pull request #579 from sharelatex/sk-linked-files-from-project ... Linked Files from Project	2018-05-31 11:08:08 +01:00
Alasdair Smith	57c56a0853	Merge pull request #565 from sharelatex/as-dash-action-btns ... Add action buttons to v2 dash	2018-05-31 10:11:20 +01:00
Alasdair Smith	cc9d18d991	Merge pull request #600 from sharelatex/as-refactor-rt-load ... Refactor loading rich text	2018-05-31 10:11:01 +01:00
Alasdair Smith	5ec238cae8	Switch archive button with restore button for archived projects	2018-05-31 10:05:39 +01:00
Alasdair Smith	7dffc56804	Clone project action button	2018-05-31 10:05:04 +01:00
Alasdair Smith	2354f4156b	Download project action button	2018-05-31 10:04:59 +01:00
Alasdair Smith	ffc06f2a3b	Archive project action button	2018-05-31 10:04:50 +01:00
Alasdair Smith	a2dff4bfbb	Right align actions header	2018-05-31 09:59:35 +01:00
Alasdair Smith	83c62c8ab1	Only show action buttons on v2	2018-05-31 09:58:39 +01:00
Alasdair Smith	20cca0fcd4	Add action buttons to project list	2018-05-31 09:58:18 +01:00
James Allen	4f5148e668	Wrap text like normal	2018-05-30 17:55:47 +01:00
Paulo Reis	6e7e76a3ce	Margin and padding adjustments.	2018-05-30 17:34:46 +01:00
Henry Oswald	a747480425	add references host into settings	2018-05-30 15:28:59 +01:00
Paulo Reis	66d7bdb26b	Change buttons copy.	2018-05-30 15:03:22 +01:00
Paulo Reis	4c4a4f10c1	Rename history file tree and move it around.	2018-05-30 14:21:01 +01:00
Alberto Fernández Capel	9aa95cb0d5	Show team invites	2018-05-30 13:06:27 +01:00
James Allen	e0e88b25fe	Make agrument checking more robust	2018-05-30 12:48:08 +01:00
Alasdair Smith	d0b160d9a2	Rename flag for clarity	2018-05-30 11:55:09 +01:00
Alasdair Smith	c6d2b4f1e7	Use single rich text include instead of split toolbar & body includes	2018-05-30 11:44:27 +01:00
Alberto Fernández Capel	7e09c0e0b1	First stab at email token invites (WIP)	2018-05-30 11:29:21 +01:00
Paulo Reis	637c492e6e	Merge branch 'master' into pr-v2-history-ui	2018-05-30 11:24:33 +01:00
James Allen	c5b553d4a6	Notify v1 by default	2018-05-29 17:31:15 +01:00
James Allen	301ae80f99	Allow refreshFeatures to notify v1 to update its features	2018-05-29 17:21:42 +01:00
Timothée Alby	6db3bf59a6	Merge pull request #586 from sharelatex/ta-refactor-user-getter ... Canonical Way to Get Users by Email	2018-05-29 17:56:59 +02:00
Timothée Alby	eeff32bf4f	Merge pull request #584 from sharelatex/ta-remove-deprecated-method ... Remove getUserOrCreateHoldingAccount Function	2018-05-29 17:56:42 +02:00
Paulo Reis	8d2189f843	Support using both point-in-time and compare modes.	2018-05-29 16:50:15 +01:00
Alberto Fernández Capel	b52fbdbfa4	Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups	2018-05-29 15:37:04 +01:00
Jessica Lawshe	85ee5a36c8	Merge pull request #587 from sharelatex/jel-contact ... Move contact form to modules	2018-05-29 09:20:05 -05:00
Alberto Fernández Capel	259d690f7c	Add method to update user references	2018-05-29 12:00:22 +01:00
Shane Kilkelly	dccac6302e	Use a decorateLinkedFileData function on server to add project name	2018-05-29 10:07:31 +01:00
Shane Kilkelly	92fb83e665	Use the correct linkedFileData var	2018-05-29 10:05:50 +01:00
Tim Alby	5fbe5c5537	remove UserLocator ... Use UserGetter instead	2018-05-28 14:11:13 +02:00
Tim Alby	bbaca91e57	add UserGetter#getUserByMainEmail ... Use only that method to find users by email.	2018-05-28 14:11:09 +02:00
Tim Alby	5a590aa021	remove getUserOrCreateHoldingAccount function ... The function is deprecated	2018-05-28 14:09:13 +02:00
Shane Kilkelly	bc7d6a64ed	Add a trailing comma	2018-05-25 16:01:37 +01:00
Shane Kilkelly	c8a8fe6af7	Use Agent.handleError in case checkAuth produces an error	2018-05-25 16:01:11 +01:00
Jessica Lawshe	868083676f	Move contact form	2018-05-25 08:50:38 -05:00
Hayden Faulds	29f7ce0bbf	Merge pull request #576 from sharelatex/mm-handle-export-error ... Handle error in ExportsController	2018-05-25 13:22:18 +01:00
Shane Kilkelly	0cb5beb689	Merge branch 'master' into sk-linked-files-from-project	2018-05-24 13:47:28 +01:00
Shane Kilkelly	b2a68cb911	Merge pull request #582 from sharelatex/sk-add-test-controls-panel ... Add a "Test Controls" section to the left-panel	2018-05-24 11:41:10 +01:00
Shane Kilkelly	578d667efa	Disable the 'select a project/file' options in project-linked-file modal	2018-05-24 11:30:53 +01:00
Shane Kilkelly	8766b5d487	DRY up writing to dump-folder in FileWriter	2018-05-24 11:30:29 +01:00
Shane Kilkelly	b5e8ed81b9	Better sanitization and validation for project-linked-file	2018-05-24 11:30:03 +01:00
Shane Kilkelly	1cbc901492	Add a checkAuth function to linked-file agents	2018-05-24 11:29:37 +01:00
Shane Kilkelly	3181f624a7	Remove obsolete auth check	2018-05-24 10:22:17 +01:00
Alasdair Smith	1849fcb70a	Merge pull request #588 from sharelatex/ja-restrict-front-widget ... Add Dropbox test for Front widget too	2018-05-24 10:09:18 +01:00
James Allen	7bcd285bb1	Add Dropbox test for Front widget too	2018-05-24 09:51:29 +01:00
Alberto Fernández Capel	8a55994f64	Ensure a team overleaf id is unique	2018-05-23 16:11:28 +01:00
Alberto Fernández Capel	c8977ab9d6	Add overleaf id to user schema	2018-05-23 15:23:46 +01:00
Shane Kilkelly	ba9143fc3c	Show test-controls for admin users by default	2018-05-23 12:55:49 +01:00
Shane Kilkelly	561b62f7db	Add a hidden 'Test Controls' section to the left-menu. ... This is to be used for hidden features that are not yet ready to ship, and would otherwise be hidden behind a console command. Append `?tc=true` to the project url to reveal this panel.	2018-05-23 12:37:42 +01:00
Paulo Reis	fb33fc6c30	Add loading indicators; handle binary files; keep selected file across points in time.	2018-05-23 12:14:27 +01:00
Shane Kilkelly	295425e791	Check that user can read a project on entities-json route	2018-05-23 11:34:55 +01:00
Shane Kilkelly	6a5af88e12	Remove stray comment	2018-05-23 11:32:00 +01:00
James Allen	2ff5ecb342	Use intelligent /user/trial v2 URL for v2 trials	2018-05-22 16:59:59 +01:00
Shane Kilkelly	4daf062be9	Add unit test for ProjectController.projectEntitiesJson	2018-05-22 16:40:39 +01:00
Paulo Reis	f4f3a4375b	Add history toolbar (just scaffolding); show files at point in time.	2018-05-22 15:40:57 +01:00
Shane Kilkelly	691eec48ba	Merge branch 'master' into sk-linked-files-from-project	2018-05-22 15:39:09 +01:00
Shane Kilkelly	73184c063e	Be more specific about the source-file-not-found error case	2018-05-22 11:36:35 +01:00
James Allen	1d0be569a6	Fix SubscriptionUpdater -> FeaturesUpdater miscall	2018-05-22 10:05:08 +01:00
James Allen	50bd60dd51	Split FeaturesUpdater out of SubscriptionUpdater	2018-05-22 10:05:08 +01:00
James Allen	0830c473ad	Update unit tests and refactor to make more testable	2018-05-22 10:05:08 +01:00
James Allen	4deaf7865d	Guard against no apis.v1 setting	2018-05-22 10:05:08 +01:00
James Allen	b1f378208d	Properly merge subscriptions from different places	2018-05-22 10:05:08 +01:00
Paulo Reis	81c93e11d0	History file tree integration with the backend.	2018-05-21 15:13:34 +01:00
Paulo Reis	2a52eab8d6	Proxy history filetree requests through web.	2018-05-21 15:10:46 +01:00
Shane Kilkelly	1f2ee4e3fc	Show error if refresh fails	2018-05-21 11:02:12 +01:00
Shane Kilkelly	7d8c7bebe2	Remove commented-out code	2018-05-21 10:17:00 +01:00
Shane Kilkelly	ee1b32eee1	Check for case where the source file is not found	2018-05-21 10:12:41 +01:00
Hugh O'Brien	346f37011f	Merge pull request #546 from sharelatex/ns-allow-latexmkrc ... Allow for latexmkrc files in project zip upload	2018-05-21 09:03:40 +01:00
Michael Mazour	19e07485bc	Handle error in ExportsController	2018-05-18 15:08:33 +01:00
Shane Kilkelly	94a599d530	Fix the reloading of file view after refreshing linked file	2018-05-18 10:35:02 +01:00
Hugh O'Brien	24b4f9c46f	Merge pull request #436 from sharelatex/mm-project-export ... Project exports spike	2018-05-18 10:31:15 +01:00
James Allen	8b533841d4	Merge pull request #563 from sharelatex/ja-hide-timeout-upgrade ... Put the compile timeout upgrade behind an enableSubscriptions flag	2018-05-17 11:55:28 +01:00
James Allen	e7a4aeaf79	Merge pull request #560 from sharelatex/ja-enable-v2-for-all ... Enable the v2 banner for everyone if showV2Banner is set	2018-05-17 11:55:21 +01:00
James Allen	3724edfc10	Fix translation string interpolation	2018-05-17 11:25:14 +01:00
Shane Kilkelly	2345b77ea7	Validate project-linked-file data before doing import	2018-05-17 10:51:58 +01:00
Michael Mazour	e34dd90a1f	Add project export route and controller	2018-05-16 14:58:34 +01:00
Michael Mazour	a661084485	Add ExportsHander for project exports performed via v1	2018-05-16 14:58:34 +01:00
Shane Kilkelly	c626446aad	Tidy up the project/file display in project-linked-file	2018-05-16 13:52:54 +01:00
Shane Kilkelly	9624e2a290	Record the source project display name, to render with the file	2018-05-16 13:44:21 +01:00
Shane Kilkelly	f533674dbd	Clean up	2018-05-16 13:26:59 +01:00
Shane Kilkelly	7292602167	More fine-grained loading spinners	2018-05-16 11:49:10 +01:00
Shane Kilkelly	74d8e67a05	Remove leading slash from path names, for display	2018-05-16 10:58:56 +01:00
Shane Kilkelly	f2702c7b0a	Show the linked-files UI for project-linked-files	2018-05-16 10:41:21 +01:00
Shane Kilkelly	103832af7d	Functioning project-linked-file importer	2018-05-16 10:29:51 +01:00
Shane Kilkelly	9c33f3f8bc	WIP: Project Linked File modal	2018-05-15 16:22:47 +01:00
Shane Kilkelly	33b4a1768b	Merge branch 'master' into sk-linked-files-from-project	2018-05-15 10:53:59 +01:00
James Allen	66846cc68c	Put the compile timeout upgrade behind an enableSubscriptions flag	2018-05-15 10:17:04 +01:00
Shane Kilkelly	06c0b45ef7	Merge branch 'master' into sk-fix-references-full-index	2018-05-14 13:45:12 +01:00
Shane Kilkelly	43d00a2e5f	Account for the new referencesSearch flag when deciding to do fullIndex	2018-05-14 11:31:59 +01:00
Hayden Faulds	3fb3daaee7	Merge pull request #529 from sharelatex/sk-remove-templates-from-v2 ... Add `templates` to the `Features.hasFeature` function	2018-05-14 10:57:28 +01:00
James Allen	58b5d67bdd	Enable the v2 banner for everyone if showV2Banner is set	2018-05-14 10:29:42 +01:00
James Allen	35dc518d05	Merge pull request #553 from sharelatex/ja-configurable-fonts ... Allow font family and line height to be user configurable	2018-05-11 13:50:03 +01:00
Alasdair Smith	df9294816e	Show archive or leave icon based on selected projects	2018-05-11 13:46:15 +01:00
Alasdair Smith	64061f0079	Switch name of deleted projects to archived projects to reduce confusion	2018-05-11 13:45:33 +01:00
Nate Stemen	d108b11bc0	Add latexmkrc in FileTypeManager	2018-05-10 16:59:58 -04:00
James Allen	331f9ea9df	Translate default	2018-05-10 18:04:30 +01:00
James Allen	dee96920b0	Allow font family and line height to be user configurable	2018-05-10 18:03:54 +01:00
Hayden Faulds	9ccdf073c4	accept attributes rather than projectHistoryId to ProjectCreationHandler	2018-05-10 11:39:23 +01:00
James Allen	78aefc2871	Merge pull request #542 from sharelatex/ja-match-front-to-v1 ... Update font and line spacing in Ace to match OL v1	2018-05-09 12:24:37 +01:00
James Allen	1e0e006eef	Merge pull request #534 from sharelatex/ja-recompile-on-w ... Recompile one Cmd-S, :w and Ctrl-. for v1 compatibility	2018-05-09 12:24:29 +01:00
Brian Gough	2bb2d9615f	added comment about using a project entity iterator	2018-05-08 13:37:33 +01:00
Brian Gough	f34ce5b12b	rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity	2018-05-08 13:37:33 +01:00
Brian Gough	1278e2da45	fix project structure version when deleting folder	2018-05-08 13:37:33 +01:00
Brian Gough	24764f66ff	Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager ... improve locking in web	2018-05-08 11:11:32 +01:00
Hugh O'Brien	57f07fb5fe	Merge pull request #518 from sharelatex/hob-publish-modal-qs ... Publish modal accessible from query string	2018-05-08 09:40:41 +01:00
Brian Gough	afd4a10a19	retry lock with exponential backoff	2018-05-04 15:02:36 +01:00
James Allen	1aadd7d369	Configure line height and font family separately for v2	2018-05-04 14:05:20 +01:00
Brian Gough	e414100c41	add support for unique lock values	2018-05-04 13:22:33 +01:00
Shane Kilkelly	30beb098ab	Sort the project entities by path	2018-05-04 11:06:59 +01:00
Shane Kilkelly	08263180fa	Add project_id to the entities payload	2018-05-04 11:03:54 +01:00
Shane Kilkelly	3c3ce2010a	Add endpoint to list entities within a project	2018-05-04 10:45:13 +01:00
Shane Kilkelly	4925bfe536	Add an endpoint to get users projects as json	2018-05-04 09:44:13 +01:00
James Allen	42ac8faaae	Add dependency mapping for vim keybindings	2018-05-03 17:01:34 +01:00
Shane Kilkelly	87fb226c3e	Fix invocation of getFileStream	2018-05-03 15:30:44 +01:00
Shane Kilkelly	5cb85c0332	WIP: Add ProjectFileAgent	2018-05-03 14:29:03 +01:00
James Allen	09486f2eea	Recompile on Cmd-S and :w	2018-05-03 12:20:53 +01:00
Hayden Faulds	ba0e06d0fe	add V1HistoryNotSyncedError	2018-05-02 13:18:43 +01:00
Paulo Reis	9f6dc12658	Add custom styling; add code to handle point-in-time selection.	2018-05-01 17:27:51 +01:00
Shane Kilkelly	af70ef0dc4	Add templates to the hasFeature function	2018-05-01 14:01:52 +01:00
James Allen	d2e54c5e0c	Merge pull request #504 from sharelatex/afc-show-group-export-csv ... Show export user CSV even if the group has reached max capacity	2018-05-01 08:50:04 +01:00
James Allen	4c7364fd01	Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits ... Re-order compile rate limits	2018-05-01 08:48:22 +01:00
James Allen	a294fe795c	Merge pull request #519 from sharelatex/ja-relative-dates-in-v2 ... Display last modified as a relative date in v2	2018-05-01 08:48:14 +01:00
James Allen	d454be8053	Bring down proportion to 10%	2018-04-30 17:19:21 +01:00
James Allen	6399621d1f	Show front widget for paid and sampled free users	2018-04-30 17:13:57 +01:00
James Allen	5c87a2aa90	Display last modified as a relative date in v2	2018-04-27 16:50:46 +01:00
Paulo Reis	6e6bc91130	Style the history entries components.	2018-04-27 15:59:28 +01:00
hugh-obrien	157efa6d96	make publish modal accessible from query string	2018-04-27 15:50:11 +01:00
Paulo Reis	8249f4e17e	Wrap copies of existing history UI elements in components.	2018-04-27 11:22:20 +01:00
Alasdair Smith	4759097e49	Merge pull request #494 from sharelatex/as-main-role ... Add main role	2018-04-25 09:45:17 +01:00
Henry Oswald	c6f4df4f77	Merge pull request #498 from sharelatex/ho-recurly-v4 ... Payment page improvments	2018-04-24 09:01:34 +01:00
Jessica Lawshe	8bedd99d73	Merge pull request #492 from sharelatex/jel-annual-buy-text ... Update button text for annual plan	2018-04-23 11:35:09 -05:00
Jessica Lawshe	5d5edb7808	Button text for annual plan ... Annual plan users are charged right away but `upgrade_cc_btn` translates to `Upgrade now, pay after 7 days`. Update the button for annual plans to use `upgrade_now`, which translates to `Upgrade Now`	2018-04-23 11:34:34 -05:00
Jessica Lawshe	5365760994	Don't include v1 folders in "Add to folders" list	2018-04-23 11:34:10 -05:00
Jessica Lawshe	b6554fc309	Don't show dropdown for v1 folders	2018-04-23 11:34:10 -05:00
Alasdair Smith	ad1df3532f	Merge pull request #490 from sharelatex/hof-deleted-project-history ... Pass project history id with updates	2018-04-23 10:05:07 +01:00
Alasdair Smith	b0349af21d	Merge pull request #493 from sharelatex/as-editor-toolbar ... Add toggle switch directive to editor toolbar	2018-04-23 10:04:12 +01:00
Alberto Fernández Capel	5d266c7f04	Show export user CSV even if the group has reached max capacity	2018-04-17 16:12:33 +01:00
James Allen	d9a7b1248a	Re-order compile rate limits to do project/user check before everyone check	2018-04-17 14:43:54 +01:00
Henry Oswald	b5e6181c49	added .capitalised style	2018-04-17 11:26:02 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Henry Oswald	45f51c9a27	change country select to proper angular setup so pre population works ... it may have been broken from an angular upgrade or similar.	2018-04-16 15:12:03 +01:00
Henry Oswald	e64c398352	capitalise month and year on payment page	2018-04-16 15:11:31 +01:00
Alasdair Smith	3af10733cc	Replace hard coded rich text hashed file path with registration system	2018-04-16 14:14:49 +01:00
Henry Oswald	39e41681a0	change to plans[currencyCode]['symbol'] from price.currency.symbol ... price.currency.symbol returns bad chars. '£12.00' and '€14.40' for eur	2018-04-16 12:19:55 +01:00
Alasdair Smith	671a2c9767	Make content wrapper have main role	2018-04-16 11:43:24 +01:00
Alasdair Smith	3482724679	Make ide body have main role	2018-04-16 11:33:53 +01:00
Henry Oswald	086f080ee4	add !isFormValid(simpleCCForm) back in, was used during debugging	2018-04-16 11:01:14 +01:00
Henry Oswald	c3eeefdc5b	only use recurly.js from our public libs folder	2018-04-16 10:52:33 +01:00
Henry Oswald	7940b60144	make a seperate external error class which is used on entire payment form	2018-04-16 10:35:12 +01:00
Henry Oswald	06fb31533f	add highlight for bad card/cvv/mmyy number in.	2018-04-16 10:26:39 +01:00
Henry Oswald	a1be0e95b4	remove the dead validation	2018-04-16 10:10:25 +01:00
Henry Oswald	c050791905	change ng to use show/hide ... ng-if doesn't render html until evaulated to true, need the form to be there at time of recurly.configure	2018-04-13 16:57:33 +01:00
Henry Oswald	ccef0760ae	remove the form control, it just breaks the iframe styling	2018-04-13 16:51:55 +01:00
Henry Oswald	ae3858bcd0	can subscribe using new form. terrible styling	2018-04-13 16:35:32 +01:00
Henry Oswald	7e8b59cbb3	wip form loads as ifram	2018-04-13 16:01:41 +01:00
Hayden Faulds	7755a7cc1f	add overleaf to projections for project structure updates	2018-04-13 13:45:07 +01:00
Hayden Faulds	9ef40902ca	send projectHistoryId with resync requests	2018-04-13 13:45:03 +01:00
Hayden Faulds	3006d018d9	send projectHistoryId with project structure updates	2018-04-13 13:45:03 +01:00
Hayden Faulds	e5f3c472e3	return projectHistoryId in DocumentController.getDoc	2018-04-13 13:45:02 +01:00
Jessica Lawshe	8d2c3ca6a1	Remove undefined controller	2018-04-12 11:53:31 -05:00
Jessica Lawshe	f9a56f7b37	Remove unknown experiments	2018-04-12 10:18:15 -05:00
Jessica Lawshe	55cb5b3c70	Remove "teaser-history" experiment	2018-04-12 10:18:15 -05:00
Jessica Lawshe	5683f48d97	Fix conditional	2018-04-12 10:18:15 -05:00
Jessica Lawshe	f44ddcb928	Remove "plans-1610" experiment ... There is 1 place that the variants appear still, `/web/public/coffee/main/subscription-dashboard.coffee`. This should remain for users that bought these plans.	2018-04-12 10:18:15 -05:00
Hayden Faulds	50686090c8	push doc pathname logic into DocController	2018-04-12 16:16:44 +01:00
Hugh O'Brien	2d3f169c49	Merge pull request #473 from sharelatex/hob-publish-modal-setup ... Publish modal web setup	2018-04-12 14:01:18 +01:00
Alasdair Smith	c87cb1d361	Basic styles for editor toolbar	2018-04-12 13:46:19 +01:00
Brian Gough	4115a35773	Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking ... replace files and separate uploads and locking (connects to overleaf/sharelatex#422)	2018-04-12 09:52:02 +01:00
Alasdair Smith	60a28f7173	Fix hashed file path for rich text	2018-04-11 12:00:36 +01:00
hugh-obrien	6c3482f2a1	add reactDOM, fix publish menu configs	2018-04-10 15:59:39 +01:00
hugh-obrien	39d25fdff9	webpack compiling for publish menu	2018-04-10 15:59:30 +01:00
hugh-obrien	a250004036	initial publish modal setup	2018-04-10 15:59:24 +01:00
Alasdair Smith	35cc5bf19c	Add defensive check for req.query, fixing tests	2018-04-10 10:38:40 +01:00
Brian Gough	882b555433	create new file on replace	2018-04-09 12:05:08 +01:00
Brian Gough	1a68f768d4	rename internal method uploadFile to _uploadFile	2018-04-09 12:05:08 +01:00
Brian Gough	38dab1c82c	clean up whitespace	2018-04-09 12:05:08 +01:00
Brian Gough	e29c657c8a	preserve original callback signature for addFile	2018-04-09 12:05:08 +01:00
Brian Gough	b551f3c7e9	fix indentation	2018-04-09 12:05:08 +01:00
Brian Gough	61b192fb2c	fix indentation of comment	2018-04-09 12:05:07 +01:00
Brian Gough	fe8897d757	refactor addFile and addFileWithOutUpdatingHistory	2018-04-09 12:05:07 +01:00
Brian Gough	d949338ed4	separate out file uploads	2018-04-09 12:05:07 +01:00
Brian Gough	cdfa2de68d	add comment about upsert and locking	2018-04-09 12:05:07 +01:00
Brian Gough	baec4eb195	move uploads outside the lock	2018-04-09 12:05:07 +01:00
Alasdair Smith	eb05be6eb3	Remove unused feature flag	2018-04-06 17:00:27 +01:00
Alasdair Smith	c3b2af4345	Instead of checking RT flag at compile time, adjust at run time	2018-04-06 16:59:06 +01:00
Alasdair Smith	d433a88158	Pass rich text flag if query string is set	2018-04-06 16:58:12 +01:00
James Allen	2c0bd94fa7	Use mkdirp when restoring a file if the folder doesn't exist	2018-04-06 15:20:51 +01:00
James Allen	1e8439a2c6	Fix restore of docs from old deleted docs	2018-04-06 10:30:13 +01:00
James Allen	b4fa47d664	Add unit tests for RestoreManager	2018-04-06 10:30:13 +01:00
James Allen	415be6b4e0	Open file after restoring	2018-04-06 10:30:13 +01:00
James Allen	0a1c543841	Hook up front end to restore documents	2018-04-06 10:30:13 +01:00
James Allen	075db1e5b9	Remove stray console.log	2018-04-06 10:30:13 +01:00
James Allen	3832850be6	Implement restore end point with acceptance tests	2018-04-06 10:30:13 +01:00
James Allen	beee86f1ce	First pass at restore end point	2018-04-06 10:30:13 +01:00
Paulo Reis	2e898bcf13	Use LESS to conditionally hide SL assets.	2018-04-03 09:01:43 -05:00
Paulo Reis	396b29f32d	Conditionally load SL assets on error pages; adjust styles for OL v2.	2018-04-03 09:01:42 -05:00
Jessica Lawshe	b2c7bb9d95	Track v2 onboard events ... Added events to the v2 banner to track on Metabase and Google Analytics.	2018-04-03 08:48:11 -05:00
James Allen	216b17ab92	Fill in v2 link	2018-04-03 11:55:19 +01:00
James Allen	0a00dea610	Merge pull request #469 from sharelatex/ja-feature-flag-rename ... Split references feature flag into mendeley and referencesSearch	2018-04-03 11:53:58 +01:00
Alasdair Smith	672305c9c2	Merge pull request #453 from sharelatex/ja-update-import-modal ... Tone down and reword v1 import modal	2018-04-03 10:24:39 +01:00
Paulo Reis	bd3c12cf90	Make sure the layout lib knows about the resizer width in v2.	2018-03-29 10:35:17 +01:00
James Allen	f80962b74b	Split references feature flag into mendeley and referencesSearch	2018-03-28 17:11:41 +01:00
Paulo Jorge Reis	bc46044f85	Merge pull request #466 from sharelatex/pr-v2-system-messages ... v2 system messages	2018-03-28 15:17:26 +01:00
Paulo Jorge Reis	efee5a88bf	Merge pull request #434 from sharelatex/jel-preview-unsupported ... Remove expressions used for debugging	2018-03-28 15:16:49 +01:00
Paulo Reis	525deabc2b	Move language subdomain message into the projects list too; make the close buttons similar.	2018-03-28 13:54:02 +01:00
James Allen	f13c7fd573	Revert "Replace references feature flag with mendeley and referencesSearch" ... This reverts commit 12fdff37f9fd5d47e8446eebc576d8bb9e045aa4.	2018-03-28 13:47:34 +01:00
Paulo Reis	b8049f3c46	Move system messages into the project list page (only).	2018-03-28 12:05:32 +01:00
James Allen	e0facd40da	Merge pull request #461 from sharelatex/ja-feature-flag-rename ... Replace references feature flag with mendeley and referencesSearch	2018-03-28 11:16:56 +01:00
Alasdair Smith	2e93e0bf23	Revert "Hotfix RT button showing up when it isn't enabled"	2018-03-28 10:13:23 +01:00
Henry Oswald	a998d738ee	Merge pull request #460 from sharelatex/ho-null-check-docs ... null check map on files and docs inside logger	2018-03-28 10:01:49 +01:00
Alasdair Smith	4217b48a15	Hotfix RT button showing up when it isn't enabled	2018-03-27 20:10:03 +01:00
James Allen	dc2d7a9c7e	Replace references feature flag with mendeley and referencesSearch	2018-03-27 16:20:21 +01:00
Henry Oswald	3b3b404288	Update LoggerSerializers.coffee	2018-03-27 14:45:47 +01:00
Henry Oswald	eeb76441c0	null check map on files and docs inside logger	2018-03-27 14:41:56 +01:00
James Allen	21424f6bba	Add placeholder read more link	2018-03-27 10:36:57 +01:00
Paulo Jorge Reis	70433e59da	Merge pull request #447 from sharelatex/ja-remove-sixpack-from-history ... Don't show history teaser image since it refers to SL	2018-03-27 10:10:27 +01:00
Paulo Jorge Reis	9a1a0794f3	Merge pull request #450 from sharelatex/pr-v2-favicons ... V2 favicons and related assets	2018-03-27 10:09:34 +01:00
Paulo Jorge Reis	8f7228d26e	Merge pull request #437 from sharelatex/pr-v2-splitters ... Improve v2 splitters	2018-03-27 10:08:05 +01:00
Paulo Jorge Reis	f633276570	Merge pull request #438 from sharelatex/ja-panel-style-tweaks ... Focus and spacing tweaks	2018-03-27 10:07:17 +01:00
James Allen	dc1b30dc8e	Update import modal to be less scary	2018-03-26 15:11:17 +01:00
Paulo Reis	b7a11ff766	Add Overleaf favicon-related assets; configure layout.pug to show the Overleaf green when tinting the SVG favicon.	2018-03-26 14:24:53 +01:00
James Allen	d2ba1c7266	Don't show history teaser image since it refers to SL	2018-03-26 11:43:48 +01:00
Alasdair Smith	5e2f838af4	Instead of loading script directly use requirejs config so it can be lazy loaded	2018-03-23 13:52:48 +00:00
Alasdair Smith	1a0154c9ea	Load rich text code from module view include instead of hard coding	2018-03-23 12:37:16 +00:00
Alasdair Smith	74099440f3	Generate webpack entry points including modules	2018-03-23 12:37:16 +00:00
James Allen	0c89f488bd	Merge pull request #440 from sharelatex/afc-fix-read-announcements-count ... Fix read announcements count	2018-03-23 12:06:49 +00:00
James Allen	d517bae95c	Merge pull request #423 from sharelatex/ja-set-google-analytics-cookie-domain ... Set ga cookie domain to same as site	2018-03-23 11:52:00 +00:00
James Allen	45c853d30a	Merge pull request #425 from sharelatex/ja-disable-beta-program ... Disable beta program pages	2018-03-23 11:51:46 +00:00
Alberto Fernández Capel	fef7601433	Early return only applies to fault tolerant request ... We need to return the data to other requests like getLastOccurrence.	2018-03-23 10:02:11 +00:00
James Allen	be3306aa0b	Focus and spacing tweaks	2018-03-22 17:18:47 +00:00
James Allen	b1ca81bf2d	Merge pull request #430 from sharelatex/ja-hide-v2-notification ... Allow dismissing/hiding v2 and v1 banners	2018-03-22 16:33:02 +00:00
Jessica Lawshe	ffbdb760c6	Merge pull request #417 from sharelatex/subscription-analytics ... Subscription analytics	2018-03-22 08:47:42 -05:00
Paulo Reis	906f4899aa	Only use custom togglers in v2.	2018-03-22 12:10:34 +00:00
Paulo Reis	db68134f81	Add i18n.	2018-03-22 11:48:14 +00:00
Jessica Lawshe	f37c34db19	Remove expressions used for debugging	2018-03-21 16:50:37 -05:00
Shane Kilkelly	135854a0e0	Merge branch 'master' into ta-add-publisher-hub-analytics-proxy	2018-03-21 10:32:04 +00:00
Tim Alby	643f687640	Add recentV1TemplateIdsActivity proxy to AnalyticRouter	2018-03-20 17:32:45 -05:00
Paulo Reis	3f073c2341	Rename attributes and vars for clarity	2018-03-20 16:11:09 +00:00
Paulo Reis	a3034fc79f	Enable custom togglers.	2018-03-20 16:11:09 +00:00
James Allen	a023512872	Collapse panel with v1 info	2018-03-20 13:50:51 +00:00
Jessica Lawshe	89cfd98af3	Add details to analytics label	2018-03-20 08:31:35 -05:00
Shane Kilkelly	e50fef151f	Add uniExternalCollaboration proxy to AnalyticRouter	2018-03-20 13:19:51 +00:00
James Allen	3551f1453b	Use flexible height v2 message panel	2018-03-20 12:15:18 +00:00
James Allen	d8ed0e5277	Allow v2 notification banner to be dismissed	2018-03-20 12:15:18 +00:00
James Allen	161d7b1d9d	Disable beta program pages	2018-03-20 12:03:48 +00:00
James Allen	10aa4a29ca	Set ga cookie domain to same as site	2018-03-20 11:54:03 +00:00
Alberto Fernández-Capel	f9ba4ea467	Merge pull request #414 from sharelatex/afc-retries-with-exp-backoff ... Use exponential backoff in request retries to analytics	2018-03-20 09:55:07 +00:00
Alasdair Smith	e9ba73138e	Fix webpack config so that it's more consistent	2018-03-19 14:47:25 +00:00
Alberto Fernández Capel	132b31c39f	Increase timeout	2018-03-19 14:46:18 +00:00
Alberto Fernández Capel	f2fc999ce4	Extract method to add common params	2018-03-19 10:30:06 +00:00
Alberto Fernández Capel	07b0f37579	Log errors in requests to analytics	2018-03-19 09:56:44 +00:00
Hayden Faulds	57de597e60	404 when resyncing deleting projects	2018-03-16 15:26:19 +00:00
Hayden Faulds	482d140716	add overleaf to projection	2018-03-16 13:29:22 +00:00
Alberto Fernández Capel	6609c10d36	Use exponential backoff to retry request to analytics	2018-03-15 17:14:50 +00:00
Hayden Faulds	d22d8324af	disable history resync when project-history is not enabled	2018-03-15 16:57:39 +00:00
Alasdair Smith	2e0804c728	Fix opts not passed to buildJsPath	2018-03-15 12:15:00 +00:00
Alasdair Smith	408c195c6a	Instead of using webpack chunk hashing, use existing system	2018-03-15 09:42:26 +00:00
James Allen	de94e33b5d	Merge pull request #397 from sharelatex/ja-fix-project-upload ... Add files to project in series to avoid lock contention	2018-03-13 13:33:16 +00:00
James Allen	371caa41ca	Merge pull request #378 from sharelatex/hof-history-resync ... resync project history endpoint	2018-03-13 13:33:08 +00:00
James Allen	d9b301023a	Use eachSeries rather than a job array	2018-03-13 13:30:06 +00:00
James Allen	33904fe7be	Add files to project in series to avoid lock contention	2018-03-13 13:21:48 +00:00
Alasdair Smith	41d8a50a8e	Merge pull request #385 from sharelatex/sk-add-recent-team-activity-proxy ... Add a proxy to `AnalyticsRouter` for `/recentTeamActivity`	2018-03-13 11:20:55 +00:00
Hayden Faulds	a7945e9b96	extra logging for DocumentUpdaterHandler	2018-03-09 11:16:35 +00:00
Hayden Faulds	75f5fbcdbf	refactor DocumentUpdaterHandler	2018-03-09 11:15:18 +00:00
Hayden Faulds	af9cc28419	additional logging	2018-03-09 11:11:06 +00:00
Hayden Faulds	792e8bbd7e	fix route name	2018-03-09 11:11:06 +00:00
Hayden Faulds	9ab0ded8f1	update project history resync url	2018-03-09 11:11:06 +00:00
Hayden Faulds	5b2e7d981a	resyncProject -> resyncProjectHistory	2018-03-09 11:11:06 +00:00
Hayden Faulds	926f91dd3b	wrap project resync in project structure lock	2018-03-09 11:11:06 +00:00
Hayden Faulds	4d2f0218af	add resync project history endpoint	2018-03-09 11:11:06 +00:00
Tim Alby	d5109d22d2	record both project-created and project-imported events	2018-03-06 18:26:25 -05:00
Tim Alby	4b291fab2a	Record new project event	2018-03-06 18:13:24 -05:00
Shane Kilkelly	f6e66b9346	Add a proxy to AnalyticsRouter for /recentTeamActivity	2018-03-06 16:21:28 +00:00
Shane Kilkelly	84fff5e9b7	Merge pull request #379 from sharelatex/sk-geolocate-user-sessions ... Geolocate user, and pass country-code to editing-sessions	2018-03-06 11:33:50 +00:00
Shane Kilkelly	7d81c42b9c	More explicit handling of empty-string country-code	2018-03-06 10:32:28 +00:00
Shane Kilkelly	97d181c3f9	Reverse an un-necessary change	2018-03-05 13:24:54 +00:00
James Allen	e77168d791	Don't render URL section if not linked file	2018-03-05 11:21:31 +00:00
Shane Kilkelly	b3f47ea44a	Remove obsolete segmentation payload in editing-session request	2018-03-05 11:15:41 +00:00
Shane Kilkelly	f625b22ec5	Move the geolocation out of login, to the editingSession action	2018-03-05 10:46:51 +00:00
James Allen	d92c3e8b55	Logging and error message tweaks	2018-03-05 10:37:53 +00:00
James Allen	d4025908b7	Add in enabledLinkedFileTypes setting	2018-03-05 10:37:53 +00:00
James Allen	a99f55891f	Use external proxy	2018-03-05 10:37:53 +00:00
James Allen	6848e97a82	Hook up refresh button to backend	2018-03-05 10:37:00 +00:00
James Allen	9733223840	Show linked file status in front end	2018-03-05 10:37:00 +00:00
James Allen	01d84bd983	Handle error cases when downloading URL	2018-03-05 10:37:00 +00:00
James Allen	b1dda931f4	Add in modal for creating linked URL file	2018-03-05 10:37:00 +00:00
James Allen	85f25b810c	First pass at URL based linked files	2018-03-05 10:37:00 +00:00
Brian Gough	3bbd49c7eb	Merge pull request #377 from sharelatex/bg-add-project-structure-version-number ... add project structure version number	2018-03-05 08:41:14 +00:00
Shane Kilkelly	bbe15a3ff3	Remove stray log	2018-03-02 12:06:18 +00:00
Shane Kilkelly	1629f68d5e	Geolocate user on login, and pass country-code to editing-sessions	2018-03-02 12:02:45 +00:00
Brian Gough	14713aa393	added comment about project version	2018-03-01 15:15:09 +00:00
Brian Gough	12911598de	send current project structure version to docupdater	2018-03-01 12:32:08 +00:00
Brian Gough	98f50919e8	comment about file replacements	2018-03-01 12:32:08 +00:00
Brian Gough	67d784a74a	increment project version on every structure change	2018-03-01 12:32:08 +00:00
Brian Gough	470d67a3aa	avoid exception in error message when project undefined	2018-03-01 12:31:51 +00:00
Brian Gough	cb35da3cf7	increment a project version number on every change in folder structure	2018-03-01 12:17:33 +00:00
James Allen	becb76d69b	Don't allow backslashes in file names	2018-03-01 11:42:44 +00:00
Paulo Reis	1b7d3917ed	Update Front chat widget according to latest config changes.	2018-02-21 14:58:00 +00:00
James Allen	0371aaaf05	Merge pull request #352 from sharelatex/hof-lock-metrics ... Improve lock metrics	2018-02-21 13:52:08 +00:00
Paulo Reis	12233a23c9	Avoid erroring if the front object is undefined.	2018-02-21 13:39:39 +00:00
Paulo Reis	978a8eae59	Move files around.	2018-02-21 13:39:39 +00:00
Paulo Reis	ef119402cf	Add Front chat widget.	2018-02-21 13:39:39 +00:00
Hayden Faulds	adc90b68e7	use gauge not inc	2018-02-21 13:25:25 +00:00
Shane Kilkelly	b19f7a6ea3	Re-add template id fields to Project model. ... The original pull request (/web-sharelatex-internal/pull/324) had to be reverted because of a failing test. This just re-adds the fields	2018-02-20 14:19:54 +00:00
Hayden Faulds	584cd71173	fix exceeded lock timeout logging ... we were logging this after failing to get the lock, this stops that	2018-02-20 14:03:45 +00:00
Hayden Faulds	d924dbd1ed	improve metrics	2018-02-20 13:58:09 +00:00
Shane Kilkelly	05faf06f59	Revert "Add template id fields to project model"	2018-02-20 13:51:30 +00:00
Shane Kilkelly	57d50a68f8	Merge pull request #324 from sharelatex/hob-add-template-fields-to-project ... Add template id fields to project model	2018-02-20 13:40:11 +00:00
Alasdair Smith	ff88b0adaf	Merge pull request #346 from sharelatex/as-fix-cursor ... Fix bug where cursor position wouldn't be saved when switching documents	2018-02-20 12:01:58 +00:00
Hayden Faulds	d750f942de	fix: stop pass milis not seconds into setTimeout	2018-02-20 10:26:24 +00:00
Hayden Faulds	e50c3837bc	add extra metrics around locking	2018-02-19 12:15:02 +00:00
Alasdair Smith	fafbbfef87	Fix bug where cursor position wouldn't be saved when switching documents ... This was caused by an underlying bug/poor optimisation where the aceEditor directive would be reconstructed every time when switching between documents. This wiped instances like CursorPositionManager which relies on keeping state between doc changes. Now the directive is only removed when switching between Ace and CM. This prevents other potential bugs and improves performance.	2018-02-19 11:45:00 +00:00
Hayden Faulds	dd582d1b2e	type-check ProjectGetter.getProject and getProjectWithoutLock arguments	2018-02-16 14:44:21 +00:00
Hayden Faulds	693c8e8c60	move where lock keys are defined	2018-02-16 14:44:21 +00:00
Hayden Faulds	a05d172052	clean up variable names in ProjectGetter.getProject	2018-02-16 14:44:21 +00:00
Hayden Faulds	66cd5cd24b	use ProjectGetter.getProject in other ProjectGetter methods	2018-02-16 14:44:21 +00:00
Hayden Faulds	95b82a3c9d	use ProjectGetter in ProjectLocator.findElementByPath	2018-02-16 14:44:21 +00:00
Hayden Faulds	cbc6fb232d	add mongo transaction lock when getting or updating projects	2018-02-16 14:44:21 +00:00
Brian Gough	fc1e94b14a	Merge pull request #343 from sharelatex/bg-block-javascript-property-names ... block javascript property names being used as file names	2018-02-16 14:07:12 +00:00
Hayden Faulds	eb198cd8c3	make getSafePathname a method in CompileController rather than Project	2018-02-16 13:10:48 +00:00
Hayden Faulds	5456f4224c	Merge pull request #339 from sharelatex/hof-project-getter ... use ProjectGetter rather than Project directly	2018-02-16 11:34:21 +00:00
Brian Gough	8a10e98b56	block javascript property names being used as file names	2018-02-16 10:31:47 +00:00