Commit graph

8390 commits

Author SHA1 Message Date
Alasdair Smith
56839ae6fb Merge pull request #1797 from overleaf/msm-disable-spellcheck-on-readonly
Disabled spell checker on read-only

GitOrigin-RevId: fff76f8fae5ea9c3035902b2abf1c7c54ad556bf
2019-05-28 11:25:33 +00:00
Alasdair Smith
a3bcc71df9 Merge pull request #1807 from overleaf/as-global-sinon-chai
Globally load sinon-chai

GitOrigin-RevId: b0175e021b98d6338171108c6778de80ee58479a
2019-05-28 11:25:26 +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
d999cd5030 Merge pull request #1810 from overleaf/jel-sso-unlink
Include CSRF token in POST request

GitOrigin-RevId: 9371993971e81ad3f7301427d1a5ed7be5bb1a01
2019-05-28 09:33:37 +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
45f3f74d0b Merge pull request #1811 from overleaf/ns-code-check-fail-invisible
check for light theme to set autocompile status color

GitOrigin-RevId: d77cbb965ccb0bd05cd237717e29ebe0e1d68681
2019-05-28 09:33:22 +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
deb9e656a9 Merge pull request #1801 from overleaf/ew-module-unit-test
add ability to unit test a single module

GitOrigin-RevId: 584708066dea3c8d6afa1483953bbae252b48fa7
2019-05-23 13:25:39 +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
759392047d Merge pull request #1789 from overleaf/as-fix-reference-search-cut-off
Fix reference search hint cutting off last suggestion

GitOrigin-RevId: a8b3e32e1173b27602b0576c1b00afcc1cbf7683
2019-05-21 13:39:23 +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
8c2da6afab Merge pull request #1673 from overleaf/jel-cms-table-style
Styling for features table

GitOrigin-RevId: a8c37cf9bcda7c93d3d910036cd08f3cba06209e
2019-05-20 16:10:56 +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
02c4edcb1c Merge pull request #1780 from overleaf/sk-script-remove-password-fields
Add a script to remove `hashedPassword` fields from non-sl user records

GitOrigin-RevId: d7c6fdbc138d4c5452e6e3a7f2ad639f049f122f
2019-05-20 12:18:40 +00:00
Paulo Jorge Reis
3486f61b5b Merge pull request #1784 from overleaf/revert-1782-pr-as-ace-diagnostics
Revert "Ace diagnosis"

GitOrigin-RevId: db782b4df6d3f2d773eb063b6b1e498875126dfb
2019-05-17 10:19:07 +00:00
Alasdair Smith
1ec05a0fab Merge pull request #1782 from overleaf/pr-as-ace-diagnostics
Ace diagnosis

GitOrigin-RevId: 5a4c1d49887594686f810fedc06266bdbb7175c5
2019-05-17 08:55:44 +00:00
Simon Detheridge
e06a68ace6 Merge pull request #1779 from overleaf/spd-update-shrinkwrap
Update npm-shrinkwrap

GitOrigin-RevId: 93fc86aea307a0e631aebb03a0779862813d1eff
2019-05-16 10:59:59 +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
Simon Detheridge
6a45be9ccd Merge pull request #1773 from overleaf/ew-create-backing-accounts-for-sl-users
Create backing accounts for sl users

GitOrigin-RevId: d7400ace3d26b7f5e3314ba2a9dcbbb32edc424a
2019-05-16 10:59:48 +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
Brian Gough
c7ce214f8c Merge pull request #1770 from overleaf/ns-tags-and-tikz
handle math in \tag* and \tikz commands

GitOrigin-RevId: 6a71100409f405d58e04d12403acd3f4f24360c7
2019-05-15 12:41:26 +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
Jessica Lawshe
77de78e70b Merge pull request #1771 from overleaf/jel-new-file-controller-scope
Pass in missing scope to NewFileModalController

GitOrigin-RevId: 41de974c8ff93bb41d42ef2d17e0c0732ba12ffb
2019-05-14 15:58:49 +00:00
Jessica Lawshe
7763427cea Merge pull request #1761 from overleaf/jel-trial-impression-collab
Send event on collaborator trial impression event

GitOrigin-RevId: f19feaf2a00ef5728d7a190f0736efe76e417230
2019-05-14 13:12:38 +00:00
Jessica Lawshe
59cce6b52e Merge pull request #1752 from overleaf/jel-trial-impression-events
Send event on mendeley/zotero trial impression

GitOrigin-RevId: a308afd063e11308297be48933ad308d9120c327
2019-05-14 13:12:32 +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