7909 commits

Author	SHA1	Message	Date
James Allen	5dbebc0693	Translate 'by'	2018-09-13 10:38:52 +01:00
James Allen	ab871b9ba7	Fix tabs vs spaces	2018-09-13 10:38:52 +01:00
James Allen	dd4b85b809	Combine v1 and v2 projects into item.pug	2018-09-13 10:38:52 +01:00
James Allen	225d30ffd2	Add missed lines from rebase	2018-09-13 10:38:52 +01:00
James Allen	c072961183	Update project-list list to a table and show last updated user	2018-09-13 10:38:52 +01:00
James Allen	ab10336110	Record last update time and user from project-history	2018-09-13 10:38:52 +01:00
Hugh O'Brien	24c479e984	Merge pull request #885 from sharelatex/hb-ip-matcher-notifications ... IP matcher affiliation CTA notifications	2018-09-13 08:59:25 +01:00
Jessica Lawshe	75a6b8f32b	Move custom tab styling to file ... Custom tab styling was nested within a portal class. This styling is also needed on the CMS pages.	2018-09-12 16:34:38 -05:00
Brian Gough	6d54e843e8	fix typo in Errors, only two underscores in __proto__	2018-09-12 10:45:50 +01:00
Jessica Lawshe	f7e4750df6	Merge pull request #903 from sharelatex/as-cursor-position-change-editor ... Store cursor & line position when switching editor	2018-09-11 10:44:24 -05:00
Jessica Lawshe	66e288864b	Wiki and CMS images height and width	2018-09-11 07:46:38 -05:00
Douglas Lovell	0ecda4e093	Display password change from in Account Settings	2018-09-10 14:53:33 -03:00
Ersun Warncke	7d3e17651f	set options and method for request, pass cookies and form body	2018-09-10 06:10:36 -04:00
Ersun Warncke	dd056e36ae	add overleaf method	2018-09-10 06:10:36 -04:00
Alasdair Smith	b6a4bb74f8	Store cursor & line position when switching editor ... When tearing down the source editor, we need to store the updated cursor position, so that the position can be moved to when opening the rich text editor.	2018-09-10 11:02:08 +01:00
hugh-obrien	1e04a09ec6	remove unnecessary error returns and ip fetching	2018-09-07 18:15:32 +01:00
Chrystal Griffiths	46eadfada4	Conditionally show sharing bits	2018-09-07 17:23:03 +01:00
Shane Kilkelly	eba14ee7d6	Merge pull request #874 from sharelatex/dcl-olsl760b ... Stylesheet for publish modal	2018-09-07 10:27:11 +01:00
Chrystal Griffiths	0d283f103a	Move remaining new styles to v2-templates	2018-09-06 15:21:19 +01:00
Chrystal Griffiths	f3c47320cf	Tidy up	2018-09-06 15:21:19 +01:00
Chrystal Griffiths	6c7301fb09	Templates detail page	2018-09-06 15:20:03 +01:00
Chrystal Maria Griffiths	59ae0efad7	Templates index page	2018-09-06 15:20:03 +01:00
Jessica Lawshe	aa2f6ad0dd	Merge pull request #880 from sharelatex/jel-v2-launch-plans ... Launch v2 Plans Page	2018-09-06 08:51:05 -05:00
Shane Kilkelly	3d369b725c	Add another confirmation checkbox to account-delete. ... This confirms the user understands they will lose both their OL v2 and SL accounts, and their projects.	2018-09-06 11:35:28 +01:00
hugh-obrien	8ef90a0dcb	move call for creating ip matched notifcation to project controller	2018-09-05 15:40:59 +01:00
Jessica Lawshe	c3c2e524f5	Add quotes	2018-09-05 08:14:32 -05:00
Jessica Lawshe	40a412b6b9	Remove plans message about v2 beta	2018-09-05 08:14:05 -05:00
Jessica Lawshe	65b2715e62	Remove unused layout for v2 plans	2018-09-05 08:14:05 -05:00
Jessica Lawshe	a4956294c1	Remove plans redirect	2018-09-05 08:14:05 -05:00
Shane Kilkelly	f0d17c1db7	Merge pull request #894 from sharelatex/as-fix-homepage-cta ... Fix height issue on homepage for smaller screens	2018-09-05 11:47:02 +01:00
Tim Alby	9ec60a128a	add userHasSubscriptionOrIsGroupMember alias	2018-09-05 11:37:37 +01:00
hugh-obrien	5605e1c5c3	update copy for ip match notifications	2018-09-05 11:22:26 +01:00
hugh-obrien	23e6292fd7	updating tests for ip matcher logic	2018-09-05 11:22:26 +01:00
hugh-obrien	f20d27986b	create ip match notifications without forcing replacement	2018-09-05 11:22:26 +01:00
hugh-obrien	d950e14b3f	use new routes and params from v1 ip matcher endpoint	2018-09-05 11:22:26 +01:00
hugh-obrien	bf2ea4e7b3	test against ip matcher for notification on login if different from previous ip	2018-09-05 11:22:26 +01:00
hugh-obrien	de83df2703	adding tests for ip matching notifications	2018-09-05 11:22:25 +01:00
hugh-obrien	38faa5c25e	correctly create and display ip matched affiliations	2018-09-05 11:22:25 +01:00
hugh-obrien	fa23ea75b8	Call university ip matcher api when checking notifications	2018-09-05 11:22:25 +01:00
James Allen	24f60bf791	Don't include the license name twice in invite emails	2018-09-05 11:05:38 +01:00
Alasdair Smith	455e682fac	Fix height issue on small screens	2018-09-05 11:00:30 +01:00
Shane Kilkelly	d432b6799f	Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix ... Don't Regard v1 Teams as Paid Subscriptions	2018-09-05 10:22:46 +01:00
Shane Kilkelly	81c845850e	Merge pull request #889 from sharelatex/sk-update-account-delete-wording-v1 ... Account-delete, clarify what happens to v1 account and projects	2018-09-05 10:22:32 +01:00
Christopher Hoskin	c3e64b12cf	Remove 'beta' from v2 welcome text	2018-09-04 15:11:27 +01:00
Shane Kilkelly	680654f7e7	Account-delete, clarify what happens to v1 account and projects	2018-09-04 13:31:22 +01:00
Douglas Lovell	15a54d8228	Style for label alignment on text area	2018-09-04 08:53:29 -03:00
Douglas Lovell	fa7f8ebfed	Styling tweaks to Gallery publish dialog	2018-09-04 07:22:58 -03:00
Ersun Warncke	e4e6a0fa1b	add new tag methods	2018-09-03 10:40:28 -04:00
Tim Alby	3324796086	don't regard v1 teams as paid subscriptions ... - use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember ` - remove `userHasV1SubscriptionOrTeam` - rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription` - rename some variables for clarity	2018-09-03 15:09:57 +01:00
James Allen	5025b54c9c	Merge pull request #887 from sharelatex/as-logout-of-v1 ... Extract logout to function, so different redirect can be called	2018-09-03 14:04:22 +01:00
Alasdair Smith	53bd2cfd33	Add error handling on logout	2018-09-03 11:46:36 +01:00
Alasdair Smith	6569e34873	Extract logout to function, so different redirect can be called	2018-09-03 11:01:14 +01:00
Douglas Lovell	1965967361	Use less vertical space in gallery publish modal	2018-09-03 06:51:15 -03:00
Shane Kilkelly	7be716e889	Merge pull request #879 from sharelatex/sk-handle-user-account-delete ... Sk handle user account delete	2018-09-03 10:41:49 +01:00
Shane Kilkelly	bafcf24cc9	Add missing column class to the change-password panel	2018-09-03 10:21:45 +01:00
Shane Kilkelly	1776482159	Update wording of the change-password instruction	2018-09-03 10:21:45 +01:00
Shane Kilkelly	0300ffbdc6	Bonus, add a link to the v1 settings page to change password	2018-09-03 10:21:45 +01:00
Shane Kilkelly	27a2e06d7b	Revert "Move the new logic to the externalAuthenticationSystemUsed function" ... This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.	2018-09-03 10:21:45 +01:00
Shane Kilkelly	40a500648c	Move the new logic to the externalAuthenticationSystemUsed function	2018-09-03 10:21:45 +01:00
Shane Kilkelly	be6720d805	Add a janky warning that this action will delete the account on v1 also.	2018-09-03 10:21:45 +01:00
Shane Kilkelly	9141f678b1	Show the account delete option on v2	2018-09-03 10:21:45 +01:00
Paulo Reis	07f884df70	Fix spell-checker menu going offscreen.	2018-09-03 09:42:37 +01:00
Paulo Reis	60cbc989e2	Add delete as an inline table action (only when viewing archived projects).	2018-09-02 15:14:45 +01:00
Paulo Reis	af4094a88c	Use CSS hashed paths when hot-swapping themes.	2018-09-02 14:44:15 +01:00
Paulo Reis	fbf98d89f2	Improve the collapsing behaviour of 'change' entries in track-changes.	2018-09-01 15:36:02 +01:00
Douglas Lovell	91e653dafc	Limit width and margin publish model form controls to the enclosing box	2018-08-31 18:36:53 -03:00
Douglas Lovell	c570daf03b	Remove unneeded include from ol-style	2018-08-31 18:36:19 -03:00
Douglas Lovell	1e31f5dc1c	Move new publish-model styles into existing style file	2018-08-31 15:35:24 -03:00
Douglas Lovell	92548be044	Use hyphen for underscore in publish-modal style	2018-08-31 14:16:43 -03:00
Douglas Lovell	404e768d24	Merge branch 'master' into dcl-olsl760b	2018-08-31 14:04:00 -03:00
Douglas Lovell	2b9e978379	Repair syntax and additional publish-modal style	2018-08-31 13:59:47 -03:00
Douglas Lovell	135d7e75a5	Merge branch 'master' into dcl-olsl760b	2018-08-31 13:24:22 -03:00
Paulo Reis	4ff7410391	Disable the review button when history is open.	2018-08-31 17:10:15 +01:00
Paulo Reis	b8f14873d2	Style buttons inside alerts (previously had the same colours for backgrounds).	2018-08-31 16:29:49 +01:00
Paulo Reis	f88a3815c6	Add loading spinner when cloning a project.	2018-08-31 16:14:20 +01:00
Paulo Reis	8ad9db3f02	Forcefully set trackchanges textareas background to white.	2018-08-31 15:45:33 +01:00
Paulo Reis	0c390d91a0	Avoid z-index issues with track-changes comments and the editor splitter.	2018-08-31 15:44:07 +01:00
Paulo Reis	7e5094f53d	Avoid z-index issues with the new project dropdown.	2018-08-31 15:37:22 +01:00
Paulo Reis	fc7b5bdd63	* Share button shown to all users, with a tooltip for non-admin; remove its id.	2018-08-31 15:33:56 +01:00
Timothée Alby	855840d89a	Merge pull request #883 from sharelatex/ta-domain-licence-join-fix ... Fix id Accessor in Domain Licence Join Page	2018-08-31 13:15:23 +02:00
Timothée Alby	012d341df6	Merge pull request #881 from sharelatex/ho-change-email-fire-forget ... change email: catch invalid emails and don't pass the error back on invalid requests	2018-08-31 13:15:16 +02:00
Timothée Alby	59b137e303	Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type ... Update university, role and department value as the user types.	2018-08-31 13:15:01 +02:00
Henry Oswald	245ad2a2a8	call changeEmail before the callback in setDefaultEmailAddress	2018-08-31 11:49:45 +01:00
Tim Alby	195ae49052	fix id accessor in domain licence join page	2018-08-31 11:41:28 +01:00
Henry Oswald	bab334aa44	fire and forget changeEmail in setDefaultEmailAddress ... prevents blocking/erroring the change email workflow	2018-08-31 11:16:28 +01:00
Henry Oswald	038b18a209	change email: catch invalid emails and don't pass the error back on invalid requests	2018-08-31 11:06:55 +01:00
Jessica Lawshe	dff29637b7	Move quotes to partial	2018-08-30 09:52:55 -05:00
Jessica Lawshe	bac90c0976	Move v2 plans redirect to router	2018-08-30 09:52:55 -05:00
Jessica Lawshe	ec710d0b1e	Add switch button styling	2018-08-30 09:52:55 -05:00
Jessica Lawshe	a87b5a629a	v2 plans style overrides and capitalize "Best Value"	2018-08-30 09:52:55 -05:00
Jessica Lawshe	eb8e279ac7	Add border styling	2018-08-30 09:52:55 -05:00
Jessica Lawshe	7d249f513b	Remove Positive SSL badge for v2	2018-08-30 09:52:55 -05:00
Jessica Lawshe	3a2c9a3830	Plans features table styling for v2	2018-08-30 09:52:55 -05:00
Jessica Lawshe	c1d37a712c	Update translations to use appName	2018-08-30 09:52:55 -05:00
Jessica Lawshe	bc89d8fb11	Add .nav-pills styling for v2	2018-08-30 09:52:55 -05:00
Jessica Lawshe	a2a98e0be1	Add @brand-secondary color	2018-08-30 09:52:55 -05:00
Jessica Lawshe	c920dc37d2	Update button classes for v2 ... Use `.btn-default` instead of `.btn-info`	2018-08-30 09:52:55 -05:00
Jessica Lawshe	26f2ff3d6f	Unlink instapages for v2 FAQ and add group contact modal ... group contact link: v2 opens contact portal and SL opens instapage	2018-08-30 09:52:50 -05:00
Jessica Lawshe	fe9709e5c7	Move style from winning test variant to main class ... `.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`. Also alphabetize CSS classes. Remove .more-details and extra .container from layout CSS statements for .more-details were moved to .plans	2018-08-30 09:36:35 -05:00
James Allen	52381c8fb7	Merge pull request #851 from sharelatex/jel-remove-a-b-test ... Remove Plans and Pricing A/B Test	2018-08-30 15:19:56 +01:00
Douglas Lovell	229626a368	Merge branch 'master' into dcl-olsl760b	2018-08-30 08:04:40 -03:00
Paulo Jorge Reis	cf075b0c42	Merge pull request #878 from sharelatex/ja-hide-bonus-in-v2 ... Don't suggest bonus page to v2 users	2018-08-30 11:29:41 +01:00
Paulo Jorge Reis	8b64f46807	Merge pull request #861 from sharelatex/ho-mailchimp-change-email ... catch newsletter email change error if user already exists on mailing list	2018-08-30 11:29:01 +01:00
Paulo Jorge Reis	10981f0b4e	Merge pull request #860 from sharelatex/ta-front-end-email-regex ... Change Email Regex in Affiliations Front-End	2018-08-30 11:28:38 +01:00
Paulo Jorge Reis	85ce1d1a11	Merge pull request #867 from sharelatex/pr-fix-togglers-with-v2-history ... Set a unique name attribute for the toggle switch directive.	2018-08-30 11:26:32 +01:00
Paulo Jorge Reis	4be364cd93	Merge pull request #864 from sharelatex/pr-history-restore-placeholder ... Add a placeholder "restore" button, showing a tooltip.	2018-08-30 11:25:25 +01:00
Paulo Jorge Reis	cb4d4145a1	Merge pull request #855 from sharelatex/pr-v2-light-theme ... v2 light theme	2018-08-30 11:24:52 +01:00
Paulo Jorge Reis	8b9397f80c	Merge pull request #863 from sharelatex/as-update-v1-import-modal ... Update project import modal to be more friendly near the launch	2018-08-30 11:24:44 +01:00
James Allen	b86ac31c63	Don't suggest bonus page to v2 users	2018-08-30 10:56:31 +01:00
Alasdair Smith	bc1f10a710	Merge pull request #868 from sharelatex/ho-mongo-health-checks ... added a /health_check/mongo endpoint	2018-08-30 09:52:20 +01:00
Jessica Lawshe	3a2400b212	Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links ... remove wufoo latex error response logging	2018-08-29 12:24:22 -05:00
Jessica Lawshe	ad55842c0a	Merge pull request #847 from sharelatex/ns-bye-typeform ... move typeform survey to google forms	2018-08-29 12:24:12 -05:00
Jessica Lawshe	cf8376f213	Merge pull request #840 from sharelatex/jel-blog-style ... Blog style	2018-08-29 12:24:04 -05:00
Jessica Lawshe	a5d84ecc0a	Merge pull request #842 from sharelatex/jel-portals-user-affiliation ... Add dashboard link mixin	2018-08-29 12:23:50 -05:00
Jessica Lawshe	1230750961	Merge pull request #865 from sharelatex/jel-sanitize-html ... Add default sanitize HTML options	2018-08-29 12:23:32 -05:00
Douglas Lovell	f38c637f31	Stylesheet for publish modal	2018-08-29 13:56:16 -03:00
Paulo Reis	79f1e7b0ee	Update ui-select value as the user types.	2018-08-29 17:31:47 +01:00
Ersun Warncke	9feb8ef39f	Revert "Merge pull request #843 from sharelatex/ew-collabratec" ... This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing changes made to a726537c4372641bfca0eb37fc130ca3a932d433.	2018-08-29 12:00:53 -04:00
Ersun Warncke	afc22dc5c2	Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy" ... This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.	2018-08-29 12:00:20 -04:00
Ersun Warncke	e7eefc0474	Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy ... set options and method for request, pass cookies and form body	2018-08-29 10:17:21 -04:00
Ersun Warncke	c1859f3e80	Merge pull request #843 from sharelatex/ew-collabratec	2018-08-29 10:17:02 -04:00
Henry Oswald	360618a7d3	added a /health_check/mongo endpoint	2018-08-29 11:24:01 +01:00
Alasdair Smith	4174b8edee	Update image and adjust size	2018-08-29 10:50:07 +01:00
Alasdair Smith	3dc437d932	More copy updates	2018-08-29 10:50:07 +01:00
Alasdair Smith	ff275e3425	Replace image and improve copy	2018-08-29 10:50:07 +01:00
Alasdair Smith	2e0d6ab305	Remove 2 step modal and make copy more friendly	2018-08-29 10:50:07 +01:00
James Allen	6a04800f70	Merge pull request #810 from sharelatex/ja-v2-templates ... Split out feature flags into publish and view templates	2018-08-29 10:27:23 +01:00
Paulo Reis	82aa7c30a6	Make sure each pair of radio buttons gets a unique name attribute in the toggle switch directive.	2018-08-29 10:20:40 +01:00
Shane Kilkelly	1848befcb7	Merge branch 'sk-flush-when-refreshing-linked-file'	2018-08-29 09:27:05 +01:00
Shane Kilkelly	6ee2a83885	Merge pull request #856 from sharelatex/ns-use-regex-test ... Use regex test instead of string match	2018-08-29 09:21:40 +01:00
Shane Kilkelly	b8ff6ae9a2	Merge pull request #862 from sharelatex/ta-increase-space ... Increase Spacing Between Buttons	2018-08-29 09:21:31 +01:00
Shane Kilkelly	2c782fee67	Merge pull request #858 from sharelatex/sk-update-v2-migration-banner ... Update the color and wording of the warning message shown on SL	2018-08-29 09:21:19 +01:00
Shane Kilkelly	6157db1964	Merge pull request #835 from sharelatex/sk-sanitize-system-messages ... Sanitize display of system messages.	2018-08-29 09:21:07 +01:00
Shane Kilkelly	33a4882bd3	Update the color and wording of the warning message shown on SL	2018-08-29 09:08:44 +01:00
Jessica Lawshe	98f98483ef	Add default sanitize options	2018-08-28 17:23:55 -05:00
Paulo Reis	0df5c61c44	Add a placeholder restore button, showing a tooltip.	2018-08-28 21:35:35 +01:00
Jessica Lawshe	70b19b2584	Remove unused plans style	2018-08-28 12:42:09 -05:00
Jessica Lawshe	e1fbef6910	Move style from winning test variant to main class ... `.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`. Also alphabetize CSS classes. Remove .more-details and extra .container from layout CSS statements for .more-details were moved to .plans	2018-08-28 12:42:09 -05:00
Jessica Lawshe	ae85bfafef	Move FAQ to partial	2018-08-28 12:42:09 -05:00
Jessica Lawshe	e5c3d72e1a	Move winning variant layout to main layout	2018-08-28 12:42:09 -05:00
Jessica Lawshe	8889f2aed2	Remove Plans and Pricing A/B Test ... Remove all layouts, analytics events, and scope related to the A/B test. The group modal from the default layout of the A/B test should be maintained though for v2.	2018-08-28 12:42:09 -05:00
Paulo Reis	f3a4c7f2ed	Remove debug line.	2018-08-28 17:08:46 +01:00
Tim Alby	204423696d	increase spacing between buttons	2018-08-28 17:34:49 +02:00
Paulo Reis	32ff66b0dd	Add two more font-size options to the editor.	2018-08-28 14:52:25 +01:00
Tim Alby	5821ac7e54	change email regex used in affiliations front-end ... Make it consistent with back-end regex	2018-08-28 15:37:20 +02:00
Henry Oswald	425017930a	catch newsletter email change error if user already exists on mailing list	2018-08-28 14:26:51 +01:00
Paulo Reis	76fcee721e	Update unit tests.	2018-08-28 14:24:05 +01:00
Paulo Reis	90b353298d	Switch themes at runtime.	2018-08-28 14:12:00 +01:00
Timothée Alby	107e8ce633	Merge pull request #859 from sharelatex/ho-mailchimp-change-email ... always set status_if_new	2018-08-28 14:44:59 +02:00
Henry Oswald	60b3e6777f	always set status_if_new	2018-08-28 13:34:53 +01:00
Timothée Alby	c2ef2326b9	Merge pull request #857 from sharelatex/ho-mailchimp-change-email ... add error handling for changing email in newsletter of user who has not subscribed	2018-08-28 14:03:44 +02:00
Timothée Alby	8057f4e74d	Merge pull request #849 from sharelatex/pr-fix-add-new-university ... Correctly invoke the function to add unknown universities.	2018-08-28 14:03:35 +02:00
Timothée Alby	946726c898	Merge pull request #853 from sharelatex/ta-institution-features-fix ... Check Institution Confirmation Status	2018-08-28 14:03:22 +02:00
Timothée Alby	c696ec2688	Merge pull request #854 from sharelatex/ta-affiliations-ui-improvements ... Affiliations UI Improvements	2018-08-28 14:03:08 +02:00
Henry Oswald	32749267b8	improve logging on change email in newsletter	2018-08-28 12:46:49 +01:00
Henry Oswald	423bc9312d	only set status and merge fields if required ... Not strictly nessaserry but it is a bit safer also improve error reporting for change email	2018-08-28 12:32:20 +01:00
Alasdair Smith	f5e34630f8	Merge pull request #806 from sharelatex/as-deprecated-sl-homepage ... Update homepage to deprecate SL	2018-08-28 11:02:03 +01:00
Henry Oswald	75521a4c86	add error handling for changing email in newsletter of user who has not subscribed	2018-08-28 10:47:33 +01:00
Paulo Reis	307a98851d	Nest the overall theme property under ace.	2018-08-28 10:10:16 +01:00
Nate Stemen	465b9aefc5	use match in one case and remove and operator	2018-08-27 16:48:44 -04:00
Nate Stemen	4d991aa176	Merge branch 'master' into ns-use-regex-test	2018-08-27 14:26:51 -04:00
Nate Stemen	ebea8a8633	use regex test instead of match when only bool needed	2018-08-27 14:25:01 -04:00
Paulo Reis	64c29787c0	Add i18n; update the review icon image.	2018-08-27 15:57:51 +01:00
Paulo Reis	efc926ffc5	Load theme as a user setting; allow the user to change it; update tests.	2018-08-27 15:25:00 +01:00
Tim Alby	ef37902dfc	check institution confirmation status	2018-08-27 15:45:31 +02:00
Paulo Reis	2fbcaebac7	More adjustments; style the dashboard.	2018-08-27 12:39:53 +01:00
Tim Alby	e19882455a	improve affiliation endorsement button ... - design as button instead of link - disable unless role and department are set	2018-08-27 11:32:48 +02:00
Tim Alby	7863561bff	display university licence in affiliations UI	2018-08-27 11:26:13 +02:00
Paulo Reis	4f6f459bfe	Remove debug code.	2018-08-24 15:35:52 +01:00
Paulo Reis	920c24cacb	Correctly invoke the function to add unknown universities.	2018-08-24 15:29:48 +01:00
Nate Stemen	c034b0654b	Merge branch 'master' into ns-remove-wufoo-log-links	2018-08-24 09:18:48 -04:00
Paulo Reis	2491bee38e	Merge branch 'master' into pr-v2-light-theme	2018-08-24 12:11:16 +01:00
Paulo Reis	e88b840da7	Update gitignore with the light theme generated CSS file.	2018-08-24 12:07:14 +01:00
Paulo Reis	d527249833	Style the editor.	2018-08-24 12:06:56 +01:00
Paulo Reis	7c95de29cd	Avoid breaking the page if isnt set.	2018-08-24 12:06:26 +01:00
Paulo Reis	128c825bbf	Create flag for light theme.	2018-08-24 12:05:37 +01:00
Alasdair Smith	1fb0471327	Don't default to having OL account in account checker	2018-08-24 10:57:03 +01:00
Alasdair Smith	59910320fe	Basic controller for account merge checker	2018-08-24 10:57:03 +01:00
Alasdair Smith	066d7293eb	Add margin above card on mobile view	2018-08-24 10:39:30 +01:00
Alasdair Smith	17ab35ab37	Increase margin between CTA and message	2018-08-24 10:23:47 +01:00
Alasdair Smith	f6cae39dcb	Adjust styling for updated copy	2018-08-24 10:23:47 +01:00
Alasdair Smith	6547c40c34	Style CTAs in new container and remove hr	2018-08-24 10:23:47 +01:00
Alasdair Smith	882ea46277	Add divider between deprecated text and features	2018-08-24 10:23:47 +01:00
Alasdair Smith	f60d565d2e	Updated styles for rearranged homepage	2018-08-24 10:23:47 +01:00
Alasdair Smith	0b507a541d	First pass at redoing the homepage for deprecating SL	2018-08-24 10:23:47 +01:00
Nate Stemen	c646c3e1ec	rename selector for learn more footer	2018-08-23 13:02:42 -04:00
Nate Stemen	6d00f38a71	move typeform survey to google forms	2018-08-23 12:34:13 -04:00
Nate Stemen	80c74ce07b	add back learn more link	2018-08-23 11:42:00 -04:00
Hugh O'Brien	29253c5a93	Merge branch 'master' into hb-fetch-licences-graph	2018-08-23 16:11:43 +01:00
hugh-obrien	bd721d52f4	review fixes and moving licences endpoint to module	2018-08-23 14:39:48 +01:00
Tim Alby	753fb02c05	always return an array when getting affiliations	2018-08-23 15:15:53 +02:00
Paulo Jorge Reis	d838f8778a	Merge pull request #832 from sharelatex/pr-change-free-history-limits ... Change history limits for free users	2018-08-23 14:02:08 +01:00
Jessica Lawshe	787f0fe239	Add dashboard link mixin	2018-08-22 16:35:06 -05:00
Nate Stemen	6d3b7cbe7b	remove wufoo latex log responses	2018-08-22 15:45:08 -04:00
Jessica Lawshe	68deee1073	More specific CSS selection and style <pre> ... More specific CSS selection r educes margin on other list items Better distinguish <pre> content on blog	2018-08-22 13:13:16 -05:00
Ersun Warncke	8f21ab7f10	add overleaf method	2018-08-22 13:44:40 -04:00
hugh-obrien	8d72fc78fc	send licences graph request to v1 for data instead of analytics	2018-08-22 18:31:29 +01:00
Henry Oswald	cfaa8444db	null check path when building a pdf download url ... if there is an error just the domain is currently returned, empty string is better for us	2018-08-22 16:45:59 +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
Henry Oswald	7a253e56ef	Download all log files from compiles.sharelatex.env (#833) ... * add a couple of missing buildPdfDownloadUrl * only download pdfs from compile server when streaming * use compiles.env for resonse files * update config to use clsi_lb	2018-08-21 09:24:48 +01:00
Paulo Reis	4dee3fd5e1	Update frontend unit tests.	2018-08-20 17:02:55 +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
Paulo Jorge Reis	4becf62fad	Merge pull request #827 from sharelatex/pr-fix-account-deletion ... Explicitly set the user default email for account deletion	2018-08-20 13:49:30 +01:00
Paulo Jorge Reis	96ad0f4aaf	Merge pull request #823 from sharelatex/pr-fix-review-icon-image ... Fix review icon for Overleaf.	2018-08-20 13:49:10 +01:00
Shane Kilkelly	034586b296	Flush source project to mongo before linked-file create/refresh	2018-08-20 12:19:59 +01:00
Paulo Reis	042c959d3a	Move default email checking logic into the data service.	2018-08-20 12:15:15 +01:00
Paulo Reis	47c51257bb	Explicitly set the user default email for the delete account modal controller.	2018-08-20 11:51:12 +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	5974afc2e3	Make sure that at least the last update (i.e. the current state) is shown to free users (even if it happened more than 24 hours ago), to allow labelling.	2018-08-17 16:17:53 +01: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
Paulo Reis	27823d3e06	Show history entries for the last 24 hours for free users.	2018-08-17 15:31:15 +01:00
Jessica Lawshe	356e31caec	Set variant when sixpack request successful	2018-08-17 09:07:34 -05: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
Paulo Reis	dfc25a093b	Fix review icon for Overleaf.	2018-08-16 16:28:02 +01:00
Paulo Jorge Reis	48655afb8b	Merge pull request #822 from sharelatex/ho-clsi-googlebackend ... download log files using buildPdfDownloadUrl	2018-08-16 15:06:31 +01:00
Henry Oswald	c33192b852	download log files using buildPdfDownloadUrl	2018-08-16 14:25:08 +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	713a39171a	Fix history frontend tests.	2018-08-16 13:44:48 +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	6b31268bfa	Scroll to selected history update when coming back from the labels view.	2018-08-14 15:27:07 +01:00
Brian Gough	791d395655	Merge pull request #812 from sharelatex/bg-allow-changing-texlive-image ... allow changing texlive image (connects to overleaf/sharelatex#756)	2018-08-14 15:00:08 +01:00
Paulo Reis	663ca275cb	Add i18n.	2018-08-13 17:09:18 +01:00
Tim Alby	4a65a526ce	require minilist package	2018-08-13 17:03:48 +02: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	c2828c8ca5	add unit tests	2018-08-13 10:53:43 +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	8f4fe5ec67	Merge pull request #805 from sharelatex/ns-autocomplete-w-escaped-percent ... autocomplete escaped % issue	2018-08-13 09:46:38 +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
Paulo Reis	035ff0a1f0	More bugfixing.	2018-08-10 15:57:10 +01:00
Paulo Reis	c13e0264e5	Fix a few bugs related to keeping the selection when moving from labels to full history.	2018-08-10 14:07:35 +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
Nate Stemen	e80b52509b	fix silly paren issue for index var	2018-08-09 08:53:49 -04: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	64a66aafd5	Protect against reading the project members list too soon.	2018-08-09 12:16:36 +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
James Allen	3546e842b0	Merge pull request #787 from sharelatex/ns-autocomplete-w-escaped-percent ... still trigger autocomplete if % is escaped	2018-08-09 10:50:17 +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	88f2b3670b	remove unneed style	2018-08-07 16:50:52 +01:00
Nate Stemen	c26a85c02c	get rid of confusing regex	2018-08-07 09:53:38 -04: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	05df55c89e	Add a unit test for the preDoPassportLogin module hook.	2018-08-03 16:10:50 +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
Brian Gough	a828298856	Merge pull request #795 from sharelatex/bg-make-plan-timeouts-compatible-with-v1 ... add script to increase paid compile timeouts to 240s (connects to overleaf/sharelatex#559)	2018-08-03 11:55:32 +01:00
Paulo Reis	80eeaaaaea	Update web acceptance tests.	2018-08-02 17:19:16 +01:00
Paulo Reis	f605e79fa5	Remove changes to robots.txt.	2018-08-02 16:33:45 +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	8c50e4e9ae	Add history label component.	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
Brian Gough	b9597358a9	lint fix	2018-08-02 14:14:23 +01:00
Brian Gough	d6ab6ce6ee	improve --all switch to remove fetch limit	2018-08-02 14:06:51 +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
Brian Gough	7c9c0fbf06	add --all option for increase_compile_timeouts script	2018-08-02 13:49:56 +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
James Allen	e89f24886c	Merge pull request #786 from sharelatex/hb-metrics-style-pass ... Metrics style pass	2018-08-01 11:43:11 +01:00
Brian Gough	05aedf1e09	add script to increase paid compile timeouts to 240s	2018-08-01 10:23:40 +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	395406407e	add test for export fetch zip	2018-07-30 19:39:35 +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
Nate Stemen	2dcd2339ed	still trigger autocomplete if % is escaped	2018-07-26 15:03:55 -04:00
hugh-obrien	4a22129aa0	add missing v1 metrics styling for graphs and updates	2018-07-26 17:01:47 +01:00
hugh-obrien	96a49a7fe6	cleaning up date range picker icons and buttons	2018-07-26 17:01:47 +01:00
Jessica Lawshe	c7941ac00e	Links mixins	2018-07-26 10:35:48 -05:00
Jessica Lawshe	d990ae1a1a	Style for portals	2018-07-26 10:35:41 -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	20cd723df2	Merge pull request #766 from sharelatex/ja-affiliations-ui-state ... Update affiliations UI to show specific errors for conflicting emails	2018-07-26 10:58:37 +01:00
James Allen	de6a790f3d	Merge pull request #780 from sharelatex/ns-autocompile-w-syntax-error ... dont stop compiling if user has turned off syntax validation	2018-07-24 10:06:03 +01:00
James Allen	c7c75af568	Merge pull request #778 from sharelatex/as-configure-mathjax ... Configure mathjax globally	2018-07-24 10:05:12 +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
Alasdair Smith	9af906b7dc	Copy across some mathjax config from v1, seems to fix artefacts in rendering	2018-07-23 17:11:55 +01:00
Nate Stemen	8d83da2535	add check to make sure user hasnt turned of syntax validation before stopping autocompile	2018-07-23 12:07:05 -04: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
Alasdair Smith	db518e16aa	Don't set config unless needed in directive ... Updates mathjax directive to only set config if it is needed. The main config is now set in base.coffee so isn't needed	2018-07-23 15:32:17 +01:00
Alasdair Smith	99e24db075	Move MathJax config to base so it is always run ... This prevents an issue where using MathJax would not be configured correctly unless using the mathjax directive.	2018-07-23 15:30:58 +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
Hugh O'Brien	37a7d24d77	Merge pull request #773 from sharelatex/hb-submit-button-wrap ... Fixing button wrapping in the publish modal	2018-07-19 11:40:07 +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
Shane Kilkelly	c423672b55	Unit test for finishLogin	2018-07-18 12:08:34 +01:00
Shane Kilkelly	943bfe98aa	Unit test for _loginAsyncHandlers	2018-07-18 11:13:42 +01:00
hugh-obrien	ef0532a54b	replace wrapping button with new class name	2018-07-18 10:47:39 +01:00
Shane Kilkelly	dae9506f84	Un-break unit tests	2018-07-18 09:57:05 +01:00
hugh-obrien	00bf50906d	fixing button wrapping in the publish modal	2018-07-18 09:54:52 +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	823e12e4a8	Fix tests to add new Features dependency	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	85313f1b5a	Check if rich text is enabled before using stored mode	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	fff8e37bc7	Merge pull request #772 from sharelatex/as-fix-review-panel-style ... Fix rich text toolbar throwing off track changes underlines	2018-07-18 08:43:11 +01:00
Alasdair Smith	1e7911adaf	Merge pull request #767 from sharelatex/as-fix-rt-delete-itemize ... Fix left padding on empty nested list environments	2018-07-18 08:43:01 +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	b9a63fe216	Merge pull request #768 from sharelatex/jel-mathjax-wiki ... Add MathJax to wiki pages and max-width for images	2018-07-17 09:37:28 -05:00
Jessica Lawshe	fa2f703c44	Define CMS module controller	2018-07-17 09:36:21 -05:00
Jessica Lawshe	6c9403df0f	Merge pull request #758 from sharelatex/jel-mathjax-delimiter ... Optional $ MathJax delimiter	2018-07-17 09:32:43 -05: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
Jessica Lawshe	83b3904fca	Set max-width on Wiki images ... Fixes images expanding outside of parent container	2018-07-17 09:10:03 -05:00
Jessica Lawshe	ddca090cd7	Add Wiki controller with MathJax directive	2018-07-17 09:09:07 -05:00
Alasdair Smith	8f4c5d6122	Fix left padding on empty nested list environments	2018-07-17 11:53:42 +01:00
James Allen	c2777918fa	Add some missing unit test mocks	2018-07-17 11:26:07 +01: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
James Allen	1bb266c6dc	Merge pull request #760 from sharelatex/as-fix-rt-indent ... Fix list envs not indented correctly	2018-07-16 15:18:10 +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
Alberto Fernández Capel	ae440f2ee6	Better variable name in test ... It should be a subscription id, instead of an admin id. The test passes anyway because the db calls are mocked, but the wrong variable name can cause confusion.	2018-07-16 14:40:53 +01:00
James Allen	d0f77abc70	Update email in v1 when setting default in v2	2018-07-16 13:26:52 +01:00
Alasdair Smith	ea2a229050	Add line padding to indented padding ... Fixes bug where itemize and enumerate envs weren't correctly indented	2018-07-16 11:28:53 +01:00
Alberto Fernández-Capel	f08b64eeac	Merge pull request #757 from sharelatex/as-rt-styling ... Rich text styling	2018-07-16 10:10:49 +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
Jessica Lawshe	120acf4918	Optional $ MathJax delimiter	2018-07-13 15:02:52 -05:00
Alasdair Smith	5013d13587	Reduce box-shadow slightly to look better with horizontal padding	2018-07-13 16:30:42 +01:00
Alasdair Smith	304eac3024	Deemphasise line numbers in rich text	2018-07-13 15:57:43 +01:00
Alasdair Smith	4d611ca399	Add horizontal padding to RT lines ... This is to emulate a manusript better	2018-07-13 15:57:18 +01:00
Alasdair Smith	f95fb38056	Switch to serif font for rich text ... Makes rich text ressemble a manuscript more closely	2018-07-13 15:13:22 +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
Alasdair Smith	ca31914719	Merge pull request #754 from sharelatex/as-fix-missing-key-binds ... Add event to trigger syncToPdf so can be triggered by key bind	2018-07-13 11:17:17 +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
Alasdair Smith	5eb2410f5d	Add event to trigger syncToPdf so can be triggered by key bind	2018-07-13 09:18:28 +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	67e2f6f942	Better handling of affiliation change submission.	2018-07-12 16:37:09 +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	a64910d409	Make sure to specify which email to set as default.	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
Paulo Reis	3517db8348	SL styling adjustments.	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
Hayden Faulds	71351476f7	Merge pull request #743 from sharelatex/hof-github-jenkins ... Update github commit status in Jenkins pipeline	2018-07-12 16:18:39 +01:00
Hayden Faulds	99ec132a1f	update commit statuses in Jenkins pipeline	2018-07-12 15:40:42 +01:00
Alasdair Smith	2100633ea1	Merge pull request #748 from sharelatex/as-rt-review-panel-warning ... Show warning in review panel when using rich text mode	2018-07-12 11:30:29 +01:00
Alasdair Smith	ba6560ce04	Fix bug where loading panel was showing over toolbar	2018-07-12 11:18:09 +01:00
Alasdair Smith	d33c7f0149	Use string key to initialise editor mode instead of boolean	2018-07-12 10:55:27 +01:00
Alasdair Smith	25b995d3b8	Initialise editor mode from localStorage	2018-07-12 10:55:27 +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	3806d2bda7	Add right margin to toolbar if review panel open ... This fixes bug where the toolbar would be measured incorrectly if the review panel was open	2018-07-11 15:15:23 +01:00
Alasdair Smith	b1a47ddae4	Improve copy	2018-07-11 15:15:22 +01:00
Alasdair Smith	b4dd047371	Fix unnecessary right marging being applied to review panel when rich text is open	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
Hayden Faulds	5616a91a9b	strip whitespace	2018-07-11 13:58:18 +01:00
Tim Alby	35cb3924e2	refresh features after confirming email	2018-07-11 14:57:35 +02:00
Alberto Fernández-Capel	27ef84eb1e	Merge pull request #741 from sharelatex/ja-speed-up-acceptance-tests ... Speed up acceptance tests and run tests in parallel in CI	2018-07-11 13:50:07 +01: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	3586fe8406	Update var name	2018-07-11 11:50:14 +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
Timothée Alby	05bc4cc9e9	Merge pull request #729 from sharelatex/as-cursor-position ... Abstract cursor position tracking so that it is not bound to Ace	2018-07-11 10:21:42 +02:00
Timothée Alby	0f7c0de05d	Merge pull request #738 from sharelatex/as-fix-memory-leak ... Fix memory leak setting up spell check	2018-07-11 10:21:26 +02:00
Tim Alby	791dc0df5b	check institution features on features update	2018-07-10 17:53:37 +02:00
James Allen	dc724eae92	Try with parallel tests	2018-07-10 16:42:52 +01:00
James Allen	ba17c1da14	Cache pug templates and modules, by using production environment	2018-07-10 16:15:50 +01:00
Alasdair Smith	5806101bd0	Trigger events instead of calling cursor manager ... This improves readability and prevents race conditions in compat between Ace/CM	2018-07-10 16:05:01 +01:00
Alasdair Smith	da77c06774	Refactor saving cursor position to not use Ace event ... This is will help with triggering CM correctly	2018-07-10 16:05:01 +01:00
Alasdair Smith	ba9fa9a0be	Store first visible line instead of scrollTop ... scrollTop is affected by changing viewport size and switching between Ace and CM	2018-07-10 16:05:01 +01:00
Alasdair Smith	6c7e942470	Unbind unload listener when destroying editor	2018-07-10 16:05:01 +01:00
Alasdair Smith	e5ad2a8724	Abstract Ace-specific code to adapter	2018-07-10 16:05:01 +01:00
Paulo Reis	418d7d515a	Add light theme root file; add light theme variables file.	2018-07-10 13:14:58 +01:00
Alasdair Smith	2dc509f43d	Fix memory leak setting up spell check ... Switching docs would set up event listeners on Ace without tearing down any old listeners, which could lead to a memory leak. This tears down old listeners when detaching from the "old" doc	2018-07-10 12:25:13 +01:00
James Allen	91079f3af2	Fix unit tests	2018-07-10 11:32:19 +01: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
Hayden Faulds	158cb58e29	Merge pull request #734 from sharelatex/sk-handle-403-linked-files ... When refreshing or creating linked files, exempt from 403-error-catcher	2018-07-06 15:09:28 +01:00
Shane Kilkelly	b6880550d5	When refreshing or creating linked files, exempt from 403-error-catcher	2018-07-06 11:29:21 +01:00
James Allen	2ba78179f5	fix linting	2018-07-06 11:17:57 +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	2016be6be4	Merge pull request #691 from sharelatex/ja-resync-subscriptions-script ... Add script that refreshes all v1 users' features in v2	2018-07-06 11:06:23 +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
James Allen	a54a69159a	Revert "Add in option to sync all users" - too dangerous! ... This reverts commit 218e042aba6784f32777f496e1706300845c3f44.	2018-07-06 09:07:55 +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
Hugh O'Brien	3a33fef42c	Merge pull request #722 from sharelatex/hb-publish-layout-updates ... Add border-radius to overbox on submit modal	2018-07-05 12:12:15 +01:00
Alasdair Smith	b2abcfc3f2	Extract debounced load to service, so can be injected	2018-07-04 15:14:29 +01:00
Alasdair Smith	1f9c1ca6c6	Extracts envs to separate file so they can be exported to rich text	2018-07-04 15:14:29 +01:00
Alasdair Smith	33742d447d	Move top hundred snippets to snippets directory ... Allows for more snippets in future. Also makes file name consistent	2018-07-04 15:14:29 +01:00
Alasdair Smith	88dd233624	Add stylesheet for CodeMirror autocomplete	2018-07-04 15:14:29 +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	e22d2c8da7	Merge pull request #721 from sharelatex/as-rt-search ... Add CodeMirror search styles	2018-07-03 13:39:47 +01: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
Alasdair Smith	1db937cd50	Merge pull request #714 from sharelatex/as-line-nos ... Add rich text line numbers	2018-07-03 11:11:17 +01:00
Michael Mazour	235534d269	Also include user's v1 ID in export requests	2018-07-03 10:15:51 +01:00
hugh-obrien	a39bcdb0f0	add border-radius to overbox on submit modal	2018-07-02 17:30:17 +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
Paulo Reis	80b7641652	Update UserEmails acceptance tests to use the new POST-based email deletion endpoint.	2018-07-02 12:31:36 +01:00
Alasdair Smith	04a98c4d91	Merge pull request #697 from sharelatex/pr-user-affilitations ... User affiliations	2018-07-02 11:36:04 +01:00
Alasdair Smith	cf2aa76fcb	Merge pull request #712 from sharelatex/as-fix-shrinkwrap ... Fix missing packages in shrinkwrap	2018-07-02 11:35:37 +01:00
Alasdair Smith	ec1dbc47bf	Merge pull request #703 from sharelatex/as-cm-pos-assertion ... Add assertion method for CodeMirror Pos objects	2018-07-02 11:35:26 +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
Douglas Lovell	20835a79e2	Repair not logged in subscription controller test	2018-06-29 19:36:40 -03:00
Alasdair Smith	673e9155ba	Add CodeMirror search styles	2018-06-29 15:33:50 +01: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
Alasdair Smith	ae26237c2b	Fix styling for line numbers ... Need to use .CodeMirror to override specificity of CM styles. This should mean that CM styles use serifed font not monospaced	2018-06-28 17:04:26 +01:00
Paulo Reis	2e46111b4b	Add explanation about using template cache directly.	2018-06-28 17:02:04 +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
Alasdair Smith	cb2c470325	Fix missing packages in shrinkwrap	2018-06-28 15:19:19 +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
Alberto Fernández Capel	4366a0ea2c	Remove trailing whitespace	2018-06-28 11:08:20 +01:00
Tim Alby	8c70ba88b7	Add missing greater-than character in tests	2018-06-28 10:15:55 +02:00
Jessica Lawshe	49cf2a8dee	Use the MathJax Safe.js extension to prevent XSS	2018-06-27 17:57:07 -05:00
Jessica Lawshe	a739348146	Move MathJax directive to a shared directory ... MathJax parsing now on learn pages, and soon to be on the blog, so move out of the `ide/chat` directive.	2018-06-27 17:46:35 -05:00
Jessica Lawshe	3e8168d32f	Remove MathJax dependency injection	2018-06-27 17:31:11 -05: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
Paulo Reis	82392978a7	Improve input suggestions template readability.	2018-06-27 13:47:49 +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	8b8742d60f	Fix ReferalFeatures tests	2018-06-27 12:28:22 +01:00
Paulo Reis	522084a504	Add Keys enum; use it when detecting keystrokes in the input suggestions component.	2018-06-27 12:21:26 +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
Alasdair Smith	3a90a2d004	Add custom assertion method to chai for comparing CM Pos objects	2018-06-27 11:28:29 +01:00
Tim Alby	bebbc433bf	proxy static institutions URLs in dev env	2018-06-27 09:59:55 +02:00
Tim Alby	60009c6346	fix delete endpoint	2018-06-26 19:50:12 +02:00
Paulo Reis	3e0ad47873	Avoid suggesting blacklisted emails as university domains.	2018-06-26 16:50:55 +01:00
Paulo Reis	76d8ab11e5	Make sure we infer the university when the user finishes typing his email.	2018-06-26 16:18:53 +01: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	6838904d65	Add in option to sync all users	2018-06-26 11:30:27 +01:00
James Allen	156c417df0	Don't consider current features when assignin bonus	2018-06-26 11:26:07 +01:00
James Allen	de519f545f	Add in check to see if user was out of sync	2018-06-26 11:07:13 +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
James Allen	3a8b5d23d8	Merge pull request #696 from sharelatex/ja-fix-right-click-new-file ... Fix right click new and upload file options	2018-06-25 16:10:15 +01:00
James Allen	80d7c39044	Fix right click new and upload file options	2018-06-25 15:01:27 +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	c81f9c24ed	mock affiliations API in acceptance tests	2018-06-25 13:45:46 +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	f7a1ded6e1	More general class and visible preview	2018-06-22 13:42:08 -05: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	76de9c05f2	Merge pull request #688 from sharelatex/ja-fix-upgrade-prompt-contrast ... Set font colour at entire side bar level	2018-06-22 16:00:05 +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	89d5605874	Add script that refreshes all v1 users' features in v2	2018-06-22 15:33:02 +01:00
Nate Stemen	ab159a5169	Merge remote-tracking branch 'origin' into ns-dropdown-on-completion	2018-06-22 10:25:18 -04:00
Nate Stemen	e9f8cceabb	fix syntax error	2018-06-22 10:23:33 -04:00
James Allen	c004cdb200	Remove hardcoded ShareLaTeX reference in upgrade blurb	2018-06-22 14:24:41 +01:00
James Allen	9194e25742	Set font colour at entire side bar level	2018-06-22 14:23:43 +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	a8222f2e31	Fix tests after sync with master	2018-06-22 13:20:13 +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	54cdbd738c	If selecting 'output.pdf', set the filename to project-name.pdf	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	28257462ae	Acceptance tests for project-output-file	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	2cfc2b4738	Only show output files which are images or pdfs	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	2da1d57948	Clean up logging	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	fadbd72837	Add unit test for copying project with linked files	2018-06-22 10:52:49 +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	de45c08585	Restrict token look ups by id to not conflict with other tests	2018-06-21 11:00:25 +01:00
James Allen	c07ce3bd89	Merge pull request #675 from sharelatex/ja-fail-on-acceptance-tests ... Bail out with exit code on acceptance test failure	2018-06-21 10:28:41 +01: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
Henry Oswald	5a7b8f4887	fix broken test for compile controller	2018-06-20 13:44:07 +01:00
Paulo Reis	917776aede	Change the UI to gradually show needed fields for affiliations.	2018-06-20 11:37:55 +01:00
Paulo Reis	f3806faeb2	Make git ignore compiled Coffeescript Angular components.	2018-06-20 11:37:34 +01:00
Alasdair Smith	6c1994e25b	Stub errors in tests to cache	2018-06-20 11:19:23 +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
Paulo Reis	82f359e735	Support more input configuration attributes in the input suggestions component.	2018-06-19 17:10:02 +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
Henry Oswald	ab0f258c03	don't make request to google cloud clsi if there is no url	2018-06-19 14:22:34 +01:00
James Allen	99728d8f18	Bail out with exit code on acceptance test failure	2018-06-19 13:56:34 +01: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	0c86a7dc9b	Revert "Simplify package metadata check"	2018-06-19 08:43:27 +01:00
James Allen	b5e976f8a7	Merge pull request #663 from sharelatex/as-simplify-metadata-check ... Simplify package metadata check	2018-06-19 08:38:03 +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
Nate Stemen	e7038f0a57	remove trailing } for all commands rather than relying on Helpers module	2018-06-18 15:08:25 -04:00
Tim Alby	3d272ca297	replace OldAssetProxy	2018-06-18 18:37:58 +02:00
Nate Stemen	9f309e22a7	refactor AutoCompleteManager	2018-06-18 12:26:45 -04:00
Alberto Fernández Capel	81c102b501	Add method to import invites	2018-06-18 14:48:27 +01:00
Alasdair Smith	f9c074a31e	Simplify check for when we are editing lines with metadata commands	2018-06-18 10:52:27 +01:00
Jessica Lawshe	fe225fbbd3	Include event label when features table viewed	2018-06-15 16:29:42 -05:00
Jessica Lawshe	3de1721aa2	Send event to Google Analytics when variant selected	2018-06-15 16:11:45 -05:00
Nate Stemen	b1c0552214	add ref command to snippets	2018-06-15 16:59:35 -04:00
Nate Stemen	4b1bc291cb	misspelled variable completionAfterCursor	2018-06-15 10:31:51 -04:00
Nate Stemen	b8787e6e68	modify dropdown to trigger on command completion if possible	2018-06-15 08:56:03 -04:00
Paulo Reis	3ddb8d0bef	Add affiliations UI.	2018-06-15 11:33:47 +01:00
Paulo Reis	5ada231d15	Add basic affiliations styles, data services and controller.	2018-06-15 11:33:47 +01:00
Paulo Reis	a8cb126c4b	Add UI Select (enhanced select boxes) components.	2018-06-15 11:33:47 +01:00
Paulo Reis	1df8c044ee	Add component for auto-completing inputs.	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
Timothée Alby	3374aa6c9d	Merge pull request #660 from sharelatex/ja-no-legacy-nodemon ... Don't use the legacy watch option in nodemon	2018-06-14 13:58:38 +02:00
James Allen	dc3fea74f9	Don't use the legacy watch option in nodemon	2018-06-14 10:41:18 +01:00
James Allen	32e14527c6	Make links readable in v2 alerts	2018-06-14 10:31:06 +01: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	45fbcfecb3	Merge pull request #659 from sharelatex/ja-fix-subscription-dash ... Add null check to subscription dash	2018-06-14 09:11:45 +01:00
James Allen	c60b74a2b1	Merge pull request #652 from sharelatex/ja-fix-front-end-test ... Fix frontend HistoryV2ManagerTests	2018-06-14 09:11:32 +01:00
James Allen	e162ff6256	Merge pull request #654 from sharelatex/ja-explain-error-on-crash ... Explain error if web crashes in acceptance tests	2018-06-14 09:09:26 +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	406bf1f5fc	Don't set pdfDownloadDomain by default	2018-06-13 11:23:33 +01:00
James Allen	76d10e6402	Improve error message readability	2018-06-13 10:40:36 +01:00
Henry Oswald	02110064f7	Merge branch 'master' into ho-clsi-domain	2018-06-13 10:32:51 +01:00
James Allen	f57290382d	Explain error if web crashes in acceptance tests	2018-06-13 10:11:38 +01:00
Shane Kilkelly	3baf0836bc	Support project-linked-files originating from imported v1 projects	2018-06-13 10:02:54 +01:00
Jessica Lawshe	baa321fa1a	Merge pull request #628 from sharelatex/ns-only-one-doc-env ... only suggest one document environment per project	2018-06-12 08:44:14 -05: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	6e2ec2f982	Update remaining unit tests	2018-06-12 13:52:47 +01:00
James Allen	28f51cd4b4	Update SubscriptionController unit tests	2018-06-12 13:52:47 +01:00
James Allen	606419476f	Update LimitationsManager unit tests	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	d4efdb3ede	Fix frontend HistoryV2ManagerTests	2018-06-11 15:47: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
Alasdair Smith	c53ff0fa84	Merge pull request #618 from sharelatex/as-toolbar-btns ... Rich text toolbar styles	2018-06-08 10:09:27 +01:00
Alberto Fernández Capel	c45b4463bb	Fix unit test	2018-06-08 10:05:26 +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	6c92238f37	Fix analytics event label for when shouldABTestPlans: false	2018-06-07 10:30:21 -05: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