7896 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hugh O'Brien	3b766bf523	Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id ... Create projects with brand variation id	2018-10-16 11:17:09 +01:00
Hugh O'Brien	876663f94b	Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback ... Add affiliations on university domain confirmation	2018-10-16 11:17:01 +01:00
Simon Detheridge	8c1c3f4eb3	Merge pull request #1027 from sharelatex/revert-1022-spd-no-github-for-new-users ... Revert "Don't add old v1 features for new accounts"	2018-10-15 17:47:14 +01:00
Simon Detheridge	ec9c38df57	Revert "Don't add old v1 features for new accounts"	2018-10-15 17:46:48 +01:00
Simon Detheridge	85f097343f	Merge pull request #1022 from sharelatex/spd-no-github-for-new-users ... Don't add old v1 features for new accounts	2018-10-15 15:28:34 +01:00
Timothée Alby	c41fb5c9f4	Merge pull request #942 from sharelatex/pr-dismiss-email-confirmation ... Email confirmation notification UI fixes	2018-10-15 14:49:06 +02:00
Timothée Alby	684117fb63	Merge pull request #1025 from sharelatex/ta-user-membership-admin ... UserMembership Admin Access	2018-10-15 14:48:53 +02:00
Tim Alby	6f63cd7ca0	add notification to confirm unconfirmed emails	2018-10-15 14:47:16 +02:00
Tim Alby	e646c5c42a	refactor to use config file	2018-10-15 14:46:38 +02:00
Simon Detheridge	48995d2d44	Don't add old v1 features for new accounts ... Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features. Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts. bug: overleaf/sharelatex#1014	2018-10-12 17:45:57 +01:00
Jessica Lawshe	1256d29af9	Merge pull request #1020 from sharelatex/jel-wiki-tables ... Add class for table without borders	2018-10-12 08:55:51 -05:00
Alasdair Smith	f35ffc861f	Merge pull request #1014 from sharelatex/ns-allow-capital-letters-in-ref-commands ... allow capital letters in ref commands e.g. \Cref	2018-10-12 10:08:18 +01:00
Alasdair Smith	8fc04e8c6c	Merge pull request #1021 from sharelatex/as-addsearch ... Port AddSearch styles from v1	2018-10-12 10:08:08 +01:00
Alasdair Smith	518ae83e48	Override search result title to use sans-serif	2018-10-12 09:53:22 +01:00
Alasdair Smith	0f9b65be23	Fix spaces -> tabs in copy/pasted code	2018-10-12 09:52:51 +01:00
Hugh O'Brien	b825f0b267	Merge branch 'master' into hb-v2-affiliations-callback	2018-10-11 17:14:35 +01:00
Alasdair Smith	85912595e8	Port addsearch styles from v1	2018-10-11 12:13:51 +01:00
Timothée Alby	89590d5199	Merge pull request #1003 from sharelatex/cmg-split-screen-button ... Switch between pdf and editor with full-screen button	2018-10-11 10:54:53 +01:00
Timothée Alby	abd1331673	Merge pull request #1012 from sharelatex/ta-subscription-no-currency-fix ... Gracefully Handle Subscriptions Without Currency	2018-10-11 10:41:26 +01:00
Tim Alby	16db3a0806	gracefully handle subscriptions without currency	2018-10-11 10:38:48 +01:00
Alasdair Smith	e91ab3bf83	Merge pull request #1017 from sharelatex/as-fix-autocompile-loop ... Prevent autocompile loop	2018-10-11 10:30:39 +01:00
Alasdair Smith	96d7d83b90	Add guard against autocompile being disabled	2018-10-11 09:30:21 +01:00
Jessica Lawshe	a5eb6d0311	Add class for table without borders	2018-10-10 16:21:02 -05:00
Simon Detheridge	e4a3f838de	Merge pull request #1016 from sharelatex/spd-missing-translation ... Fix missing string in modals.pug	2018-10-10 17:33:54 +01:00
Simon Detheridge	e7506489d1	Fix missing string in modals.pug ... Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy. Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-10 15:06:37 +01:00
Alasdair Smith	9dd965da3c	Prevent autocompile loop ... If an autocompile hits a rate limit, it would get into a bad state where it would continuely loop making compile requests. This is because the compile response resolving would disable auto compile (because the rate limit was hit) but also trigger calculation of uncompiled changes, which would not check if autocompile was disabled. The fix is to just check if autocompile is disabled.	2018-10-10 15:04:18 +01:00
Paulo Reis	b0802380ae	Update tests	2018-10-10 14:09:47 +01:00
Paulo Reis	901fb0fc1e	Unit test brand variation id.	2018-10-10 14:09:47 +01:00
Paulo Reis	29787c42c5	Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates.	2018-10-10 14:09:47 +01:00
Paulo Reis	a380feab98	Add brand variation id to the Project model.	2018-10-10 14:09:47 +01:00
Simon Detheridge	ea2782ff22	Merge pull request #1005 from sharelatex/spd-no-more-asterisks ... Sanitize paths in all relevant ProjectEntityHandler methods	2018-10-10 10:44:13 +01:00
Alasdair Smith	250edf4670	Merge pull request #1010 from sharelatex/as-fix-no-sl ... Switch dev env to use v2 port instead of SL	2018-10-10 10:11:16 +01:00
Nate Stemen	3548f61615	allow capital letters in ref commands e.g. \Cref	2018-10-09 14:58:02 -04:00
Ersun Warncke	1b50f0ced8	Merge pull request #1011 from sharelatex/ew-add-account-merge-error ... add account merge error	2018-10-09 12:54:54 -04:00
Simon Detheridge	32149e652f	Handle 'invalid element name' error in project list ui ... When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user. Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog bug: overleaf/sharelatex#908 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-09 17:23:43 +01:00
Ersun Warncke	8719eff1d7	update error message	2018-10-09 11:44:59 -04:00
Ersun Warncke	7652e80800	add account merge error	2018-10-09 09:47:03 -04:00
Timothée Alby	914546d7d6	Merge pull request #983 from sharelatex/ta-user-ties ... Add Group Managers Management Page	2018-10-09 14:00:59 +01:00
Brian Gough	4efc118b9c	Merge pull request #1009 from sharelatex/bg-update-metrics-to-1.8.0 ... update to metrics v1.8.0 for metrics.globalGauge	2018-10-09 12:15:30 +01:00
Tim Alby	48e5c6b523	add UserMembership logic	2018-10-09 12:09:11 +01:00
Brian Gough	8c3b5acdd0	update to metrics v1.8.0 for metrics.globalGauge	2018-10-09 11:46:19 +01:00
Alasdair Smith	98d35b4e50	Use settings instead of hard-coding ports	2018-10-09 11:23:21 +01:00
Brian Gough	a68bde819d	Merge pull request #1004 from sharelatex/ta-test-mock-fix ... Fix Test Mock	2018-10-09 10:35:50 +01:00
Chrystal Griffiths	7ae39a0f84	Revert to ng-show	2018-10-09 10:30:24 +01:00
Chrystal Griffiths	849c5253c7	Avoid duplicating code	2018-10-08 17:50:10 +01:00
Jessica Lawshe	8f8765a412	Merge pull request #1008 from sharelatex/ta-fix-help-link ... fix link to link sharing help page	2018-10-08 16:09:31 +01:00
Tim Alby	cf47fc0b1c	fix link to link sharing help page	2018-10-08 16:07:11 +01:00
Jessica Lawshe	6c5cf571da	Merge pull request #1007 from sharelatex/jel-social-image ... Add default Twitter and OG images	2018-10-08 16:04:13 +01:00
Simon Detheridge	56dcbefb5b	Check for safe paths in all ProjectEntityHandler methods ... Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks. Added checks to all methods in ProjectEntityHandler that can create or rename a file. bug: overleaf/sharelatex#908 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-08 15:31:04 +01:00
Jessica Lawshe	d9c98aa45e	Add default Twitter and OG images	2018-10-08 15:18:18 +01:00