github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
8861 commits 3 branches 7 tags 199 MiB
Commit graph

5177 commits

Author SHA1 Message Date
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