6174 commits

Author	SHA1	Message	Date
Ersun Warncke	8cc9bc5335	write to v1/v2 on register, password change and reset ... GitOrigin-RevId: 29045912319d1d387613ec55c6620852d8857614	2019-06-19 11:06:21 +00:00
Alasdair Smith	f83ab4ec3b	Merge pull request #1767 from overleaf/as-color-contrast ... Improve colour contrast GitOrigin-RevId: 56796839e5c2e741e85bc849399cb28d3db36976	2019-06-19 09:01:43 +00:00
Simon Detheridge	ab5b1b6dc4	Merge pull request #1870 from overleaf/spd-invalid-intent-sso ... Fix invalid intent errors when logging in with OAuth GitOrigin-RevId: 20f88a24080b41256bd31b9fb55b68a872ded56b	2019-06-18 15:48:29 +00:00
Simon Detheridge	93386bcb8c	Merge pull request #1859 from overleaf/spd-sl-user-password-copy ... Copy old SL hashed passwords to a new field GitOrigin-RevId: 28e7ff57e8753a1e887c54e9ed63cb17984e2fd4	2019-06-18 08:46:14 +00:00
Simon Detheridge	08861187d5	Merge pull request #1834 from overleaf/ns-sd-synctex-fail-gooder ... display warning if synctex fails to return filename GitOrigin-RevId: 1de5f9f06a03d6debc35cd4bace6cc921a634d6d	2019-06-17 15:14:31 +00:00
Simon Detheridge	82672269c4	Merge pull request #1862 from overleaf/em-json-stringify ... Globally apply StringHelper.stringifyJsonForScript() GitOrigin-RevId: 82dc812a43a1e6f389471380a6a430c0a18dcec2	2019-06-17 15:14:25 +00:00
Simon Detheridge	d189dad162	Merge pull request #1865 from overleaf/ta-group-invite-self-view ... Return User Data when Inviting Self in Group GitOrigin-RevId: 5aeb9f0b21b84184a612ed730ac08dcb1c434f6e	2019-06-17 15:14:11 +00:00
Brian Gough	4134c32f8d	Merge pull request #1861 from overleaf/bg-check-existing-import ... check if project already imported GitOrigin-RevId: 6dbca42fd524c34bb79a86b7449fe6ed3d542b43	2019-06-13 08:47:58 +00:00
Brian Gough	c242a8d4c1	Merge pull request #1853 from overleaf/bg-check-doc-hashes-staged-rollout ... enable sharejs hash checking GitOrigin-RevId: 2c71d239b2f5ee2bee6baf03dd54aaa8afc6fae7	2019-06-13 08:47:52 +00:00
Timothée Alby	4583c25b1b	Merge pull request #1843 from overleaf/ta-limit-affiliation-rate ... Limit the Number of Affiliations Created Simultaneously GitOrigin-RevId: 242d3f3a2859eb2114f43091e7ca52534b282396	2019-06-11 13:34:18 +00:00
Timothée Alby	e659703745	Merge pull request #1842 from overleaf/ta-remove-v1-sync ... Remove v1 Sync on Features Refresh GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f	2019-06-11 13:34:11 +00:00
Timothée Alby	8caea13193	Merge pull request #1845 from overleaf/ta-invite-self ... Don't Send Invite when Group Manager Invite Self GitOrigin-RevId: 35d7aecc82cf1124fbdac7fe986081b9556c23f9	2019-06-11 13:34:00 +00:00
Timothée Alby	f6c2cfe727	Merge pull request #1848 from overleaf/sk-increase-compile-timeout-hard-limit-10 ... Increase compile socket timeout to 10 minutes GitOrigin-RevId: 93712c493c67bf54022df43175d331557b7cf49a	2019-06-11 13:33:53 +00:00
Ersun Warncke	48b5c7e209	do not log warning in dev/tests (#1830) ... do not log warning in dev/tests GitOrigin-RevId: c46664779fe939ad0f39466f43eb24381a245b55	2019-06-06 13:01:45 +00:00
Ersun Warncke	35138e6763	remove v1 oauth (#1846) ... remove oauth token v1 fallback GitOrigin-RevId: 621e75024d8ae877c821b9bfed9b2a19fdbbf9f7	2019-06-06 13:01:38 +00:00
Eric Mc Sween	15db8d3711	Merge pull request #1828 from overleaf/msm-fix-zip-upload-ignored-extensions-js ... Fixes files with full name equals to an ignored extension being ignored (JS version) GitOrigin-RevId: 94d84c2b3e6c7e7219397b0a982117f9c88bcf5d	2019-06-05 16:19:31 +00:00
Eric Mc Sween	5d2d7b894a	Merge pull request #1833 from overleaf/em-edit-subscription-admin ... Change admin button in subscription admin page GitOrigin-RevId: d446f54299578c3806ef7146d2163ec24e831b6d	2019-06-05 16:19:26 +00:00
Timothée Alby	a8edafe104	Merge pull request #1825 from overleaf/ta-institutions-staff-hub ... Create Institutions Staff Hub GitOrigin-RevId: 6926406951796d2e7dd0903c3d3c4dae87545390	2019-06-04 11:24:02 +00:00
Timothée Alby	14cbeef31d	Merge pull request #1806 from overleaf/ta-use-billing-name ... Use Billing Name when Creating Subscription GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2	2019-06-04 11:23:55 +00:00
Timothée Alby	2deac5f3a1	Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder ... Don't Build Recurly XML Requests Manually GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860	2019-06-04 11:23:49 +00:00
Timothée Alby	8330c6ae61	Merge pull request #1835 from overleaf/hb-analytics-template-ids ... Set template ids on cloned projects on creation GitOrigin-RevId: 6b7ef72d148774c3d5ea7b65cde0e6a8fdfa2ceb	2019-06-04 11:23:37 +00:00
nate stemen	642081dd17	Merge pull request #1802 from overleaf/jel-oauth-hide-when-not-linked ... OAuth provider check and capitalize button text GitOrigin-RevId: afa2e8301d5141da178d88304932c5736d8632c4	2019-06-03 18:32:13 +00:00
Alasdair Smith	0ca81de78c	Merge pull request #1717 from overleaf/as-decaffeinate-backend ... Decaffeinate backend GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa	2019-05-29 09:32:21 +00:00
Hugh O'Brien	d4eb71b525	Merge pull request #1788 from overleaf/ta-ensure-can-delete-account ... Prevent Subscription Owner from Deleting their Account GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0	2019-05-28 15:51:27 +00:00
Hugh O'Brien	29408b301c	Merge pull request #1750 from overleaf/cmg-project-metadata ... Preserve project metadata when deleting GitOrigin-RevId: 38efb139406d6111f5b6186d82c3fbfb5ab9b2b9	2019-05-28 15:51:21 +00:00
Alasdair Smith	b84c24520c	Merge pull request #1804 from overleaf/msm-removed-collaborator-as-first-step-transfer-ownership ... Removing user as collaborator as a pre-step for project ownership transfer GitOrigin-RevId: dbfe1553ae7277863908341fdd2af709dc019692	2019-05-28 11:25:43 +00:00
Alasdair Smith	4e8facf3cc	Merge pull request #1776 from overleaf/pr-history-ui-filenames-overflow ... History filenames overflow + full history for admins GitOrigin-RevId: b52d79e0aa1cb600eacb475d21b603f42c8cf18c	2019-05-28 11:25:17 +00:00
Simon Detheridge	ff4e0013cd	Merge pull request #1809 from overleaf/ns-escape-archive-translation ... treat translate call as var, not string GitOrigin-RevId: db1b40182bbfabef4ea31b2e1923bb28921900b0	2019-05-28 09:33:31 +00:00
Simon Detheridge	d5556c55a9	Merge pull request #1813 from overleaf/spd-verbose-merge-logging ... Add very verbose logging to SL user merging GitOrigin-RevId: 802a9295240c23f48c133fabb5895501f1c9a49f	2019-05-28 09:33:15 +00:00
Simon Detheridge	6488fd1284	Merge pull request #1814 from overleaf/spd-missing-callback-returns ... Add missing return statements to callbacks in SubscriptionGroupHandler GitOrigin-RevId: 05ff67bd8e4997fde01c6cf9f4558d3caa261590	2019-05-28 09:33:06 +00:00
Simon Detheridge	561f54c1a3	Merge pull request #1816 from overleaf/spd-user-delete-newsletter ... Don't fail to delete a user if unsubscribing from newsletter fails GitOrigin-RevId: 8764717220d906a20a7dd0a90879a45d9dd8a7ce	2019-05-28 09:32:57 +00:00
Simon Detheridge	40316b0735	Merge pull request #1815 from overleaf/spd-mongoose-debugging ... Allow very verbose debugging of mongo queries via env var GitOrigin-RevId: ad132ef0cc6df892b4c879948094f67497cc9a48	2019-05-28 09:32:50 +00:00
Simon Detheridge	a0adde3573	Merge pull request #1803 from overleaf/spd-email-login-url ... Fix path to login URL in account migration emails GitOrigin-RevId: 609445ad5f214deb7da3966806ff512c4a7a3d55	2019-05-23 13:25:29 +00:00
Alasdair Smith	a3894ac9b4	Merge pull request #1794 from overleaf/as-upgrade-ace-1.4.4 ... Upgrade Ace to v1.4.4 GitOrigin-RevId: 26681bcf255537f8eb09fa0ac1c98009cf964496	2019-05-23 08:49:13 +00:00
Timothée Alby	d86abf49e6	Merge pull request #1729 from overleaf/ta-show-last-modified ... Show LastUpdatedBy on Dashboard GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9	2019-05-21 13:39:29 +00:00
Timothée Alby	2895a6878c	Merge pull request #1796 from overleaf/ta-institution-subscriptions-fix ... Ignore Trials when Listing Subscriptions on Institution Hub GitOrigin-RevId: 9121b08fc16fd3d18fff4a0403354fecec2d4666	2019-05-21 13:39:16 +00:00
Jessica Lawshe	e03b5ae691	Merge pull request #1741 from overleaf/jel-manage-linked-accounts ... Manage linked accounts via v2 GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06	2019-05-20 16:10:46 +00:00
Simon Detheridge	004272619e	Merge pull request #1781 from overleaf/ta-institution-subscriptions ... List Institution Subscriptions GitOrigin-RevId: b259b4729f031bb6a50b27f6740df3df21017818	2019-05-20 12:18:57 +00:00
Simon Detheridge	efd7cf5b01	Merge pull request #1793 from overleaf/fix-name-removed-transfer-ownership ... Fix name removed transfer ownership GitOrigin-RevId: ccbc681746033017686c4e36040a71ab7f98ad16	2019-05-20 12:18:49 +00:00
Simon Detheridge	c07c44f366	Merge pull request #1644 from overleaf/spd-reconcile-accounts ... Add account-reconciliation script GitOrigin-RevId: e20a8b9531126d91baaa9da5c77ab6e971b43e67	2019-05-16 10:59:53 +00:00
Timothée Alby	0e38ca1fd7	Merge pull request #1775 from overleaf/ta-fetch-user-before-confirm ... Check User Exists Before Confirming Email GitOrigin-RevId: 3622044f31f78e8499ccd084ca99297ca297ca97	2019-05-16 07:34:23 +00:00
Timothée Alby	276310bd23	Merge pull request #1778 from overleaf/hb-password-reset-sl ... Handle users who haven't migrated better on password reset GitOrigin-RevId: f123a6fe4a5a958f558e3cf34c3180e8fc96d159	2019-05-16 07:34:18 +00:00
Brian Gough	c6c948e9f9	Merge pull request #1769 from overleaf/bg-record-date-for-doc-deletion ... record timestamp for doc deletion GitOrigin-RevId: 3ae38c94918d3400ad9aa821e1e1ef1bcde6373b	2019-05-15 12:41:42 +00:00
Brian Gough	e252c64996	Merge pull request #1763 from overleaf/bg-preserve-file-hash-on-copy-and-delete ... preserve file hash on copy and delete GitOrigin-RevId: 2dc000255dcfe875a30a7e7f878aaa09fea367dc	2019-05-15 12:41:37 +00:00
Brian Gough	833caf4acd	Merge pull request #1765 from overleaf/bg-avoid-exception-in-token-access ... handle exception in crypto.timingSafeEqual when checking token GitOrigin-RevId: ba23aa4d4fe1e212c776965c0a58a90ecd846052	2019-05-15 12:41:31 +00:00
Timothée Alby	7e32ed5158	Merge pull request #1766 from overleaf/ta-dropbox-duplicates-script ... Add Script to Unlink all Duplicate Dropbox uids GitOrigin-RevId: 6db73dee9f04e9006d0aec558cf370b5079df671	2019-05-15 07:29:00 +00:00
Timothée Alby	bd722dda8e	Merge pull request #1759 from overleaf/sk-disable-bcrypt-rounds-upgrade ... Temporarily de-activate automatic upgrade of bcrypt rounds GitOrigin-RevId: 66dbe344c00253e4b6a8f883735e61d9133da62e	2019-05-15 07:28:54 +00:00
Ersun Warncke	6513cc7b7a	Revert "Revert "complete v2 collabratec api"" ... This reverts commit 378825fae46cef6f19c8f908a1d6cf9c837cd1d6. GitOrigin-RevId: cf38aa3b4ec53ec6741389885ebe882476cb9297	2019-05-14 10:24:11 +00:00
Ersun Warncke	8377005187	Revert "Revert "oauth and collabratec migration"" ... This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a. GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304	2019-05-14 10:24:04 +00:00
Ersun Warncke	8e916a830d	Revert "Revert "fix auth error response and use 401 for malformed header"" ... This reverts commit 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee. GitOrigin-RevId: d5cc2fd2e7a676cad637717d77d1a69a7fe6453c	2019-05-14 10:23:57 +00:00
Ersun Warncke	7883554d73	Revert "Revert "add oauth2-server"" ... This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda. GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a	2019-05-14 10:23:51 +00:00
Ersun Warncke	9b24ed6daa	Revert "Revert "add thirdPartyIdentifiers to User model and add manager class"" ... This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5. GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e	2019-05-14 10:23:46 +00:00
Ersun Warncke	934b70e96a	Revert "add thirdPartyIdentifiers to User model and add manager class" ... This reverts commit 5839f1f43237c19efed7f4ce1dfb500da9327f70. GitOrigin-RevId: df1b9355b1b28e3311bb9e5748df9db673d32ce5	2019-05-13 15:52:47 +00:00
Ersun Warncke	a00f4b219e	Revert "add oauth2-server" ... This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae. GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda	2019-05-13 15:52:41 +00:00
Ersun Warncke	6d4b67d1ee	Revert "fix auth error response and use 401 for malformed header" ... This reverts commit 6dc4d10c25db7710b3e4e8e876d425a1e84574c8. GitOrigin-RevId: 5d25af9026159b0c1e0a53f0d1fd0d9c685b40ee	2019-05-13 15:52:36 +00:00
Ersun Warncke	89ee728514	Revert "oauth and collabratec migration" ... This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248. GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a	2019-05-13 15:52:30 +00:00
Ersun Warncke	4189f2e6ec	Revert "complete v2 collabratec api" ... This reverts commit 9c75b657c11f98e3f927dd01a422157f53a5672d. GitOrigin-RevId: 378825fae46cef6f19c8f908a1d6cf9c837cd1d6	2019-05-13 15:52:25 +00:00
Ersun Warncke	65cbfbaeae	complete v2 collabratec api ... * remove proxies to v1 * allow oauth tokens with user stubs * add profile/unlink end points * fix Makefile issue GitOrigin-RevId: 9c75b657c11f98e3f927dd01a422157f53a5672d	2019-05-13 12:05:04 +00:00
Ersun Warncke	935877222a	oauth and collabratec migration ... * make v2 system of record for collabratec id * migrate oauth apps, tokens to v2 * set collabratec id on reg/link from ctec * copy collabratec id from user stub to user on merge GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248	2019-05-13 12:04:56 +00:00
Ersun Warncke	c0ab195eed	fix auth error response and use 401 for malformed header ... GitOrigin-RevId: 6dc4d10c25db7710b3e4e8e876d425a1e84574c8	2019-05-13 12:04:51 +00:00
Ersun Warncke	dc06069dff	add oauth2-server ... GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae	2019-05-13 12:04:46 +00:00
Ersun Warncke	8f339603f4	add thirdPartyIdentifiers to User model and add manager class ... GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70	2019-05-13 12:04:40 +00:00
Brian Gough	07b7566466	Merge pull request #1089 from overleaf/bg-compute-filestore-hash ... compute filestore hash GitOrigin-RevId: 23a909d2c2ea7aba3abfdb8f0c060e414a17e52e	2019-05-13 08:49:42 +00:00
Brian Gough	c989179517	Merge pull request #1758 from overleaf/as-remove-unused-middleware-file ... Remove unused TemplatesMiddlewear file GitOrigin-RevId: 00cf49c970171f1f99d133ee4876f2a35c89c023	2019-05-13 08:49:36 +00:00
Brian Gough	d1cc605855	Merge pull request #1755 from overleaf/bg-admin-resync-project-history ... add button to resync history for project in admin page GitOrigin-RevId: e52e85ee6d1f7dea7930bf3dee0ec70b28b8a6c2	2019-05-13 08:49:29 +00:00
Henry Oswald	69ccac8f49	log out job in tpdsupdate sender ... GitOrigin-RevId: 8ff4665f62a1f36580c5864f2185ddf1a792f6cf	2019-05-11 01:54:39 +00:00
Alasdair Smith	dc09095ae7	Merge pull request #1756 from overleaf/pr-resize-ace-when-toggling-pdf ... Resize Ace when toggling PDF view GitOrigin-RevId: 77e6fe662eb67f2ec39a00f42a35026f6a696eb9	2019-05-10 08:56:21 +00:00
Alasdair Smith	36035e8ccd	Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3 ... Pass build-id when downloading pdf GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b	2019-05-08 09:09:11 +00:00
Christopher Hoskin	8aa8840db0	Merge pull request #1745 from overleaf/csh-issue-1118-node-10.15.3 ... Csh issue 1118 node 10.15.3 GitOrigin-RevId: 5b75d030d9d07bdb41dbca46f90fd950293e17b3	2019-05-07 10:58:52 +00:00
Paulo Jorge Reis	d613d7e1a2	Merge pull request #1647 from sharelatex/as-upgrade-ace-1.4.3 ... Upgrade Ace to v1.4.3 GitOrigin-RevId: 810350080a6b89fd9817ebcacde7e9817097d99a	2019-05-06 09:02:03 +00:00
Timothée Alby	5b7b9fc97b	Store lastUpdatedBy Value on Projects (#1727) ... Store lastUpdatedBy Value on Projects GitOrigin-RevId: bdb12c55732bc726151135b28a03e722bf3fdb39	2019-05-02 14:17:41 +00:00
Timothée Alby	5b7974065d	Prevent registration of new accounts with existing secondary emails (#1696) ... Prevent registration of new accounts with existing secondary emails GitOrigin-RevId: 004cf9d31064fc5b7deb621c95c38f103397ff15	2019-05-02 14:17:34 +00:00
Alasdair Smith	5049dc083e	Merge pull request #1739 from sharelatex/bg-upgrade-history-in-project-admin-page ... add button to upgrade history in project admin page GitOrigin-RevId: a5f2a64028ccb002cbb96da0f910b7b494f75eb8	2019-05-01 09:38:35 +00:00
Alasdair Smith	028c3bc94c	Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room ... remove unnecessary callback on emitToRoom GitOrigin-RevId: a34006d6f72862b1f2e0b88d20ad8003ea5b8883	2019-05-01 09:38:30 +00:00
Alasdair Smith	2c30ae0f8a	Merge pull request #1738 from sharelatex/spd-dumpfolder ... Ensure dump folder exists before opening templates GitOrigin-RevId: 3c7269fbcdff45a06e505154a35ce6d2bd4b7ae1	2019-05-01 09:38:24 +00:00
Brian Gough	77a711f7a3	Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element ... make removeElementFromMongoArray atomic GitOrigin-RevId: 3c4cf50caed9b3197ee0ec7fe4c89738d368a966	2019-04-29 09:31:09 +00:00
Simon Detheridge	5517adcbd1	Merge pull request #1726 from sharelatex/hb-sso-password-setting ... Check for password from v1 before showing password change form GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658	2019-04-25 14:37:38 +00:00
Simon Detheridge	16f905358a	Merge pull request #1690 from sharelatex/cmg-color-tags ... Color-code tags/folders GitOrigin-RevId: d8dcb90b861dd61c1bc502e0b67556dcd772b42e	2019-04-25 14:37:32 +00:00
Simon Detheridge	9808eb7f55	Merge pull request #1722 from sharelatex/jel-password-descriptive-message ... Use descriptive error message for password reset GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff	2019-04-25 14:37:21 +00:00
Simon Detheridge	3990a5d736	Merge pull request #1724 from sharelatex/ta-subscription-canceled-page ... Add Subscription Canceled Page GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745	2019-04-25 14:37:15 +00:00
Simon Detheridge	cc96ecfd74	Merge pull request #1734 from sharelatex/spd-delete-user-crash ... Don't fail in refreshFeatures if the v1 user doesn't exist GitOrigin-RevId: 7849f5f942ef39762b40c31a616b51b4b1fe0706	2019-04-25 14:36:58 +00:00
Brian Gough	e1ec01eb0f	Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots ... Show and restore doc snapshots from admin panel GitOrigin-RevId: 22339644d48a8698df97f7d5fc1eecfaf27c6fab	2019-04-24 13:24:46 +00:00
Timothée Alby	967973f354	Only show label version button for users with write permission (#1665) ... Only show label version button for users with write permission GitOrigin-RevId: f0a6504b51c1e9018942592ad6784599694c571a	2019-04-23 14:35:32 +00:00
Timothée Alby	d3f0285fd2	Ensure project name is unique when transferring to another user (#1712) ... Ensure project name is unique when transferring to another user GitOrigin-RevId: 0742fcbd958b5801ed155214f403a74d17236859	2019-04-23 14:35:27 +00:00
Timothée Alby	85e7f688d5	Display Pricing Exceptions on Subscription Dashboard (#1720) ... Display Pricing Exceptions on Subscription Dashboard GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd	2019-04-23 14:35:21 +00:00
Timothée Alby	44ba16bb7c	Fix Wording in Subscription Cancellation Flow (#1723) ... Fix Wording in Subscription Cancellation Flow GitOrigin-RevId: 27b89982d0ac9d4bc9e9b985df2dd515253a1368	2019-04-23 14:35:14 +00:00
Timothée Alby	2a73d8106b	Send Email on Subscription Reactivation (#1721) ... Send Email on Subscription Reactivation GitOrigin-RevId: 388f3490eddba0507e8c66e45d9ee4d185119c1e	2019-04-23 14:35:05 +00:00
Timothée Alby	54186d9db1	Add linked accounts section to user settings page (#1705) ... Add linked accounts section to user settings page GitOrigin-RevId: d2bb26a3bfb3946144a05b98f58d50a2c57f3040	2019-04-23 14:34:55 +00:00
Timothée Alby	e2793f659c	Don't Sanitize Undefined Team Notices (#1725) ... Don't Sanitize Undefined Team Notices GitOrigin-RevId: 540316d71bc4047d25100bb0ef524d5d2adba0b1	2019-04-23 14:34:48 +00:00
Timothée Alby	6232854ff7	Remove User Memberships on Deletion (#1688) ... Remove User Memberships on Deletion GitOrigin-RevId: d6e6a4cc01e31288f660c2fd36a0cee174ee5dd1	2019-04-23 14:34:40 +00:00
Jessica Lawshe	1306de81e1	Merge pull request #1711 from sharelatex/pr-fix-tc-toggle-ie ... Fix review panel toggles in IE11. GitOrigin-RevId: f8c0c8191a8299da87c6308749bace0d7bf8bca8	2019-04-17 14:14:27 +00:00
Jessica Lawshe	f455a11aa8	Merge pull request #1655 from sharelatex/jel-user-must-reconfirm ... Reconfirm user accounts GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8	2019-04-17 14:14:19 +00:00
Paulo Jorge Reis	f2fbdcc078	Merge pull request #1718 from sharelatex/revert-1667-pr-add-post-integration-survey-link ... Revert "Add survey link in the projects list sidebar." GitOrigin-RevId: 22b3a9bce5e53d54929f9593af4156b668665de2	2019-04-17 10:45:15 +00:00
Paulo Jorge Reis	8b7b49f72a	Merge pull request #1693 from sharelatex/cmg-clone-owners ... Return new project data from api when cloning GitOrigin-RevId: 726ee5a37a7f74f2f618ca911ae9c2c991f12786	2019-04-17 10:26:11 +00:00
Paulo Jorge Reis	5a6cdf0999	Merge pull request #1679 from sharelatex/cmg-dashboard-owner ... Fix ordering by Owner on the dashboard GitOrigin-RevId: ec780ae8de5221e151f970638f3fa55c00bd6767	2019-04-17 10:26:03 +00:00
Paulo Jorge Reis	6c6bc1216a	Merge pull request #1670 from sharelatex/pr-fix-contrast-issues ... Fix contrast issues (and others) GitOrigin-RevId: 5882978b70163e65efdf0ef7d5f82a8fc29b48ec	2019-04-17 10:25:55 +00:00
nate stemen	bec56ccafa	Merge pull request #1713 from sharelatex/ns-captchas-two ... turn off captchas for project invite GitOrigin-RevId: 3e044ba8c6bb2ffb77ea4486f7b51a587133839c	2019-04-16 18:47:56 +00:00
Hugh O'Brien	9644ff4f51	Merge pull request #1714 from sharelatex/spd-middlewear-oops ... Fix spelling in UserMembershipAuthorization GitOrigin-RevId: cca5e5d13d7eb33e12f73be9172bc5cbe90312c0	2019-04-15 16:09:26 +00:00
Hugh O'Brien	5edead4446	Merge pull request #1694 from sharelatex/hb-clear-ip-notifications ... Remove notification for university enrolment on affiliation add GitOrigin-RevId: 67df66ad6c6e9e16b6573fa15eb34293adaa0287	2019-04-15 16:09:16 +00:00
Shane Kilkelly	0773311805	Merge pull request #1674 from sharelatex/sk-email-make-primary-tooltip ... Change the wording on emails from 'default' to 'primary' GitOrigin-RevId: e09792f6fba73b626c09d8f1bf4298b6e9780d15	2019-04-13 01:57:15 +00:00
Shane Kilkelly	f3dd61abce	Merge pull request #1657 from sharelatex/sk-rate-limit-join-project ... Add a rate-limit to joinProject GitOrigin-RevId: 27edd8b56ae80868b5fcd0b803d0e042dce26f31	2019-04-13 01:57:10 +00:00
Chrystal Maria Griffiths	36d0e8e199	Merge pull request #1654 from sharelatex/ns-add-status-page ... add status.overleaf.com to 500 page GitOrigin-RevId: 47988918a4c2ea83b2edbd9f850d65a0d2bcdf82	2019-04-10 09:52:46 +00:00
Chrystal Maria Griffiths	5d6a307234	Merge pull request #1664 from sharelatex/as-fix-read-only-comment ... Only show add comment button if user has permission GitOrigin-RevId: e2de9ec435eff45d575a368f07ff40416ed43f1f	2019-04-10 09:52:41 +00:00
Chrystal Maria Griffiths	ab6565beb8	Merge pull request #1697 from sharelatex/cmg-leave-archived ... Leave an archived project GitOrigin-RevId: c1da7fdff9ae90b9992ed99dbcff3e7ee31ec4d9	2019-04-10 09:52:36 +00:00
Paulo Jorge Reis	9c5c6922b9	Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection ... History drag and drop selection GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01	2019-04-09 10:11:13 +00:00
nate stemen	2ae27fbc6a	Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas ... Revert "allow toggling of captchas via setting" GitOrigin-RevId: 422daf84d2b02a10dd9b771e5c0f672139da0613	2019-04-08 15:20:49 +00:00
nate stemen	5aac144d5b	Merge pull request #1650 from sharelatex/ns-toggle-captchas ... allow toggling of captchas via setting GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4	2019-04-08 13:53:54 +00:00
Paulo Jorge Reis	9e63211a17	Merge pull request #1680 from sharelatex/cmg-hide-unarchive ... Only show unarchive button for project owners GitOrigin-RevId: 5990be70cfcd9cf0708248d78845dc163a59a8b3	2019-04-08 10:31:10 +00:00
Paulo Jorge Reis	e6943e8e71	Merge pull request #1667 from sharelatex/pr-add-post-integration-survey-link ... Add survey link in the projects list sidebar. GitOrigin-RevId: 085f969336e81d546c51043c3ab9dc63585f97fb	2019-04-08 10:14:19 +00:00
Alasdair Smith	9ff021cc88	Merge pull request #1676 from sharelatex/as-upgrade-pdfjs-2.0.943 ... Upgrade PDFjs to v2.0.943 GitOrigin-RevId: 79081841d64558a7fe82055c172893533466c4eb	2019-04-01 09:27:32 +00:00
Simon Detheridge	385da07930	Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui ... Display more descriptive errors when uploading a project fails GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8	2019-03-28 15:14:30 +00:00
Simon Detheridge	88446ffa9b	Merge pull request #1677 from sharelatex/spd-hide-heapdump ... Move 'heapdump' endpoint to private API router GitOrigin-RevId: 581cc13b60ee944b3e1ad21a973d70ebab606a5b	2019-03-28 15:14:22 +00:00
Simon Detheridge	bb81a47d58	Merge pull request #1641 from sharelatex/spd-soft-delete-users ... Add initial support for soft-deletion of users GitOrigin-RevId: 22e47536732c5aec843d120773d2565112ad80b7	2019-03-26 13:59:49 +00:00
Simon Detheridge	364561d5fb	Merge pull request #1666 from sharelatex/cmg-rttc-typo ... Remove duplicate text on review panel GitOrigin-RevId: 20d37f392ed28ebbe31bae4f66892414b2966b87	2019-03-25 16:34:18 +00:00
Simon Detheridge	d9522f563d	Merge pull request #1631 from sharelatex/ho-remove-recurly-sign ... remove RecurlyWrapper.sign and recurly private api key GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152	2019-03-25 15:52:54 +00:00
Simon Detheridge	f9594707ca	Merge pull request #1662 from sharelatex/as-fix-wrong-favicon ... Fix missed favicon path update and make track-changes page inherit from layout GitOrigin-RevId: e702b965b7445d86193b3b914d40d91a9a3345e3	2019-03-25 15:52:44 +00:00
Simon Detheridge	cd9ed1dd6b	Merge pull request #1663 from sharelatex/cmg-rttc-typo ... Fix lack of whitespace typo on review panel GitOrigin-RevId: cfbbf421800af479f148d2006b96242acef7f275	2019-03-25 15:52:38 +00:00
Shane Kilkelly	90cb50f4ac	Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3 ... Upgrade bcrypt to version 3, and specify minor-version of hash function GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca	2019-03-25 09:50:41 +00:00
Simon Detheridge	d2e053f456	Merge pull request #1610 from sharelatex/cmg-reintroduce-beta ... Revive the beta program in the settings area GitOrigin-RevId: 40024210cba08de96805d58147b6a0fe166a7d43	2019-03-22 12:28:36 +00:00
Simon Detheridge	2bf6e4e072	Merge pull request #1638 from sharelatex/spd-delete-user-rate-limit ... Add rate limit to user deletion GitOrigin-RevId: 4269277ea88b32b93f897a2b2709385ab379e479	2019-03-22 12:28:30 +00:00
Simon Detheridge	d184087a53	Merge pull request #1643 from sharelatex/spd-transfer-projects ... Add support for transferring project ownership GitOrigin-RevId: 088e02bb5be67033dba8e24c11660a1e200a3258	2019-03-22 12:28:24 +00:00
Shane Kilkelly	a5ad2e48d4	Merge pull request #1629 from sharelatex/sk-censor-token-prefix ... Censor `tokens.readAndWritePrefix` when building project model GitOrigin-RevId: 0fe3fc2657aa191808ea282dfcd2ea5506e93fee	2019-03-22 10:27:56 +00:00
Shane Kilkelly	a51fefae6c	Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import ... Allow deleted v1 user when importing project invite inviter GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d	2019-03-22 10:27:45 +00:00
Brian Gough	0305ba0c6b	Merge pull request #1639 from sharelatex/bg-add-message-ids ... include a unique id in every message published to redis GitOrigin-RevId: f2843e5bb570247f03b260fa0f82f562c9c6014d	2019-03-21 16:17:37 +00:00
Timothée Alby	5de25032d8	Merge pull request #1634 from sharelatex/ta-no-institution-autocreate ... Don't Auto-Create Institutions GitOrigin-RevId: 8be3a0d9f3f3814396a58d2fd131a62c9f196861	2019-03-19 23:51:53 +00:00
Alasdair Smith	e6e3c023ed	Merge pull request #1635 from sharelatex/as-fix-broken-chat-mathjax ... Fix broken messages in chat due to mathjax XSS filtering GitOrigin-RevId: 8d5eb1f4df6496cafabff4669e5e59633c160647	2019-03-18 12:12:10 +00:00
Alasdair Smith	41f75b5936	Merge pull request #1543 from sharelatex/as-fix-potential-angular-xss ... Fix potential Angular XSS issues GitOrigin-RevId: a18a609a25b29e910cb78e28a37398417cfe4842	2019-03-18 10:37:15 +00:00
Brian Gough	c704312c85	Merge pull request #1625 from sharelatex/bg-move-entities-safely ... move project entities safely without losing data on error GitOrigin-RevId: 864fcf14af1045154e9deb7d02a4f2d508e6021e	2019-03-18 09:30:28 +00:00
Timothée Alby	429709dfcb	Merge pull request #1621 from sharelatex/ns-update-spam-regexes ... allow hyphen in email hostname and ' in project name GitOrigin-RevId: d108b7d42372dee4250157e2830cbc800851afc1	2019-03-14 16:02:45 +00:00
Timothée Alby	1edf1964c8	Merge pull request #1607 from sharelatex/spd-succserror ... Don't show 'No errors' message if PDF generation fails GitOrigin-RevId: 7ed454b489dcef419c51f48b6c5b3920d5558a79	2019-03-14 16:02:32 +00:00
Timothée Alby	970ca2e122	Merge pull request #1604 from sharelatex/ns-fix-capitalization ... improve project invite email wording GitOrigin-RevId: a15c2db992a000d3d1b2e49878380532d9b48e37	2019-03-14 16:02:27 +00:00
Timothée Alby	e4c684786d	Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2 ... Fix Publisher Creation Form Take2 GitOrigin-RevId: a51512cc48067f50ba05fa371ed1d759d3fca985	2019-03-14 13:43:12 +00:00
Jessica Lawshe	0b841aacef	Merge pull request #1605 from sharelatex/jel-portal-team-data ... Refactor portals GitOrigin-RevId: c75eb5fc17b2755070dfe48eb85845c690fe0230	2019-03-13 16:51:52 +00:00
Brian Gough	32925f0c4e	Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely ... allow reserved names safely GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a	2019-03-13 11:18:06 +00:00
Brian Gough	0f22a626c8	Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request ... remove old project version request GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77	2019-03-13 09:12:42 +00:00
Henry Oswald	0c5346460f	log ops in filestore error ... GitOrigin-RevId: 008722ba2ff335ebedb2e17e9413737d0244f78e	2019-03-12 11:48:51 +00:00
Timothée Alby	b86a949f50	Merge pull request #1485 from sharelatex/cmg-comments-track-changes ... Add comments highlighting to rich text track changes GitOrigin-RevId: 7f81490417cc228db5f6f687c309a4e39c0b25d5	2019-03-11 11:08:10 +00:00
Timothée Alby	89f31d71e3	Merge pull request #1603 from sharelatex/spd-admin-panel-buttons-not-working ... Don't use multipart/form-data for admin panel buttons GitOrigin-RevId: 97c265a1c0addbddf5628d5e0c70fedb38bda75d	2019-03-11 11:07:45 +00:00
Timothée Alby	e1fb28ae28	Merge pull request #1598 from sharelatex/jel-wiki-search ... Stop search bar clearing on enter GitOrigin-RevId: 54d0de33fc196ea97b3f8628442704475aa959dd	2019-03-11 11:07:34 +00:00
Timothée Alby	72ae3f3aa5	Merge pull request #1601 from sharelatex/hb-metrics-email-bugfixes ... Fixes for unsubscribing from metrics email GitOrigin-RevId: 7d7ae79275d6216ef2b44d2e75c51fabf460ef65	2019-03-11 11:07:20 +00:00
nate stemen	f699877959	Merge pull request #1540 from sharelatex/ns-less-spam-mail ... add spam checkers on project invite emails GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef	2019-03-11 11:07:09 +00:00
Brian Gough	01fd6e9c8a	Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version ... use atomic project structure version GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8	2019-03-11 11:06:45 +00:00
Douglas Lovell	b9e88c7998	Merge remote-tracking branch 'origin/bg-accept-larger-document-size-on-api-requests' ... GitOrigin-RevId: b06511daa7000878646f5cb8132d6077304f5f8c	2019-03-11 11:06:23 +00:00
Douglas Lovell	f090eb6d06	Merge remote-tracking branch 'origin/pr-update-files-to-hash' ... GitOrigin-RevId: dec35961f496f14357757248a62fe4c7d7fc1def	2019-03-11 11:06:10 +00:00
Douglas Lovell	24da4799ed	Merge remote-tracking branch 'origin/jel-payment-countries' ... GitOrigin-RevId: 412422397ad36408566899b7b2bcbbaabf88138b	2019-03-11 11:05:58 +00:00
Douglas Lovell	ce8695c951	Merge branch 'dcl-i1261b' ... GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6	2019-03-11 11:05:47 +00:00
Douglas Lovell	44dd7c1c75	Merge remote-tracking branch 'origin/as-fix-email-address' ... GitOrigin-RevId: 5fa0d5b540f0d7b79a1dab0c6dc345bcb06d04e2	2019-03-11 11:05:36 +00:00
Simon Detheridge	3553fb2d9d	Merge pull request #1581 from sharelatex/spd-wearing-middle ... Fix spelling of "middleware" GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda	2019-03-11 11:05:12 +00:00
Simon Detheridge	939922485c	Merge pull request #1555 from sharelatex/spd-email-escape-html ... HTML-escape user-supplied data in HTML emails GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91	2019-03-11 11:05:01 +00:00
Simon Detheridge	96759a90f4	Merge pull request #1578 from sharelatex/jel-student-disclaimer ... Show disclaimer on student subscription trials GitOrigin-RevId: dfac98e74b3bc34742a179193cc8ce92deb14229	2019-03-11 11:04:46 +00:00
Simon Detheridge	870f183595	Merge pull request #1476 from sharelatex/spd-character-sets ... Detect encoding of non-utf8 files and convert during load GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69	2019-03-11 11:04:22 +00:00
Hugh O'Brien	491c29bad1	Merge pull request #1569 from sharelatex/hb-v2-metrics-email-opt-out ... v2 metrics email opt out and last sent tracking GitOrigin-RevId: d45ac653c26e780dc380883c0ac1da7436bf8c2b	2019-03-11 11:03:39 +00:00
Douglas Lovell	9b6ac8f715	Merge remote-tracking branch 'origin/ta-entity-create-form-fix' ... GitOrigin-RevId: e16167515c1c64bb350751fc1e748b719446a5b3	2019-03-11 11:03:28 +00:00
Hugh O'Brien	f887bcb121	Merge pull request #1556 from sharelatex/cmg-search-clearing ... Stop search bar clearing on enter GitOrigin-RevId: c3dc6236e3fd889b229f68633a17b396cbe45f60	2019-03-11 11:03:07 +00:00
Paulo Jorge Reis	46c6d11574	Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar ... Show the toolbar in SL history projects. GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b	2019-03-11 11:01:56 +00:00
Henry Oswald	b9edc0f414	Merge pull request #1548 from sharelatex/ho-tpds-linode-hosts ... read linode_url in for tpdsworker jobs GitOrigin-RevId: 23d5b36a881e4d96ddc343444802354594d798d7	2019-03-11 11:01:25 +00:00
Simon Detheridge	6e960492ff	Merge pull request #1550 from sharelatex/spd-fix-broken-team-invite-accept ... Fix broken accept-team-invite page GitOrigin-RevId: 0ba3c906548358931902beb48812257da16fc5db	2019-03-11 11:01:10 +00:00
Simon Detheridge	5d8b8ff012	Merge pull request #1530 from sharelatex/spd-dont-cancel-groups-on-invite ... Only prompt for group cancellation if group is personal when accepting invite GitOrigin-RevId: 921807b25d64f037859d303e28c40cdc12eb7685	2019-03-11 11:00:48 +00:00
Simon Detheridge	c6b8ab3245	Merge pull request #1542 from sharelatex/as-fix-noopener ... Fix some missing noopener attributes GitOrigin-RevId: a833fc26b2c783bb713f771fb2ae4a494e5fec63	2019-03-11 11:00:17 +00:00
Simon Detheridge	838fe00058	Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade ... Notify users when affiliations are upgraded GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6	2019-03-11 11:00:01 +00:00
Jessica Lawshe	b8bb118fe3	Merge pull request #1528 from sharelatex/jel-portal-print ... Update portals for printing GitOrigin-RevId: ad3861b8464f0e5a8d8e70daa0166ebcf7d2312d	2019-03-11 10:59:47 +00:00
Henry Oswald	d55b38cc05	Merge pull request #1471 from sharelatex/ho-docker2 ... Move to docker image based builds GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407	2019-03-11 10:59:20 +00:00
Brian Gough	43899589dc	Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses ... use explicit json content-type to avoid security issues with text/html GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56	2019-03-11 10:58:32 +00:00
Brian Gough	2ab346e762	Merge pull request #1511 from sharelatex/as-inc-linked-file-rev ... Increment rev of linked file to fix bug where dropbox not syncing GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284	2019-03-11 10:58:21 +00:00
Chrystal Maria Griffiths	e379691767	Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener ... Add some missing rel="noreferrer noopener" attributes GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d	2019-02-15 13:33:54 +00:00
Chrystal Maria Griffiths	d52c30f272	Merge pull request #1512 from sharelatex/as-rate-limit-confirm-uni-domain-endpoint ... Rate limit confirm university domain endpoint GitOrigin-RevId: 1d03eec3c0e8208e5f643000693f685957e15442	2019-02-15 13:33:42 +00:00
Chrystal Maria Griffiths	9abea8ae5f	Merge pull request #1516 from sharelatex/as-sanitize-team-notice ... Show sanitized HTML for team notice on subscription page GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c	2019-02-15 13:33:28 +00:00
Brian Gough	cc613f4370	Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors ... Return error status to the publish modal on export creation error GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8	2019-02-14 15:03:42 +00:00
Shane Kilkelly	349d731745	Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix ... Constant-time comparison for read-write tokens GitOrigin-RevId: ddd83de551c540544fde426d7d5aca9f4c83fcc7	2019-02-14 11:09:40 +00:00
Brian Gough	00cdc008d5	Merge pull request #1508 from sharelatex/bg-add-websocket-fallback-option ... add fallback to siteUrl if websocket fails GitOrigin-RevId: fd866d17475cb974e4158ac7a89e972c66f0dd97	2019-02-13 09:20:35 +00:00
Timothée Alby	c4dd8b5da8	Merge pull request #1502 from sharelatex/jel-social-metatags ... Update `og` metatags and add protocol to image URL GitOrigin-RevId: 9548ca5f378cb770e454bc75062e80bd1c3da9ac	2019-02-12 15:48:00 +00:00
Timothée Alby	fb5caf7b63	Merge pull request #1504 from sharelatex/jel-portal-sign-in-redirect ... Add redircts when signing in/up via portal GitOrigin-RevId: b84105f35b5f1c14fa57ca91e766b8b6de00ccd7	2019-02-12 15:47:53 +00:00
Timothée Alby	b39626751a	Merge pull request #1499 from sharelatex/ta-open-redirect-fix ... Prevent Open Redirects GitOrigin-RevId: 8cd2ead74de60f47b728ac227c21440281b111a5	2019-02-12 15:47:41 +00:00
Alasdair Smith	9b97af8977	Merge pull request #1403 from sharelatex/as-swap-brand-prefix ... Swap brand prefix so OL is the default GitOrigin-RevId: 60f4f03598fb6befc1ce790d39f546490612a1db	2019-02-12 11:32:28 +00:00
Simon Detheridge	255981bdc2	Merge pull request #1486 from sharelatex/ta-subscription-dash-fix ... Fix Subscirption Dashboard Messaging GitOrigin-RevId: 601b0df74c6f9f6bcc1c3ba6ecbf64721bc6fb99	2019-02-11 11:42:34 +00:00
Simon Detheridge	7dcc807caf	Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1 ... Check generated read-tokens against v1 GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8	2019-02-11 11:42:29 +00:00
Simon Detheridge	c7f30bdfec	Merge pull request #1494 from sharelatex/spd-overleaf-v1-oauth-state ... Use 'state' parameter to prefent CSRF attacks when authenticating with v1 GitOrigin-RevId: bf5f8ddffa391d8f3ca84d3588df906b08eb018d	2019-02-11 11:42:20 +00:00
Simon Detheridge	ea807d053e	Merge pull request #1489 from sharelatex/spd-mendeley-csrf ... Enforce use of csrf token in Mendeley / tpr OAuth GitOrigin-RevId: b615ee195442123e0cd8ff19a864909ac2e6496d	2019-02-11 11:42:15 +00:00
Simon Detheridge	9e07daba0b	Merge pull request #1490 from sharelatex/ns-remove-ip-endpoint ... remove /ip endpoint GitOrigin-RevId: 42ea1ff6db6cba5e74a6e6c133a4d9f2b93d4a2e	2019-02-11 11:42:10 +00:00
Ersun Warncke	81e3db260c	Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route ... Add close site setting and private disconnect all users route GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0	2019-02-06 14:24:52 +00:00
Brian Gough	c51461da09	Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url ... allow setting separate wsUrl for websockets GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f	2019-02-06 10:20:36 +00:00
nate stemen	4840d9e9bd	Merge pull request #1469 from sharelatex/ns-ta-refresh-features-on-donmain-confirm ... refresh features on donmain confirm GitOrigin-RevId: e1c29f1c590aafefef188ddfbc50654194b0747f	2019-02-05 15:58:58 +00:00
Paulo Reis	f902eb7d4a	Add the project name as a translation local var when rendering project invites. ... GitOrigin-RevId: 80f4b10adc142173c2194f56c55df8b3ce9f948b	2019-02-04 17:59:05 +00:00
Chrystal Maria Griffiths	91594eee6d	Merge pull request #1473 from sharelatex/as-fix-notification-translation ... Inject data into translation string to workaround removed potential XSS GitOrigin-RevId: 6d9fa7050dafa1d48e3622765586eb4350dc514b	2019-02-04 16:24:57 +00:00
Chrystal Maria Griffiths	f5a6992aaa	Merge pull request #1475 from sharelatex/sk-dont-require-login-email-confirmation ... Don't require login for email confirmation action GitOrigin-RevId: 653baa394a8cdc08e4a52681d64fbd18ae34baca	2019-02-04 16:24:52 +00:00
Chrystal Maria Griffiths	2463fef390	Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging ... Subscription page messaging updates GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3	2019-02-04 16:24:35 +00:00
Chrystal Maria Griffiths	e73a7dbe9c	Merge pull request #1431 from sharelatex/mm-pubmodal-show-errors ... Show export creation errors to the user GitOrigin-RevId: fc116cfcfc2ca49d19188f01ef7b3460e4619503	2019-02-04 16:24:30 +00:00
Chrystal Maria Griffiths	d9692b7f91	Merge pull request #1168 from sharelatex/cmg-range-prototype ... Rich text track changes pt. 1 view changes GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d	2019-01-30 14:07:06 +00:00
Douglas Lovell	dc60d6b630	Merge remote-tracking branch 'origin/as-validate-email-length' ... GitOrigin-RevId: 00f46c637a7563443e903f491ec39446dc570b5f	2019-01-29 20:32:28 +00:00
Timothée Alby	9a0dd31d8c	Merge pull request #1061 from sharelatex/ja-remove-domain-license-code ... Remove deprecated domain license code GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714	2019-01-29 12:08:29 +00:00
Timothée Alby	bc2ee419eb	Merge pull request #1451 from sharelatex/ns-check-institution-users-patch ... remove extra emails call in mongo query GitOrigin-RevId: d64ab2ef72fe7691bc29e56210de0e04743ee917	2019-01-29 12:08:24 +00:00
James Allen	286dd564e2	Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection ... Fix history default file selection and bug when comparing with version zero GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1	2019-01-29 10:12:17 +00:00
James Allen	abb259a98b	Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4 ... Upgrade to angular-sanitize 1.6.4 GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e	2019-01-29 10:12:02 +00:00
Timothée Alby	b311f997aa	Merge pull request #1444 from sharelatex/ta-ns-check-institution-users ... add script to check all if users on institution are upgraded GitOrigin-RevId: 903f3a65fc038862178a82f43d97a5a4630cf470	2019-01-28 14:38:29 +00:00
Timothée Alby	300e7d2f12	Merge pull request #1449 from sharelatex/ta-subscription-page-fix ... Fix Subscription Page for Users with Free Affiliation GitOrigin-RevId: 3b3b2649c4ade40c7dc04e7c090748408de1fb6e	2019-01-28 14:38:16 +00:00
Timothée Alby	6985f7d1a3	Merge pull request #1443 from sharelatex/jel-vat-plans-page ... Add VAT text to plans page GitOrigin-RevId: a0693737cbf57bbb094e9ee77273bab1b687e619	2019-01-28 14:38:08 +00:00
Douglas Lovell	2a72804434	Merge remote-tracking branch 'origin/as-different-share-copy-for-link-sharing' ... GitOrigin-RevId: e8a0dfdc175e036dd491db41ab17d70604dd0cc3	2019-01-24 12:13:23 +00:00
Douglas Lovell	d2bccbec25	Merge remote-tracking branch 'origin/sk-admin-panel-projects' ... GitOrigin-RevId: 56f17fe3bec6252bd3d933899e540813550a36ff	2019-01-24 12:13:16 +00:00
Douglas Lovell	bd9adbae52	Merge remote-tracking branch 'origin/bg-case-sensitive-import' ... GitOrigin-RevId: d8d4fff4b4803f3cae6195ce1b60628cca326296	2019-01-24 12:13:11 +00:00
Douglas Lovell	c294a8425b	Merge remote-tracking branch 'origin/ns-new-file-modal' ... GitOrigin-RevId: 8017778fcf909edc499e9ca2a1bc5267f5a5906c	2019-01-24 12:13:02 +00:00
Douglas Lovell	59d4bd6182	Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling' ... GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2	2019-01-24 12:12:56 +00:00
Douglas Lovell	15061047a3	Merge remote-tracking branch 'origin/ns-check-institution' ... GitOrigin-RevId: a147965b4f3294215f1396e53d184ef4919fa6cd	2019-01-24 12:12:51 +00:00
Alasdair Smith	f32ecc744c	Merge pull request #1425 from sharelatex/spd-rate-limit-on-project-upload ... Add rate limit on project upload GitOrigin-RevId: e2da5fb1815d85d8e82fe2f4498786f1fc5b5727	2019-01-22 11:38:59 +00:00
Alasdair Smith	3af1ef48c2	Merge pull request #1423 from sharelatex/as-fix-non-existent-v1-token ... Fix import page showing for non-existent v1 token GitOrigin-RevId: cdce007b64d153505a15ec7b16fb4b9311ebf11b	2019-01-22 11:38:55 +00:00
Ersun Warncke	ef9875c5a6	Merge pull request #1427 from sharelatex/ew-recaptcha ... add recaptcha validate middleware to reg and add recaptcha v3 GitOrigin-RevId: 35375b7887832b40bc570cf848cab9c62243443b	2019-01-21 17:27:54 +00:00
Simon Detheridge	64f69529e0	Merge pull request #1406 from sharelatex/spd-more-rate-limits ... Add additional rate limits to prevent resource-exhaustion attacks GitOrigin-RevId: 428cf8a16e062267dd92e7fba73ef5c192a8e668	2019-01-18 10:37:18 +00:00
Simon Detheridge	6650dfe494	Merge pull request #1419 from sharelatex/as-fix-invites-permissions ... Fix invite permissions in share modal GitOrigin-RevId: 8fe073faebcd84236ac58671820166a2ad73262f	2019-01-18 10:37:11 +00:00
Timothée Alby	837302327e	Merge pull request #1407 from sharelatex/ta-team-status-free ... Hide Free v1 Teams on Subscription Dashboard GitOrigin-RevId: ba805e77eb1f994158d3ceaa42be23943fca0f1f	2019-01-17 15:15:44 +00:00
Timothée Alby	5169b4a73f	Merge pull request #1415 from sharelatex/ta-trial-fix ... Check if Trial is Current in Subscription Page GitOrigin-RevId: 7a7f562d321bc0f3a952c37f799760a7d42b7ba1	2019-01-17 15:15:33 +00:00
Ersun Warncke	87b2c72449	Merge pull request #1410 from sharelatex/ew-make-logout-area-clickable ... make area around logout button clickable GitOrigin-RevId: 8f080c6bedb7dce2ac39d877e8076b83241a4c12	2019-01-16 17:21:21 +00:00
Brian Gough	205da19173	Merge pull request #1408 from sharelatex/bg-increase-timeout-on-clone-project ... increase timeout for cloning project to 5 minutes GitOrigin-RevId: 949c7553f331573b391ff37f180e80b60c260cf5	2019-01-16 13:17:46 +00:00
Ersun Warncke	330f878085	Merge pull request #1378 from sharelatex/ew-post-logout ... POST logout instead of GET GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7	2019-01-15 16:48:00 +00:00
Brian Gough	f1179f0fa7	Merge pull request #1384 from sharelatex/bg-use-queued-lock ... use queued locks GitOrigin-RevId: b5a3bfb55af201392a50ffb3fe30e740e56da30d	2019-01-15 10:55:32 +00:00
Brian Gough	724e2e8fcd	Merge pull request #1344 from sharelatex/bg-handle-filestore-errors ... handle non-sucess responses from filestore copy GitOrigin-RevId: f00766066a5a2cf20116aa9c8d876f78fae8953f	2019-01-15 10:55:27 +00:00
Simon Detheridge	da6711dc99	Merge pull request #1275 from sharelatex/hb-authorization-flags ... Authorization flags for metrics GitOrigin-RevId: 651587c11317bfc8bb7b1e8143e8c2c820683cb5	2019-01-11 14:44:17 +00:00
Simon Detheridge	4c191953d3	Merge pull request #1356 from sharelatex/spd-password-complexity ... Make password validation more consistent between backend and frontend GitOrigin-RevId: 6ba729da842bf474cf7e9b5e0b2435db0544737c	2019-01-11 14:43:49 +00:00
Simon Detheridge	b7daca4f3f	Merge pull request #1379 from sharelatex/jel-import-page-mobile-friendly ... Mobile friendly project import page GitOrigin-RevId: b33a3fa5113d4400beec065fe856a19967e68845	2019-01-11 14:43:39 +00:00
Simon Detheridge	a107b0cc33	Merge pull request #1380 from sharelatex/ew-fix-project-getter-error ... fix callback is not a function error GitOrigin-RevId: 1bbe80f4086a17576f21ca9fc7b96f59d1b0614c	2019-01-11 14:43:34 +00:00
Simon Detheridge	4360a55fdc	Merge pull request #1383 from sharelatex/spd-rate-limits ... Add rate limits to email-related endpoints GitOrigin-RevId: 05a8b40eb65a55aba35788e2401e6988b672b389	2019-01-11 14:43:29 +00:00
Brian Gough	eb5738886a	Merge pull request #1382 from sharelatex/bg-fix-locking-for-copy ... fix locking for copy file method in ProjectEntityUpdateHandler GitOrigin-RevId: a0c2a69f31bd17d8ae5cbfbc1047db22207f9bbe	2019-01-11 10:27:20 +00:00
James Allen	ea415ea639	Merge pull request #1374 from sharelatex/as-fix-dash-user-fetch ... Include owners email in user fetch to show on dashboard if needed GitOrigin-RevId: 7175700f77501723f48763b9ee9397c0448d4109	2019-01-09 17:08:57 +00:00
James Allen	7ee0dcbd7c	Merge pull request #1377 from sharelatex/as-deemphasise-download-zip ... De-emphasise download zip button if not the primary action GitOrigin-RevId: 041c44109897c30ade9f5ed2ef47a416749a87a5	2019-01-09 17:08:52 +00:00
James Allen	b969526c19	Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs ... Handle UserStubs when linking projects with owners GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3	2019-01-09 13:41:06 +00:00
James Allen	1530062d00	Merge pull request #1370 from sharelatex/as-update-v1-tag-messaging ... Update messaging on v1 tags now that v1 dash is inaccessible GitOrigin-RevId: 4e2ca9e58ccf9b9feb2e94e92a310f8ce949184e	2019-01-09 13:40:55 +00:00
Henry Oswald	68a0ff08ea	Merge pull request #1366 from sharelatex/ho-bump-compile-size ... Bump compile size GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b	2019-01-08 16:37:00 +00:00
James Allen	563cdfd439	Merge pull request #1363 from sharelatex/as-gdpr-notice ... Add note about deleting a project if no owner to import status page GitOrigin-RevId: 3c88ab66b6e8c351c7111c87ba3b8d9df701bdb4	2019-01-08 13:02:19 +00:00
James Allen	8653a3d9cd	Merge pull request #1364 from sharelatex/ja-fix-user-stub-owner-imports ... Handle UserStubs for project owner GitOrigin-RevId: ab3d9edf6e44a7867285430c14c73b3e64fd4c04	2019-01-08 13:02:14 +00:00
Alasdair Smith	42cf6a1216	Merge pull request #1362 from sharelatex/as-fix-status-page ... Fixes for import status page GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12	2019-01-08 12:02:58 +00:00
Ersun Warncke	c303af5d4d	Merge pull request #1354 from sharelatex/ew-async-zip-download ... use async project history zip download api GitOrigin-RevId: 847e22eb3bf89e2e9e3c86bcc9ae92f8c90b25b1	2019-01-07 17:38:33 +00:00
James Allen	e624f697d2	Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes ... Handle import of zip files that include filenames with backslashes GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41	2019-01-07 11:33:35 +00:00
James Allen	1bddd03335	Merge pull request #1319 from sharelatex/ja-account-deletion-message ... Change account deletion message when v1 access is removed GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40	2019-01-07 11:33:30 +00:00
James Allen	47ab15c39f	Merge pull request #1318 from sharelatex/ja-hide-v1-dash-link ... Hide link back to v1 dash after we start force exporting to v2 GitOrigin-RevId: 1221bfc3d09224b09040604e0a3f6120d63d8946	2019-01-07 11:33:25 +00:00
James Allen	87b983ec6b	Merge pull request #1348 from sharelatex/as-tweak-import-status-page ... Tweak import status page GitOrigin-RevId: df30c354dfeb27828225f535e3bfab782212ee60	2019-01-07 11:33:19 +00:00
James Allen	12a2d71ac9	Merge pull request #1346 from sharelatex/ew-use-new-api-for-project-importing ... use different api to check if project is exporting GitOrigin-RevId: 720012669c833f7482be087ac9d588c354c45147	2019-01-07 11:33:14 +00:00
James Allen	0de359b70b	Merge pull request #1345 from sharelatex/ja-remove-git-warning ... Remove warning about no git bridge in import modal GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077	2019-01-04 16:33:49 +00:00
Alasdair Smith	9737a04125	Merge pull request #1338 from sharelatex/as-remove-import-modal ... Don't show project import modal if feature flag is set GitOrigin-RevId: f48d5e5cc795030d6c3332f5fde744d2e67f6366	2019-01-04 10:51:47 +00:00
Ersun Warncke	ccb9ae6317	Merge pull request #1337 from sharelatex/mm-f1000-realrevisionurl ... Real revisionURL for F1000 exports GitOrigin-RevId: 6a9284c36680824fcc0be3b2f926deff27cb7cf8	2019-01-03 18:33:28 +00:00
Ersun Warncke	985f0a97bc	Merge pull request #1332 from sharelatex/ew-block-while-project-importing ... block loading project while importing GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c	2019-01-03 18:14:19 +00:00
Simon Detheridge	c4d0cf9fd0	Merge pull request #1325 from sharelatex/ew-enable-collabratec-v2-for-all ... Enable collabratec v2 for all users GitOrigin-RevId: 586dccdcfee8f9d219838b73e0a217b0e10550b8	2019-01-03 15:25:26 +00:00
Simon Detheridge	ec1867198f	Merge pull request #1313 from sharelatex/as-import-copy ... Improved copy for import status page GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8	2019-01-03 12:19:35 +00:00
James Allen	df2dd2cb80	Merge pull request #1308 from sharelatex/spd-open-in-overleaf-form-character-encoding ... Open in Overleaf: Fix character-encoding problems when passing content via 'snip' parameter GitOrigin-RevId: d5d9faef8583696dfe7c94e4b5dfd88fc5bf6f4a	2019-01-03 10:20:55 +00:00
James Allen	6bcf209fab	Merge pull request #1306 from sharelatex/sk-take-git-bridge-out-of-beta ... Take git-bridge out of beta-program GitOrigin-RevId: ba95dcd1c818f11f44915ea3731d29aa50473622	2019-01-03 10:20:44 +00:00
Ersun Warncke	7bf860cde5	Merge pull request #1312 from sharelatex/ja-add-rate-limits ... Add rate limits to adding emails and changing password GitOrigin-RevId: e73c17985cc9c74d60f8856b3b47b28fecd0d489	2018-12-21 12:22:56 +00:00
Alasdair Smith	7112e65dc5	Merge pull request #1303 from sharelatex/project-import-refactor ... Project import refactor GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117	2018-12-20 12:06:15 +00:00
Shane Kilkelly	97e357f772	Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status ... Remove deprecated display of v1 team data in v2 GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d	2018-12-20 10:55:52 +00:00
Simon Detheridge	b0b87a7b6e	Merge pull request #1299 from sharelatex/spd-redirect-bypass-header ... Add support for header to allow bypass of redirects GitOrigin-RevId: 2d40c51c23809c19f0a053093e8ee0719a0190e2	2018-12-19 16:02:29 +00:00
Chrystal Maria Griffiths	2b556df43c	Merge pull request #1294 from sharelatex/mm-exportstatus-fields ... F1000 export fixes GitOrigin-RevId: 8f9a149cded8f204949750fc2788bc02223b84af	2018-12-19 10:38:29 +00:00
Ersun Warncke	bfeefe8406	Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects ... Support importing projects with collabratec users to v2 GitOrigin-RevId: 2dd3781dde158cdab6bf95138311224a032ab8a4	2018-12-18 15:14:37 +00:00
Douglas Lovell	740dce07a9	Merge remote-tracking branch 'origin/hb-publisher-management' ... GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad	2018-12-18 13:42:56 +00:00
Paulo Jorge Reis	e139abb110	Merge pull request #1273 from sharelatex/ja-password-reset-v1 ... Handle v1-only users in v2 password reset flow GitOrigin-RevId: 38ce8e9aebd3330b980e73640a23661d8015d4f3	2018-12-18 11:48:53 +00:00
Paulo Jorge Reis	4563ce864c	Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes ... History compare labels fixes GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3	2018-12-18 11:48:49 +00:00
Alasdair Smith	1160620afc	Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page ... Revert "Import status page" GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd	2018-12-17 15:45:36 +00:00
Alasdair Smith	56784c4089	Merge pull request #1240 from sharelatex/as-import-status-page ... Import status page GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a	2018-12-17 14:01:24 +00:00
Paulo Jorge Reis	d5c651c132	Merge pull request #1276 from sharelatex/pr-fix-history-v1 ... Undo rename and removal of the v1 history list controller. GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694	2018-12-17 12:16:20 +00:00
Paulo Jorge Reis	217bc180ac	Merge pull request #1251 from sharelatex/pr-history-labels-compare ... History labels compare GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c	2018-12-17 10:10:48 +00:00
Jessica Lawshe	7666c8a481	Merge pull request #1236 from sharelatex/jel-password-reset ... Reset password via API request to v1 GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6	2018-12-14 16:02:14 +00:00
Shane Kilkelly	a72b29efd8	Merge pull request #1259 from sharelatex/ja-sso-settings-link ... Add link from v2 settings page to manage linked accounts in v1 GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201	2018-12-13 15:09:59 +00:00
Shane Kilkelly	c423e483ba	Merge pull request #1256 from sharelatex/sk-file-upload-retry ... Add a retry around `FileStoreHandler.uploadFileFromDisk` GitOrigin-RevId: 2fc54036acdeda15c00a3d0222fd1a83683a5798	2018-12-13 15:09:48 +00:00
Ersun Warncke	362c1f64db	Merge pull request #1252 from sharelatex/ew-collabratec-upload-fix-v1-proxy ... upgrade to latest (forked) version of multer, proxy collabratec uploads GitOrigin-RevId: 682caf12a81ee828e544a5e3903ea49bbd173fe0	2018-12-13 13:09:26 +00:00
James Allen	3bc9ce995a	Merge pull request #1264 from sharelatex/hb-set-reversedHostname-on-user-create ... Set reversedHostname on user creation GitOrigin-RevId: 35ba4a5ae6aa792ee1c46e8b2b99d2e6ed00af17	2018-12-13 09:25:58 +00:00
James Allen	d0744d779e	Merge pull request #1233 from sharelatex/ja-owner-userstubs ... Allow importing projects by non-owners GitOrigin-RevId: b8e5597deef8229b22c5605965d246e6ed95d624	2018-12-13 09:25:45 +00:00
Timothée Alby	6e25c872e3	Merge pull request #1255 from sharelatex/ta-remove-teams-redirect ... Remove /teams Route GitOrigin-RevId: d520cae19fd41a1fbba7fb24dd67b5b9accce36f	2018-12-13 02:00:36 +00:00
Timothée Alby	4861a86a21	Merge pull request #1254 from sharelatex/ta-fix-error-log ... fix var name in error logging GitOrigin-RevId: 5cb11d033737faabb235101049f4c8c55e1f7600	2018-12-13 02:00:30 +00:00
Brian Gough	e42a3d1dc5	Merge pull request #1227 from sharelatex/spd-better-project-name-parsing ... Handle embedded commands when parsing project name from title GitOrigin-RevId: 09c1720897056a40d38b4f2f80f9d48caad4258b	2018-12-10 09:51:42 +00:00
Brian Gough	bed59cf8f6	Merge pull request #1223 from sharelatex/bg-fast-import ... parallelise file uploads for v1 project import GitOrigin-RevId: d4ae617b26e6d341bccd6202a1697a6ba3fc01ad	2018-12-10 09:51:38 +00:00
Shane Kilkelly	95b3724e36	Merge pull request #1206 from sharelatex/sk-git-bridge-migrated-projects ... GitBridge: If a project is migrated from v1, add a `migratedFromId` to get-doc response GitOrigin-RevId: 2ff3f4207b15ce811dd173e4fb44088e51a80d86	2018-12-06 14:09:20 +00:00
Shane Kilkelly	231d89477b	Merge pull request #1234 from sharelatex/ta-teamplate-without-brand-metrics ... Handle Access for Template Without Brands GitOrigin-RevId: f1127298fcede8075b31f6b1bc7161f474817a7e	2018-12-06 14:09:15 +00:00
Simon Detheridge	f3a10ac221	Merge pull request #1192 from sharelatex/ta-publisher-create ... Add Interface to Create Publishers GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46	2018-12-06 11:10:20 +00:00
Simon Detheridge	0097564754	Merge pull request #1220 from sharelatex/spd-open-in-overleaf-file-arrays ... Open in Overleaf: Add support for arrays of files GitOrigin-RevId: 5ef6d1ace6b7c6c041f2846f2f433b39fb137372	2018-12-06 11:10:08 +00:00
Jessica Lawshe	028ad9c05b	Merge pull request #1209 from sharelatex/jel-mobile-improvements ... Mobile improvements GitOrigin-RevId: 4b2fa8b1ab12b7ca23a0a64aeadea90f7cfc6f4d	2018-12-05 17:59:47 +00:00
Timothée Alby	fde672542e	Merge pull request #1193 from sharelatex/ta-template-metrics ... Template Metrics GitOrigin-RevId: 0a8648aec3a9446426c70cd8220bb1f776313303	2018-12-05 15:12:14 +00:00
James Allen	16e1980b41	Merge pull request #1225 from sharelatex/spd-ensure-zip-file-project-name-valid ... Ensure project names are valid when importing from zip GitOrigin-RevId: db36dde6d756e6577d7e89f9f50f76c40575a5f0	2018-12-05 12:32:36 +00:00
James Allen	12004962fb	Merge pull request #1221 from sharelatex/ew-collabratec-zip-upload-api ... collabratec zip upload api GitOrigin-RevId: cf93d47112404e9dcbecd723aa806fc213c057f3	2018-12-05 12:32:31 +00:00
James Allen	e603afe106	Merge pull request #1217 from sharelatex/ja-download-zip-version ... Add option to download zip file of version in history GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68	2018-12-05 12:32:26 +00:00
Ersun Warncke	28c934e8ff	Merge pull request #1194 from sharelatex/ew-collabratec-link-project-apis ... collabratec link/unlink apis, auth refactor GitOrigin-RevId: dc901494197334e87d3e6702c789654ccef5e56a	2018-12-04 11:38:57 +00:00
Jessica Lawshe	f02e3e604b	Merge pull request #1172 from sharelatex/jel-portal-templates-link ... Link to portal templates from project dash GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c	2018-12-03 19:13:45 +00:00
Simon Detheridge	3138919cb7	Merge pull request #1184 from sharelatex/spd-zip-project-name-from-tex-content ... zip upload: Read project name from title in zip contents GitOrigin-RevId: 27122674a0374f86a10c04485d787f4caaf21f5b	2018-12-03 11:20:44 +00:00
Simon Detheridge	b69cc6ce77	Merge pull request #1211 from sharelatex/ta-fetch-v1-data-log-errors ... Log Errors in fetchV1Data GitOrigin-RevId: 4b709430c2ad97ca369e93eaa4c4edf5ad7f3f52	2018-12-03 11:20:37 +00:00
Douglas Lovell	aae0484458	Merge branch 'master' into dcl-i1207 ... GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc	2018-11-30 13:24:27 +00:00
Douglas Lovell	ed3147a58f	Allow open from template button when lacking source ... GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a	2018-11-30 13:24:23 +00:00
James Allen	ee800f7448	Merge pull request #1176 from sharelatex/ja-manage-v1-subs ... Manage v1 subscriptions from v2 GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076	2018-11-30 10:43:37 +00:00
James Allen	1070cd36bb	Merge pull request #1163 from sharelatex/ja-zotero ... Add support for Zotero linked files GitOrigin-RevId: 917a881254949163126746667d6debc2a3f16941	2018-11-28 11:35:27 +00:00
Timothée Alby	dffb6bc7a2	Merge pull request #1187 from sharelatex/ta-publisher-membership ... Add Publisher Entity for UserMemberships GitOrigin-RevId: 862b1e4fe6d33b63ddfdaef47c02809c4558f9cc	2018-11-28 10:17:36 +00:00
Timothée Alby	be6950292d	Merge pull request #1190 from sharelatex/ta-team-importer-timeout-fix ... Team Importer Timeout Fix GitOrigin-RevId: 4951262e3eb980b45e3ba5785c1d17c58aa5009e	2018-11-28 10:17:30 +00:00
Simon Detheridge	05801085b0	Merge pull request #1185 from sharelatex/spd-better-unique-filenames ... Use numeric suffixes to disambiguate duplicate project names GitOrigin-RevId: 489b080d0514a33bbbf775095dd587f5e1a254a4	2018-11-26 16:53:42 +00:00
Simon Detheridge	50cba1a86f	Merge pull request #1153 from sharelatex/spd-open-in-overleaf-local-storage ... Use browser local storage instead of session for tex snippets GitOrigin-RevId: 9609dc882c37ccd2f58bf6d36ea851bbe746fa25	2018-11-26 16:53:31 +00:00
Timothée Alby	701ba90c7b	Merge pull request #1182 from sharelatex/ja-dashboard-metrics-links ... Add links to metrics and hubs for groups and institutions GitOrigin-RevId: ca83108e1d1541fdc805218ea12847b0d7a97cf8	2018-11-26 13:43:05 +00:00
Timothée Alby	210ebbeaf9	Merge pull request #1091 from sharelatex/ta-entity-authorization-refactor ... UserMembershipAuthorization Refactor GitOrigin-RevId: 055cebcd9298ed6dace081198f68491a000cf4a3	2018-11-26 13:42:58 +00:00
James Allen	38a2b9ee53	Merge pull request #1181 from sharelatex/ja-git-bridge-beta ... Open up v2 git bridge to beta users but only with v2 only projects GitOrigin-RevId: 0895a4636ca9dbffcb112c2b1459773303ecc2cd	2018-11-23 14:19:26 +00:00
Paulo Jorge Reis	794e6e146d	Merge pull request #1180 from sharelatex/pr-ieee-basic-styling-fixed ... IEEE basic styling fixed GitOrigin-RevId: 2f3fb3850435b52cea5228ac4a0dd2c1a874e36c	2018-11-22 15:32:58 +00:00
Paulo Jorge Reis	2f551922d6	Merge pull request #1179 from sharelatex/revert-1167-pr-ieee-basic-styling ... Revert "IEEE basic styling" GitOrigin-RevId: 1e473bddcfbc9b1a8aef6f4dd23ea3a716eddd71	2018-11-22 13:30:47 +00:00
Paulo Jorge Reis	41c12e2c52	Merge pull request #1167 from sharelatex/pr-ieee-basic-styling ... IEEE basic styling GitOrigin-RevId: 43a308fa8ce49d7b809b21fc95aefb41dcbaf46e	2018-11-22 11:11:34 +00:00
James Allen	2fbbdb25be	Merge pull request #1137 from sharelatex/as-allow-brand-variation-project-import ... Allow import of projects with brand variation GitOrigin-RevId: 3ede6d1e34a30c42698f9010ed31741cbc341305	2018-11-20 11:04:05 +00:00
James Allen	49e19cad64	Merge pull request #1162 from sharelatex/ja-show-group-management ... Add group and institution membership and management info to subscription dashboard GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60	2018-11-20 11:03:56 +00:00
James Allen	0f1c732d15	Merge pull request #1130 from sharelatex/ja-subscription-dashboard ... Refactor subscription dashboard GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c	2018-11-19 16:01:59 +00:00
Brian Gough	8bf9d79d2f	Merge pull request #1157 from sharelatex/jel-aria-hidden-fix ... Add value to aria-hidden attribute GitOrigin-RevId: 09b17a269b8d91c5f4b4e231877db0431b0308a9	2018-11-19 09:57:35 +00:00
Hugh O'Brien	b3a957b8d8	Merge pull request #1141 from sharelatex/hb-v2-institutional-hub ... v2 Institutional Hub GitOrigin-RevId: ff01ccf659a2369284a22deb79ca45433ca1a2e8	2018-11-16 09:19:06 +00:00
Hugh O'Brien	bcd7a740ec	Merge pull request #1154 from sharelatex/ta-display-institution-name ... display institution name on managment and metrics pages GitOrigin-RevId: 302bffee358d9d5090877ca833584f50afc0ff7b	2018-11-16 09:18:58 +00:00
Jessica Lawshe	dd41a50377	Merge pull request #1151 from sharelatex/jel-wiki-search-a11y ... Accessible Wiki Search GitOrigin-RevId: af9b5444fe1be1ced16f3049bfc1ac731c8bebd5	2018-11-15 17:41:27 +00:00
Jessica Lawshe	d97fe4e39d	Merge pull request #1142 from sharelatex/jel-img-alt-and-icon-alt-a11y ... Image alt tags and accessible icons GitOrigin-RevId: 58f0609682c0dbeec95cad4e234e3f94b7b3c004	2018-11-15 17:41:22 +00:00
Paulo Jorge Reis	af2d959504	Merge pull request #1072 from sharelatex/spd-open-with-overleaf ... Implement v1 open-with-overleaf API in v2 (part 1) GitOrigin-RevId: 488f4eeefc29086a72295ccbc7c63d2f927add12	2018-11-15 10:04:33 +00:00
Paulo Jorge Reis	4c9eee51df	Merge pull request #1114 from sharelatex/as-fix-sentry-reporting ... Fix Sentry reporting GitOrigin-RevId: 1bbe598b520fe9edb136a148cc57af63df77cec4	2018-11-15 10:04:23 +00:00
James Allen	8c70d680f4	Merge pull request #1145 from sharelatex/ew-collabratec-create-project2 ... Collabratec create project api GitOrigin-RevId: 5f421625baa5c48f1745a15e15fe3a18fc1a4884	2018-11-14 14:44:17 +00:00
James Allen	95f7d3da24	Merge pull request #1118 from sharelatex/as-upgrade-ace-1.2.9 ... Upgrade to Ace 1.2.9 GitOrigin-RevId: 8700f6decb530a0f0bbaefbe32a83893e8d91a90	2018-11-14 14:30:12 +00:00
Shane Kilkelly	81b09c7800	Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2 ... Enable git-bridge in v2 GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7	2018-11-14 11:29:35 +00:00
James Allen	140f97eb20	Merge pull request #1107 from sharelatex/ja-purchase-groups ... Purchase group/team accounts directly via app GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0	2018-11-13 13:50:46 +00:00
Chrystal Maria Griffiths	f1c8dcdf1e	Merge pull request #1127 from sharelatex/as-keep-tags-archive ... Keep tags when archiving project GitOrigin-RevId: 40b23895ef27a69500194cfc149a236ae615f271	2018-11-13 10:54:18 +00:00
Chrystal Maria Griffiths	c4201ab158	Merge pull request #1133 from sharelatex/hb-team-notice-admin ... Add team name and notice to v2 admin GitOrigin-RevId: 9f543a7be9beade2528f9ae378870aba93f99383	2018-11-13 10:54:01 +00:00
Chrystal Maria Griffiths	afbeec3b02	Merge pull request #1099 from sharelatex/ta-management-ui-title ... Management UI Wording Tweaks GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544	2018-11-13 10:53:56 +00:00
Chrystal Maria Griffiths	6ea0b9cf46	Merge pull request #1097 from sharelatex/hb-fix-institutions-callbacks ... Fix multiple callback and silent failures on institutions controller GitOrigin-RevId: 2883445a4d960e7aca2dfbab45b8e268437e4769	2018-11-13 10:53:50 +00:00
Ersun Warncke	efaa77dbd7	Merge pull request #1143 from sharelatex/robots-noindex ... Add noindex, nofollow to editor pages (read/write and read only) GitOrigin-RevId: b1bcd3c7203a0027d86aced3ea8371b077c4ac75	2018-11-09 23:55:43 +00:00
Ersun Warncke	59a849d46e	Merge pull request #1117 from sharelatex/ew-collabratec-project-metadata-api2 ... Collabratec project metadata api GitOrigin-RevId: 46f4b84bfb302f68c0a176a8a1686ce22829ba08	2018-11-09 09:11:53 +00:00
Ersun Warncke	de4f1a5abd	Merge pull request #1126 from sharelatex/mm-ensure-valid-rootdoc ... Ensure project's root doc is valid before exporting GitOrigin-RevId: 6f15955015097df9464267f458b8dbb126c22173	2018-11-09 08:26:24 +00:00
Jessica Lawshe	a18176b2fa	Merge pull request #1128 from sharelatex/jel-add-user-to-team-db-op ... Change database operator to add user to team GitOrigin-RevId: 0bf23c1f8958f74fa00a97559ebbf03e4edadfa6	2018-11-08 16:11:58 +00:00
Jessica Lawshe	fceb8e9e66	Merge pull request #1096 from sharelatex/jel-plans-mobile-layout ... Plans page mobile layout GitOrigin-RevId: d650447bd7df4eda17471c2fa7fb2b376fcc0172	2018-11-08 16:11:49 +00:00
Paulo Jorge Reis	49388c868b	Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui ... Editor cobranding UI GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5	2018-11-07 11:43:31 +00:00
Simon Detheridge	baa5574669	Merge pull request #1120 from sharelatex/spd-bonus-page-facebook-link ... Use asynchronous initialisation for Facebook API GitOrigin-RevId: 263817edcd8fee03d2d2bf62453e247f61128cdc	2018-11-07 10:37:13 +00:00
Ersun Warncke	f3b92bbeec	Collabratec Get Projects API (#1092) ... collabratec get projects api GitOrigin-RevId: c733aecf515cf75ca1ae9c454efa7a35f09cf495	2018-11-06 13:48:49 +00:00
Brian Gough	2ea0644cfa	Merge pull request #1082 from sharelatex/bg-fix-backslash-on-v1-and-template-import ... fix backslash on v1 and template import GitOrigin-RevId: 8410a80a06ef48610f7b18f4556bd073253d4eb7	2018-11-06 08:33:00 +00:00
Alasdair Smith	4733a7940d	Merge pull request #1100 from sharelatex/as-html-lang-attr ... Add lang attribute to html tag GitOrigin-RevId: ddc22ae6e742d9b501bac8d3c35d6640a7635b92	2018-11-05 14:17:47 +00:00
Jessica Lawshe	81f027b4c3	Merge pull request #1104 from sharelatex/jel-content-bg-color ... Lighten .content-alt background color GitOrigin-RevId: 3a1f73a469b1a2bb537a3f15722ce115f54e1ed0	2018-11-01 17:48:20 +00:00
Jessica Lawshe	ce9cdffaa2	Merge pull request #1106 from sharelatex/mm-enable-exports-for-collaborators ... Allow project collaborators with write access to submit/export GitOrigin-RevId: 13a0786c31aeccde6ca05d332fc3fbcfd11094e5	2018-11-01 17:48:15 +00:00
Jessica Lawshe	49acb719db	Merge pull request #1102 from sharelatex/mm-ensure-history-before-export ... Ensure project has history before exporting GitOrigin-RevId: 688131fbbca1cd339433d3b9be57a03a32303b3e	2018-11-01 17:48:09 +00:00
Ersun Warncke	365158f283	Merge pull request #1047 from sharelatex/ew-oauth-authorization ... add oauth middlewear GitOrigin-RevId: b68360763e1060fdbcbb4348d3d691a803fbfa41	2018-10-30 18:31:47 +00:00
Timothée Alby	0cfb765501	Merge pull request #1090 from sharelatex/spd-sharing-sl-sidebar ... Remove errant space before fullstop in 'sharing_sl' sidebar section GitOrigin-RevId: 449cce021feebe2e0454d3cd0d7f60dd3df95ea4	2018-10-30 14:38:32 +00:00
Timothée Alby	3c25fb2759	Merge pull request #1081 from sharelatex/ns-allow-ps-files ... allow for ps files fixes overleaf/sharelatex#1087 GitOrigin-RevId: dea77155d047becc3a8bad3a5958ad49969ec625	2018-10-30 14:38:26 +00:00
Timothée Alby	c32a891cc8	Merge pull request #1077 from sharelatex/ta-create-institution ... Create Institution When Confirming New Domain GitOrigin-RevId: c0f5f0edde558eed744e813d6edccfc1f5acf8f0	2018-10-30 14:38:11 +00:00
Timothée Alby	92582fdc38	Merge pull request #1076 from sharelatex/ta-ui-error-handling ... Management UI Error Handling GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647	2018-10-30 14:37:59 +00:00
Simon Detheridge	1a9bb5f4eb	Merge pull request #1088 from sharelatex/ta-fix-entity-id-scope ... Fix Scope Bug in Group Access Control GitOrigin-RevId: 7d2cb5fc08e0c7e4bd1b70c03b62620bb7dd8d41	2018-10-30 10:16:25 +00:00
Simon Detheridge	c18ca779ba	Merge pull request #1073 from sharelatex/spd-bonus-page-ui ... Add links and update UI for Bonus page GitOrigin-RevId: e993d4b7dc59f5ea145892e9cddb87f2193ae013	2018-10-30 10:16:20 +00:00
Douglas Lovell	b1bda995a6	Merge branch 'deploy-20181029a' ... GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf	2018-10-29 15:01:41 +00:00
Brian Gough	207b0d84c7	Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error ... handle failure in parallel copy GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41	2018-10-29 13:57:02 +00:00
Brian Gough	707a258d5b	Merge pull request #1040 from sharelatex/bg-start-history-in-v2-for-old-projects ... allow creating v2 history for existing project without v2 history GitOrigin-RevId: 2ccbe55f5c203c37d37be00306de5e265555f909	2018-10-29 13:56:55 +00:00
Timothée Alby	3d94be22b1	Merge pull request #1065 from sharelatex/ta-manage-group-members ... Manage Group Members GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9	2018-10-25 15:26:00 +00:00
Timothée Alby	aa549dd0d4	Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group ... Remove addUserToGroup Action GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1	2018-10-25 15:25:55 +00:00
Timothée Alby	aff47a4b11	Merge pull request #1062 from sharelatex/ta-metric-authorization ... Use UserMembership Authorization Middlewear for Metrics GitOrigin-RevId: a145527723539696c2659baa16c507ab54f629a3	2018-10-25 15:25:50 +00:00
Timothée Alby	2421e15d7a	Merge pull request #1060 from sharelatex/ja-remove-v2-banner ... Remove unneeded v2 banner GitOrigin-RevId: 972afc2bd07ab64b0dd558cf1f15c0272f575b87	2018-10-25 15:25:35 +00:00
Alasdair Smith	27fd090075	Merge pull request #1064 from sharelatex/as-fix-500-on-teams ... Fix 500 on /teams route GitOrigin-RevId: 9f554f9b77fb7fea64db1ad9c4d8635f47efff9e	2018-10-25 12:51:18 +00:00
Timothée Alby	7af86b0704	Merge pull request #1045 from sharelatex/bg-fix-missing-next-in-subscription-group-controller ... fix missing next argument GitOrigin-RevId: 290741a98a3fb7463d6a6dd052f90c8ffe4e62ce	2018-10-24 14:03:02 +00:00
Timothée Alby	b123f830ff	Merge pull request #1042 from sharelatex/ta-user-membership-access ... User Membership Access Refactor GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd	2018-10-24 14:02:55 +00:00
Brian Gough	d75d8ee079	Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes ... check the filetype before syncing file GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e	2018-10-23 13:16:30 +00:00
Simon Detheridge	8b55643f7e	Merge pull request #1030 from sharelatex/spd-bonus-program ... Implement bonus program GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8	2018-10-23 11:36:17 +00:00
Jessica Lawshe	7a03fbeb06	Merge pull request #1018 from sharelatex/jel-track-changes-info-page ... Styling for track changes info page and add existence checks for metadata GitOrigin-RevId: 86a6b178e8107c75ef5b877acc1aaa3d8d1ebd80	2018-10-19 14:12:30 +00:00
Paulo Jorge Reis	6dd9680af8	Merge pull request #1036 from sharelatex/pr-fix-i18n-breaking-layout ... Fix single-quotes breaking layout directive	2018-10-19 11:30:59 +01:00
Paulo Reis	00a489a000	Fetch brand variation details for branded projects; inject details into the editor page front-end. ... Test brand variation details. Rename BrandVariationsController to BrandVariationsHandler. Use the V1 API helper. Do not swallow errors when fetching brand details for project load. Fix indentation.	2018-10-19 10:47:02 +01:00
Paulo Reis	a957593b62	Avoid adding custom toggler attributes when the feature flag is false.	2018-10-19 10:34:07 +01:00
Paulo Reis	4232732646	Avoid using Angular eval for user-provided strings in the layout directive.	2018-10-19 10:00:52 +01:00
Brian Gough	c6ec31c773	Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names ... avoid duplicate project names for templates and zips	2018-10-18 13:51:05 +01:00
Simon Detheridge	6ad16c9406	Merge pull request #1028 from sharelatex/spd-no-github-for-new-users ... retry: Don't add old v1 features for new accounts	2018-10-17 14:51:46 +01:00
Brian Gough	ad6b3a625a	use generateUniquename to create names with timestamps	2018-10-16 14:43:40 +01:00
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	0f54bc2c52	Add additional tests for V1SubscriptionManager ... One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call. bug: overleaf/sharelatex#1014	2018-10-16 10:15:42 +01:00
Simon Detheridge	6fc6c44605	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-16 09:45:16 +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
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
Brian Gough	a640397052	make project names unique for zip uploads and template imports	2018-10-15 09:33:39 +01:00
Brian Gough	59cf0aa3cb	fix bug in call to findAllUsersProjects	2018-10-15 09:33:39 +01: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
Hugh O'Brien	b825f0b267	Merge branch 'master' into hb-v2-affiliations-callback	2018-10-11 17:14:35 +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
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
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
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
Tim Alby	48e5c6b523	add UserMembership logic	2018-10-09 12:09:11 +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
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
Simon Detheridge	e66210d2af	Add method to sanitize full paths ... For convenience, add a method to SafePath to break a path into components and verify the status of each one. bug: overleaf/sharelatex#908 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-08 14:48:17 +01:00
Simon Detheridge	50993f59c0	Merge pull request #926 from sharelatex/dcl-i850 ... Display password change form in Account Settings	2018-10-08 13:59:04 +01:00
Simon Detheridge	9c189303c1	Merge pull request #1002 from sharelatex/spd-email-cta-links ... Add additional CTA link to emails	2018-10-08 13:56:21 +01:00
Simon Detheridge	af9c9517f3	Merge pull request #999 from sharelatex/as-validate-password-length ... Validate password length	2018-10-08 13:55:25 +01:00
hugh-obrien	f6307f9086	store reversedHostname property and update test accordingly	2018-10-08 13:37:12 +01:00
hugh-obrien	3919acad46	store reversed hostname and review fixes for v2 university domain confirmation	2018-10-08 12:08:29 +01:00
Jessica Lawshe	b78f362c53	Merge pull request #1000 from sharelatex/jel-meta-img-src ... Handle image_src in metadata layout	2018-10-08 11:44:10 +01:00
Jessica Lawshe	f04212c96f	Merge pull request #995 from sharelatex/ta-remove-confirmed-field ... remove unused confirmed field from user model	2018-10-08 11:43:42 +01:00
Alasdair Smith	e129172553	Fix ordering of boolean check to be more readable	2018-10-08 11:25:24 +01:00
Alasdair Smith	04572f61bb	Fix copy/paste error	2018-10-08 10:44:26 +01:00
Alasdair Smith	676557a051	Refactor to validate in AuthenticationManager	2018-10-08 10:44:25 +01:00
Alasdair Smith	44c86b3769	Refactor to use password strength options	2018-10-08 10:44:25 +01:00
Alasdair Smith	bf60fe7f6c	Add error handling for InvalidError	2018-10-08 10:44:25 +01:00
Alasdair Smith	e99165b475	Validate password length when registering	2018-10-08 10:44:25 +01:00
Hugh O'Brien	cc962c3e6f	Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal ... Generic Zip or Pdf Exports endpoint	2018-10-08 10:13:18 +01:00
hugh-obrien	65ecdf84f4	cleanup and tests for v2 affiliations confirmation	2018-10-07 16:40:26 +01:00
hugh-obrien	af3cc01496	Lookup users by email hostname using new field	2018-10-06 17:22:39 +01:00
hugh-obrien	026f7eebcd	Setting up hostname field and institution domain confirmation endpoint	2018-10-06 15:57:25 +01:00
Simon Detheridge	286f25529a	Remove secondary CTA link from account merge confirmation email ... bug: sharelatex/web-sharelatex-internal#987 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-05 13:19:05 +01:00
Simon Detheridge	d316a76106	Revert "add plain text link to email address confirmation emails" ... This reverts commit 48cd7e604dcc5f3b7ae8eb699f14b44bc073f107.	2018-10-05 13:16:42 +01:00
Simon Detheridge	a2ef0e1ae5	Add additional CTA link to emails ... Some mail clients don't show the CTA button correctly, or at all. Add an additional, smaller link to the bottom of the email for people who can't see the button. bug: sharelatex/web-sharelatex-internal#987 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-05 12:04:00 +01:00
Chrystal Griffiths	d51549c4f0	Use ng-if to switch between pdf and editor	2018-10-05 11:19:20 +01:00
Jessica Lawshe	6692d06e5f	Handle image_src in metadata layout ... The CMS is already using `image`, which is an object based on data from the API.	2018-10-05 11:06:21 +01:00
Shane Kilkelly	4c2a90966a	Merge pull request #918 from sharelatex/sk-enable-sudo-mode-in-v2 ... Enable sudo-mode for v2	2018-10-05 10:05:24 +01:00
Simon Detheridge	2b8ce379f8	Lookup correct compiler when importing v1 templates ... bug: overleaf/sharelatex#981 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-04 16:42:03 +01:00
Shane Kilkelly	2c47da553b	Add an error log if activating sudo-mode on login fails	2018-10-04 15:05:40 +01:00
Shane Kilkelly	778abaff6e	Remove stray log	2018-10-04 15:05:40 +01:00
Shane Kilkelly	2ef23194df	WIP: trying to get acceptance tests to pass	2018-10-04 15:05:40 +01:00
Shane Kilkelly	f9ed367148	Move the auth mechanism for sudo-mode into SudoModeHandler	2018-10-04 15:05:40 +01:00
Shane Kilkelly	254d74899b	WIP: enable sudo-mode for v2	2018-10-04 15:05:40 +01:00
Chrystal Maria Griffiths	6b8eb0ac23	Merge pull request #996 from sharelatex/jel-meta-img ... Update default meta images	2018-10-04 15:01:19 +01:00
Chrystal Maria Griffiths	e932eb074b	Merge pull request #992 from sharelatex/as-fix-mathjax ... Fix mathjax incorrectly loading config	2018-10-04 15:01:05 +01:00
Chrystal Griffiths	13843f82a0	Use settings appName	2018-10-04 09:57:51 +01:00
Jessica Lawshe	bbe847c16d	Update default meta images ... Favicons are not picked up by social sites.	2018-10-03 17:34:40 +01:00
Tim Alby	5ff66187a0	remove unused confirmed field from user model	2018-10-03 16:01:30 +01:00
Ersun Warncke	752658f773	Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api ... Use v1 Doc Info API for Token Access	2018-10-03 09:22:41 -04:00
Timothée Alby	e3cfa36b56	Merge pull request #984 from sharelatex/ta-email-cta-link ... add plain text link to email address confirmation emails	2018-10-03 14:20:05 +01:00
Timothée Alby	c74c782cee	Merge pull request #961 from sharelatex/ta-account-sync-affiliations ... Add getInstitutionsPlan Function	2018-10-03 14:19:56 +01:00
Alasdair Smith	fb8ed890f9	Correctly load Safe mathjax extention using provided config	2018-10-03 11:52:33 +01:00
Brian Gough	ecdd00ecb9	Merge pull request #980 from sharelatex/jel-viewport-metatag ... Add viewport metatag	2018-10-03 10:10:22 +01:00
Brian Gough	2b738907aa	Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error ... clean up broken project on error in ProjectDuplicator	2018-10-03 10:04:30 +01:00
Ersun Warncke	642b45d0d6	use v1 doc info api	2018-10-02 11:16:46 -04:00
Douglas Lovell	4a846e4d87	Merge branch 'master' into dcl-i850	2018-10-02 16:04:39 +01:00
Alasdair Smith	f90dd1b49a	Merge pull request #986 from sharelatex/as-sign-in-from-v2-post ... Remove POST /docs custom handler, now handled by redirects	2018-10-02 14:06:57 +01:00
Brian Gough	4621234220	clean up broken project on error in ProjectDuplicator	2018-10-02 12:14:22 +01:00
Jessica Lawshe	96b4f7edb3	Use viewport metatag on SL pw reset	2018-09-28 15:22:24 -05:00
Jessica Lawshe	40bc5564b6	Use viewport metatag on SL login	2018-09-28 15:14:05 -05:00
Jessica Lawshe	297f61da04	Add viewport metatag	2018-09-28 14:16:32 -05:00
Alasdair Smith	062f26dda3	Remove POST /docs custom handler, now handled by redirects ... Implementing a system for signing into v1 via v2 using POSTs so the unauthenticated route is no longer necessary	2018-09-28 14:11:38 +01:00
Tim Alby	4e9737bf71	add plain text link to email address confirmation emails	2018-09-28 13:36:31 +01:00
Alasdair Smith	1330c8da73	Also check if v1 project exported if not found for read-only tokens	2018-09-28 11:47:14 +01:00
Alasdair Smith	435fe11115	Check if v1 project was exported if not found ... This prevents a redirect loop for projects which were exported but then deleted on v2. v2 would not find the project, redirect to v1, which would find that it was exported and redirect back to v2.	2018-09-28 11:47:14 +01:00
Brian Gough	6d5908f2f4	Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email ... Don't include the license name twice in invite emails	2018-09-28 11:15:40 +01:00
Brian Gough	1f6abd4e69	fix invalid project names when opening templates	2018-09-28 10:38:25 +01:00
Brian Gough	8f8694ad94	iterate over owned projects in a more robust way	2018-09-28 09:48:15 +01:00
Brian Gough	6b80d3563d	add support for creating unique project names	2018-09-28 09:48:15 +01:00
Alasdair Smith	45bd46bc01	Merge pull request #977 from sharelatex/as-encode-auth-with-v1-query-strings ... Encode redirects which will auth with v1 first	2018-09-28 09:45:54 +01:00
hugh-obrien	52859cdfaa	make the zip fetching endpoint for exports generic to either zips or pdfs	2018-09-27 16:11:11 +01:00
Alasdair Smith	4f2c91a59a	Add new redirect option to auth with v1, which will urlencode the query string ... This is necessary for the GET /docs endpoint, which can be used to send urls as part of query parameters. If these are not encoded before redirecting, they can become corrupted.	2018-09-27 12:19:16 +01:00
James Allen	0cb563816d	Don't enable legacy blog in v2	2018-09-27 10:56:14 +01:00
Alasdair Smith	c2ecccfa02	Use correct setting	2018-09-26 17:35:55 +01:00
Alasdair Smith	f2fa83a218	Fix /teams redirect using wrong setting	2018-09-26 17:04:40 +01:00
Alasdair Smith	9c0a888d11	Add custom redirect for /docs ... We want to redirect POST and GET to different locations, but this is unsupported by RedirectManager. Therefore we redirect GETs with RedirectManager and POSTs with this custom route.	2018-09-26 17:04:40 +01:00
Ersun Warncke	7b90fcb186	Merge pull request #969 from sharelatex/ew-check-doc-token-access ... check access for doc on read only token	2018-09-25 08:35:56 -04:00
Ersun Warncke	eeed857dd9	change api path	2018-09-25 06:45:27 -04:00
Ersun Warncke	f0c0834b0f	only do v1 access check when api config present	2018-09-25 05:42:04 -04:00
Paulo Reis	b8baf1a6f4	Hide front chat widget via code.	2018-09-25 10:30:13 +01:00
James Allen	1d657e1700	Merge pull request #968 from sharelatex/ja-show-register-button ... Show register button on OL v2	2018-09-25 10:25:38 +01:00
James Allen	e2f90ba01a	Merge pull request #966 from sharelatex/as-no-project-token-based ... Redirect logged out users to v1 if project is not found from token based url	2018-09-25 10:25:30 +01:00
Alasdair Smith	298ee2dbb4	Fix v1 return to path	2018-09-25 10:06:24 +01:00
Alasdair Smith	ca895ae1b1	Redirect to v1 via sign in link	2018-09-25 09:37:22 +01:00
Brian Gough	89ba3912c0	Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads ... Replace ShareLaTeX with Overleaf in name of multiple project download file	2018-09-25 09:33:53 +01:00
Brian Gough	5947294016	Merge branch 'bg-support-main-file-for-templates'	2018-09-25 09:32:14 +01:00
Brian Gough	0d4143205d	strip quotes from mainFile	2018-09-25 09:05:49 +01:00
James Allen	19b97e953f	Show register button on OL v2	2018-09-25 08:29:34 +01:00
Ersun Warncke	f89e85231a	check access for doc on read only token	2018-09-24 18:03:28 -04:00
Alasdair Smith	d6350c963e	Remove projectExists flag from higher access check ... Now that find project by read and read/write token methods check whether the project exists, it is not neccessary to check whether the project exists in the higher access check. Therefore it has been removed	2018-09-24 19:00:10 +01:00
Alasdair Smith	99dec02266	If no project found for read/write token, redirect to v1	2018-09-24 19:00:10 +01:00
Alasdair Smith	237810509a	If no project found for read token, redirect to v1	2018-09-24 19:00:10 +01:00
Christopher Hoskin	5c35cc9593	Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963)	2018-09-24 16:33:54 +01:00
Brian Gough	418bc10a18	allow getting doc paths by project id	2018-09-24 16:04:23 +01:00
Brian Gough	586e3814fe	add missing require	2018-09-24 15:27:16 +01:00
Brian Gough	2692090f3f	support a mainFile parameter for templates	2018-09-24 15:27:16 +01:00
Tim Alby	51c5228288	add getInstitutionsPlan function	2018-09-24 13:16:31 +01:00
Douglas Lovell	bfb369fab0	Merge branch 'master' into dcl-i850 ... Conflicts repaired: app/views/user/settings.pug modified: app/coffee/Features/Authentication/AuthenticationController.coffee modified: app/coffee/Features/Editor/EditorHttpController.coffee modified: app/coffee/Features/Email/EmailBuilder.coffee modified: app/coffee/Features/Errors/Errors.coffee modified: app/coffee/Features/Exports/ExportsController.coffee modified: app/coffee/Features/Exports/ExportsHandler.coffee modified: app/coffee/Features/Notifications/NotificationsBuilder.coffee modified: app/coffee/Features/Notifications/NotificationsHandler.coffee modified: app/coffee/Features/Project/ProjectController.coffee modified: app/coffee/Features/StaticPages/HomeController.coffee modified: app/coffee/Features/Subscription/planFeatures.coffee modified: app/coffee/Features/TokenAccess/TokenAccessController.coffee modified: app/coffee/Features/TokenAccess/TokenAccessHandler.coffee modified: app/coffee/Features/User/UserGetter.coffee modified: app/coffee/infrastructure/RedirectManager.coffee modified: app/coffee/infrastructure/Server.coffee modified: app/coffee/models/User.coffee modified: app/coffee/router.coffee modified: app/views/_mixins/links.pug modified: app/views/general/500.pug modified: app/views/layout/navbar.pug modified: app/views/project/editor/header.pug modified: app/views/project/editor/share.pug modified: app/views/project/list.pug modified: app/views/project/list/modals.pug modified: app/views/project/list/notifications.pug modified: app/views/project/list/side-bar.pug modified: app/views/project/list/v1-item.pug modified: app/views/subscriptions/_modal_group_inquiry.pug modified: app/views/subscriptions/dashboard.pug modified: app/views/user/settings.pug modified: config/settings.defaults.coffee modified: npm-shrinkwrap.json modified: package.json new file: public/apple-touch-icon.png new file: public/atlassian-domain-verification.html modified: public/coffee/ide/editor/directives/aceEditor.coffee modified: public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee modified: public/coffee/ide/share/controllers/ShareController.coffee modified: public/coffee/main.coffee deleted: public/coffee/main/account-merge-checker.coffee modified: public/coffee/main/contact-us.coffee modified: public/coffee/main/project-list/left-hand-menu-promo-controller.coffee new file: public/google4f15e48c48709a75.html new file: public/googleef256f97939bd9b7.html new file: public/img/advocates/friend.jpeg new file: public/img/grid.png new file: public/img/homepage.png new file: public/img/homepage@2x.png new file: public/img/other-brands/logo_google.svg new file: public/img/other-brands/logo_google_alt.svg new file: public/img/other-brands/logo_ieee.svg new file: public/img/other-brands/logo_orcid.svg new file: public/img/other-brands/logo_orcid_alt.svg new file: public/img/other-brands/logo_sharelatex.svg new file: public/img/other-brands/logo_twitter.svg new file: public/img/overleaf-partner/overleaf-greygreen-410.png new file: public/img/overleaf-partner/overleaf-white-410.png new file: public/static/brochures/Overleaf-Information-v8.pdf new file: public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf new file: public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf new file: public/static/brochures/Overleaf-request-for-service.pdf new file: public/static/brochures/Overleaf_Institutional.pdf new file: public/static/campus-challenge/campus-challenge-2016-flyer.pdf new file: public/static/campus-challenge/campus-challenge-2016-poster.pdf new file: public/static/campus-challenge/campus-challenge-2017-flyer.pdf new file: public/static/campus-challenge/campus-challenge-2017-poster.pdf new file: public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf new file: public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf new file: public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf new file: public/static/partners/caltech-library.gif new file: public/static/partners/stanford-building.jpg modified: public/stylesheets/_ol_style_includes.less modified: public/stylesheets/app/blog-posts.less modified: public/stylesheets/app/cms-page.less new file: public/stylesheets/app/content_page.less modified: public/stylesheets/app/editor/share.less modified: public/stylesheets/app/editor/toolbar.less modified: public/stylesheets/app/features.less modified: public/stylesheets/app/homepage.less new file: public/stylesheets/app/login-register.less modified: public/stylesheets/app/plans.less modified: public/stylesheets/app/portals.less modified: public/stylesheets/app/templates-v2.less modified: public/stylesheets/app/wiki.less modified: public/stylesheets/components/alerts.less modified: public/stylesheets/components/buttons.less modified: public/stylesheets/components/icons.less new file: public/stylesheets/components/images.less new file: public/stylesheets/components/tabs.less modified: public/stylesheets/core/_common-variables.less modified: public/stylesheets/core/ol-variables.less modified: public/stylesheets/ol-style.less modified: test/acceptance/coffee/ExportsTests.coffee new file: test/acceptance/coffee/RedirectUrlsTests.coffee modified: test/acceptance/coffee/TokenAccessTests.coffee modified: test/acceptance/coffee/helpers/User.coffee modified: test/acceptance/config/settings.test.coffee modified: test/unit/coffee/Authentication/AuthenticationControllerTests.coffee modified: test/unit/coffee/Editor/EditorHttpControllerTests.coffee modified: test/unit/coffee/Exports/ExportsControllerTests.coffee modified: test/unit/coffee/Exports/ExportsHandlerTests.coffee new file: test/unit/coffee/Notifications/NotificationsBuilderTests.coffee modified: test/unit/coffee/Project/ProjectControllerTests.coffee modified: test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee modified: test/unit/coffee/User/UserGetterTests.coffee deleted: test/unit/coffee/infrastructure/RedirectManagerTests.coffee	2018-09-24 09:11:48 -03:00
hugh-obrien	5f4a36ca26	remove debug line	2018-09-24 10:49:01 +01:00
hugh-obrien	c0b32f031e	force gallery items to use legacy OL v1 texlive image	2018-09-24 10:49:01 +01:00
Alasdair Smith	b6c794f627	Ensure brand prefixed favicon is used	2018-09-21 15:44:36 +01:00
Alasdair Smith	945894e89e	Reset showNavItem bool if fails check	2018-09-21 12:53:57 +01:00
James Allen	772ac42005	Fix messed up rebase	2018-09-21 10:42:20 +01:00
Alasdair Smith	3462b8042e	Add /chrome redirect to match v1 behaviour	2018-09-21 10:35:43 +01:00
James Allen	2d9cadb487	Merge pull request #935 from sharelatex/as-teams-redirect ... Add route to handle /teams similar to v1	2018-09-21 08:37:10 +01:00
Jessica Lawshe	bfcb91e60f	Hide content page links in nav when on dash	2018-09-20 11:16:18 -05:00
Jessica Lawshe	488886c1d2	Merge pull request #929 from sharelatex/jel-homepage ... Add Homepage	2018-09-20 09:01:13 -05:00
Jessica Lawshe	d2af2fb630	Merge pull request #927 from sharelatex/jel-plans-updates ... Plans page updates	2018-09-20 09:00:58 -05:00
Jessica Lawshe	d023150b0f	Add v2 homepage ... Specific homepage filenames and redirect to login when not found Move variables to shared file Move circle image styling to shared file Leaving float on plans page because of some layout differences	2018-09-20 08:57:07 -05:00
Hugh O'Brien	8805447bb9	Revert "Add notification to confirm unconfirmed emails"	2018-09-19 12:28:39 +01:00
Douglas Lovell	98be2c2bf5	Update wording and endpoint for change password form	2018-09-19 07:58:04 -03:00
Hugh O'Brien	b377b89447	Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails ... fix exception when user has no emails field	2018-09-19 11:33:03 +01:00
Hugh O'Brien	78ad6e7e5c	Merge pull request #915 from sharelatex/hb-affiliation-cta ... Replace profile completion CTA with affiliations CTA	2018-09-19 11:32:55 +01:00
Hugh O'Brien	18e706c4b2	Merge pull request #917 from sharelatex/hb-confirm-email-notification ... Add notification to confirm unconfirmed emails	2018-09-19 11:32:44 +01:00
Shane Kilkelly	e1c3689aec	Update the email-merge email template	2018-09-19 09:28:59 +01:00
Shane Kilkelly	2ec7747b60	Add a help link to the account-merge email in case of error	2018-09-19 09:28:59 +01:00
Shane Kilkelly	c95d925d56	When regenerating session, don't copy the __tmp key	2018-09-19 09:28:59 +01:00
Shane Kilkelly	c9e3418049	Working overleaf-side of account-merge	2018-09-19 09:28:59 +01:00
Shane Kilkelly	fcfcbdb4c5	Remove dead code	2018-09-19 09:28:59 +01:00
Shane Kilkelly	d0be98e89c	Move the account-merge-finish page to the integration module	2018-09-19 09:28:59 +01:00
Shane Kilkelly	677b3c759d	Remove old controller	2018-09-19 09:28:59 +01:00
Shane Kilkelly	843f1c6b35	Move AccountMergeEmailController to integration module	2018-09-19 09:28:59 +01:00
Shane Kilkelly	54a5c563fb	Address feedback	2018-09-19 09:28:59 +01:00
Shane Kilkelly	b0e4b12714	Finish off the copy of the account-merge-finish page	2018-09-19 09:28:59 +01:00
Shane Kilkelly	5e17dfd1cb	Also add the final email to the array of emails on the account	2018-09-19 09:28:59 +01:00
Shane Kilkelly	efb6018246	Add a rate-limit to the email-confirm endpoint	2018-09-19 09:28:59 +01:00
Shane Kilkelly	6cfe68db26	Roughly working account-merge-by-email callback endpoint	2018-09-19 09:28:59 +01:00
Shane Kilkelly	958c7a19b6	Add a skeleton of a callback endpoint for merging accounts via email	2018-09-19 09:28:59 +01:00
Shane Kilkelly	ba221a1135	WIP: add email-based account merge flow to ShareLaTeX	2018-09-19 09:28:59 +01:00
Alasdair Smith	bdcc25805e	Add route to handle /teams similar to v1	2018-09-18 17:14:37 +01:00
Brian Gough	02854274a7		2018-09-18 14:09:05 +01:00
Douglas Lovell	4abbc5d569	Password change form conditioned on installation	2018-09-18 09:10:33 -03:00
hugh-obrien	277225d8de	use existing left sidebar controller for affiliation cta	2018-09-18 13:06:26 +01:00
Timothée Alby	b16cffe587	Merge pull request #932 from sharelatex/as-redirect-query-string ... Support passing through query params in redirects	2018-09-18 12:35:21 +01:00
Timothée Alby	b6925647ef	Merge pull request #922 from sharelatex/ta-forbid-null-query ... Prevent Calls to UserGetter.getUser with Null Query	2018-09-18 12:24:19 +01:00
Timothée Alby	7981d867e8	Merge pull request #924 from sharelatex/ta-sign-in-v1 ... Change Links to v1 to Sign User In	2018-09-18 12:24:08 +01:00
Alasdair Smith	7e358ab318	Support passing through query params	2018-09-18 11:34:04 +01:00
hugh-obrien	2d40c3d21a	Use existing notification styling	2018-09-18 11:01:10 +01:00
hugh-obrien	f76ff55b6f	email alert styling	2018-09-18 10:54:20 +01:00
hugh-obrien	e343c04423	add notification to confirm unconfirmed emails	2018-09-18 10:54:20 +01:00
hugh-obrien	6f00d1f45a	send required export fields for s1 submission	2018-09-18 10:05:35 +01:00
Jessica Lawshe	203c005f26	Merge pull request #928 from sharelatex/jel-content-updates ... Link mixin paths and universities list styling	2018-09-17 13:16:52 -05:00
Jessica Lawshe	6fc7468b02	Thousands of templates	2018-09-17 10:47:57 -05:00
Jessica Lawshe	4f5c12e9ac	More specific group contact controller name and email subject ... This form is only used on the group contact modal.	2018-09-17 10:47:57 -05:00
Jessica Lawshe	66bfbce45f	Correct link mixin paths	2018-09-17 09:46:34 -05:00
James Allen	15103ac894	Support the same URL with multiple methods in redirects	2018-09-17 15:38:58 +01:00
James Allen	40f08d1592	Add additional functionality to RedirectManager	2018-09-17 15:38:45 +01:00
Chrystal Maria Griffiths	784984dd78	Merge pull request #923 from sharelatex/cmg-share-modal ... Show share button for collaborators	2018-09-17 15:19:44 +01:00
Alasdair Smith	42cef8e393	Merge pull request #920 from sharelatex/mm-gallery-exports ... Add gallery fields to export controller and handler	2018-09-17 09:42:26 +01:00
Alasdair Smith	e1e7091f30	Merge pull request #905 from sharelatex/as-project-intelligent-redirect ... Intelligently redirect to v1 if no v2 project found	2018-09-17 09:40:52 +01:00
Douglas Lovell	7d10e64840	Alter endpoint for account settings, change password form submission.	2018-09-14 16:19:02 -03:00
Tim Alby	09c92c0b69	don't encode /	2018-09-14 16:09:24 +01:00
Tim Alby	2e4d3d7aab	change links to v1 to sign user in first	2018-09-14 14:26:16 +01:00
Tim Alby	41b92d4647	prevent calls to UserGetter.getUser with null query	2018-09-14 12:46:00 +01:00
Chrystal Griffiths	6334066d2d	Merge branch 'master' into cmg-share-modal	2018-09-14 12:09:10 +01:00
Chrystal Griffiths	915bd18058	Read-only collaborators table	2018-09-14 11:47:18 +01:00
Michael Mazour	79dc415064	Slightly refactor exports controller body handling ... 1. Move all body parsing together 2. Remove `firstName && lastName` condition, which duplicates one present in the Handler.	2018-09-14 11:02:51 +01:00
Michael Mazour	10fcdd6daf	Add optional gallery fields to export request ... Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.	2018-09-14 11:02:51 +01:00
Chrystal Griffiths	3b43cf9075	Slight copy change	2018-09-13 17:57:11 +01:00
Tim Alby	0051e59309	remove unused call to UserGetter.getUser	2018-09-13 17:39:30 +01:00
Chrystal Griffiths	b51fc01bde	Remove temporary solution	2018-09-13 17:17:18 +01:00
James Allen	ef11161ddb	Revert "Record and show last modified by user for projects"	2018-09-13 14:00:30 +01:00
hugh-obrien	26defd0833	reword CTA	2018-09-13 13:54:43 +01:00
hugh-obrien	8697edc149	replace profile completion CTA with affiliationa adding CTA	2018-09-13 12:34:18 +01:00
Chrystal Griffiths	57ac858004	Style the notice	2018-09-13 12:19:44 +01:00
Alasdair Smith	f37040e4a4	Only redirect if has overleaf setting	2018-09-13 12:09:19 +01:00
Alasdair Smith	8a969d1c25	Redirect directly from controller instead of via handler	2018-09-13 12:09:19 +01:00
Alasdair Smith	9d600afdf8	Fix failing tests for token access ... If project was changed from token access to private, then we want to 404 on v2 (not redirect to v1). So the logic was changed to check if the project exists and if it does then a 404 is returned. If it does not then it redirects to v1.	2018-09-13 12:09:19 +01:00
Alasdair Smith	24495f3340	Also redirect not found read tokens to v1	2018-09-13 12:09:19 +01:00
Alasdair Smith	e0ce988d32	Intelligently redirect to v1 if no v2 project found for token	2018-09-13 12:09:19 +01:00
James Allen	5dbebc0693	Translate 'by'	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
Brian Gough	6d54e843e8	fix typo in Errors, only two underscores in __proto__	2018-09-12 10:45:50 +01: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
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
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
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	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
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
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
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	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
Paulo Reis	4ff7410391	Disable the review button when history is open.	2018-08-31 17:10:15 +01:00
Paulo Reis	f88a3815c6	Add loading spinner when cloning a project.	2018-08-31 16:14:20 +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	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	c1d37a712c	Update translations to use appName	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
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
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	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	a5d84ecc0a	Merge pull request #842 from sharelatex/jel-portals-user-affiliation ... Add dashboard link mixin	2018-08-29 12:23:50 -05:00
Paulo Reis	79f1e7b0ee	Update ui-select value as the user types.	2018-08-29 17:31:47 +01: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
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
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
Paulo Reis	0df5c61c44	Add a placeholder restore button, showing a tooltip.	2018-08-28 21:35:35 +01: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
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	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
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
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
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	7c95de29cd	Avoid breaking the page if isnt set.	2018-08-24 12:06:26 +01: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
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