Simon Detheridge
|
68c16dcb73
|
Merge pull request #2263 from overleaf/spd-revert-revert
Revert "Revert "Merge pull request #2249"
GitOrigin-RevId: 70b0da473e923a072aeca1cc146c82e460757747
|
2019-10-18 16:41:37 +00:00 |
|
Simon Detheridge
|
123f74da72
|
Merge pull request #2227 from overleaf/ns-title-rename-overlap
fix title rename overlap with online collaborators
GitOrigin-RevId: ccb5065a73e3e8e4079d14e029d57c302f9fc0cb
|
2019-10-18 16:41:29 +00:00 |
|
Simon Detheridge
|
2c147f575c
|
Merge pull request #2206 from overleaf/sk-restricted-users-redux
Update the joinProject api to include isRestrictedUser flag
GitOrigin-RevId: 38988b5c886e5355edc2edcd834ae6e334fc9f10
|
2019-10-18 16:41:24 +00:00 |
|
Simon Detheridge
|
8a46a385f7
|
Merge pull request #2241 from overleaf/ta-file-preview-footer
Move File Preview Footer to Header
GitOrigin-RevId: b6c8d09f82520ceaebf0c6ee414445e4487e8894
|
2019-10-18 16:41:19 +00:00 |
|
Brian Gough
|
e502b80116
|
Merge pull request #2259 from overleaf/bg-revert-session-merge
Revert "Merge pull request #2249 from overleaf/bg-create-session-vali…
GitOrigin-RevId: d2114ecea0708dc109d5c9256e9dccb011a1b62c
|
2019-10-18 16:41:12 +00:00 |
|
Brian Gough
|
bc8ccf26c7
|
Merge pull request #2249 from overleaf/bg-create-session-validation-token-for-all-sessions
move session validation into SessionStoreManager
GitOrigin-RevId: 438ec738f0ccaf9f072629d6203a334cb8439b83
|
2019-10-18 08:42:35 +00:00 |
|
Jessica Lawshe
|
5d3c125ffb
|
Merge pull request #2043 from overleaf/bg-preserve-undo-in-rich-text
preserve the undo flag in rich text
GitOrigin-RevId: 3c7b770d9aa41daf76783333db6beb99f1156c9a
|
2019-10-17 16:29:19 +00:00 |
|
Jessica Lawshe
|
34c04660a6
|
Merge pull request #2250 from overleaf/jel-saml-session-email
Non canonical institution email in session
GitOrigin-RevId: b70971f6f42391391a42ba6ff214c14a275461d3
|
2019-10-17 16:29:13 +00:00 |
|
Jessica Lawshe
|
93c0180d31
|
Merge pull request #2243 from overleaf/pr-fix-2388
Prevent scrolling the dashboard background element.
GitOrigin-RevId: ba5b245d1a96bb27466a996c837ecb6463e46eb2
|
2019-10-17 16:29:07 +00:00 |
|
Jessica Lawshe
|
1fa4621219
|
Merge pull request #2247 from overleaf/bg-fix-unit-tests-for-transfer-ownership
add stub for EmailHandler in unit tests
GitOrigin-RevId: 1841d42e68dea07fbc37919974149365e3df5e07
|
2019-10-17 16:29:00 +00:00 |
|
Ersun Warncke
|
0cc7783ad2
|
pr fixes
GitOrigin-RevId: 8bbe27be51951304673a21e7ba6cd1e7cef1ea60
|
2019-10-17 14:10:25 +00:00 |
|
Ersun Warncke
|
d59d8dddad
|
sso bailout pages
GitOrigin-RevId: e0e39268227896660a02d8b74cd00249bdf431eb
|
2019-10-17 14:10:19 +00:00 |
|
Alasdair Smith
|
6a2b3a39a9
|
Merge pull request #2248 from overleaf/as-fix-cjk-prod
Disable CDN for PDFjs cmaps path
GitOrigin-RevId: 52658564f22f94b7bd9893c499c5c58429a360d0
|
2019-10-16 16:29:04 +00:00 |
|
Alasdair Smith
|
9cf73f965c
|
Merge pull request #1440 from overleaf/as-amd-webpack
Bundle all frontend code with webpack
GitOrigin-RevId: 1bd93dad516c456fe1649193868e841e20459b0b
|
2019-10-16 10:36:21 +00:00 |
|
Jessica Lawshe
|
e27577bd5b
|
Merge pull request #2231 from overleaf/jel-institution-sso-link-error
Add SSO error handling for when identifier linked
GitOrigin-RevId: e2bfa4dba896767d985476ecb78fcee86512a381
|
2019-10-15 16:22:37 +00:00 |
|
Eric Mc Sween
|
2603597150
|
Merge pull request #2221 from overleaf/em-ownership-transfer-emails
Project ownership transfer emails
GitOrigin-RevId: 3d33147c18e2d652976b3dac7453c0407c81314e
|
2019-10-15 13:30:10 +00:00 |
|
Eric Mc Sween
|
6f966ceb3d
|
Merge pull request #2239 from overleaf/em-collabs-frontend
Change collaborator permissions
GitOrigin-RevId: 3627181d201e6d96734f89a380703953424f0fdf
|
2019-10-15 13:30:00 +00:00 |
|
Eric Mc Sween
|
cc1de97df8
|
Merge pull request #2235 from overleaf/ta-recurly-subscription-callbacks
Sync Recurly Subscriptions on New and Updated Events
GitOrigin-RevId: 597a7cb529d8c872693aae20cdb81a8edb1b7778
|
2019-10-15 13:29:53 +00:00 |
|
Eric Mc Sween
|
2011189dc4
|
Merge pull request #2200 from overleaf/ho-add-noindex-option
adds settings.robotsNoindex setting to stop robots indexing site
GitOrigin-RevId: 0c2c3aee215dd3ef1cca8cde4e0693a4bd39c6ef
|
2019-10-15 13:29:47 +00:00 |
|
Eric Mc Sween
|
0e6b455ab0
|
Merge pull request #2194 from overleaf/ho-res-send-status
use sendStatus for status codes, prevents errors in logs
GitOrigin-RevId: 98613a3c894a01eb9112fa9472403caeeae45bc2
|
2019-10-15 13:29:40 +00:00 |
|
Eric Mc Sween
|
750a4879e7
|
Merge pull request #2228 from overleaf/ns-title-overflow
allow line breaks to happen
GitOrigin-RevId: d4255739d17969dbfa514e841bf21c738dbf9020
|
2019-10-14 18:01:53 +00:00 |
|
Eric Mc Sween
|
33d1f603df
|
Merge pull request #2226 from overleaf/spd-clearprojectokens
Add script to clear tokens from a specific project
GitOrigin-RevId: a810e2b7fe2e34efb937bffc0e39c409076daa23
|
2019-10-14 13:38:07 +00:00 |
|
Eric Mc Sween
|
9a492257af
|
Merge pull request #2220 from overleaf/jel-email-confirmation
Email confirmation only for non-institution SSO emails
GitOrigin-RevId: 95bd0ce077031c11b9d60d2f736a1abe7431a265
|
2019-10-14 13:37:57 +00:00 |
|
Eric Mc Sween
|
526d4982a1
|
Merge pull request #2219 from overleaf/jel-institution-email-already-exists
Check for email before adding institution identifier
GitOrigin-RevId: 71f498116c8c8df2c3c1a33eafce3e56c87e7ee0
|
2019-10-14 13:37:50 +00:00 |
|
Eric Mc Sween
|
ed7b5a9450
|
Merge pull request #2218 from overleaf/as-eslint-globals
Move around eslint globals
GitOrigin-RevId: 81144a0b763159b9425aff673211c07ec65b3be5
|
2019-10-14 13:37:42 +00:00 |
|
Brian Gough
|
7db9e73ecf
|
Merge pull request #2234 from overleaf/bg-avoid-event-loop-metrics-during-startup
start event loop monitoring when the process is ready
GitOrigin-RevId: 0a7759311b737e99579f61cc4cf90b775c26b76d
|
2019-10-14 09:43:03 +00:00 |
|
Brian Gough
|
3a4981cbb8
|
Merge pull request #2233 from overleaf/bg-upgrade-ioredis
upgrade to ioredis-4.14.1 via redis-sharelatex-1.0.11
GitOrigin-RevId: f6b20e95b03121682db902b80ffb3650d5517011
|
2019-10-14 09:01:08 +00:00 |
|
Brian Gough
|
75facb159d
|
Merge pull request #2225 from overleaf/bg-validate-sessions
validate the session with a token derived from the sesionid
GitOrigin-RevId: d34a5bb1717a97138e11e7661f7288523199e0e2
|
2019-10-11 10:16:47 +00:00 |
|
Brian Gough
|
48b58899f7
|
Merge pull request #2224 from overleaf/bg-fix-use-of-parseint
fix setting for zero values
GitOrigin-RevId: e6037c6e9940421acea730fdc088d4cf230fdb11
|
2019-10-11 10:16:41 +00:00 |
|
Brian Gough
|
9edb95b706
|
Merge pull request #2223 from overleaf/spd-redis-retries
Add maxRetriesPerRequest redis setting
GitOrigin-RevId: 69810e40eaedaf05d9e3397b59b26ea43ecbe9ce
|
2019-10-10 14:00:59 +00:00 |
|
Brian Gough
|
d376047c20
|
Merge pull request #2222 from overleaf/bg-invalidate-tokens
invalidate tokens
GitOrigin-RevId: b8a65846d2b671f7f7b8a2ab75f76bb8255bd73b
|
2019-10-10 11:39:18 +00:00 |
|
Jessica Lawshe
|
625b4c9339
|
Merge pull request #2216 from overleaf/jel-saml-beta-account-settings
Allow SAML beta testing on Account Settings
GitOrigin-RevId: 6a2c60a3cbab3d9d0cdcc72e23f5d75f7702f89c
|
2019-10-09 13:13:40 +00:00 |
|
Ersun Warncke
|
849f21fde3
|
add saml acceptance tests. get/set entitlement.
GitOrigin-RevId: 65721aadb91678eafaf5a214a2921fe3dd276efa
|
2019-10-08 13:29:32 +00:00 |
|
Jessica Lawshe
|
de8ac8ace7
|
Move add email function
GitOrigin-RevId: f45e28a9ed357427ae606ad5f8b59acaef54e31b
|
2019-10-08 13:29:23 +00:00 |
|
Jessica Lawshe
|
5c918bed94
|
Adding an institution email that must be linked
GitOrigin-RevId: 9ba42a07fb386275cf6d81a7d4b91a7f974faf15
|
2019-10-08 13:29:17 +00:00 |
|
Jessica Lawshe
|
ae423b5800
|
SAML feature by special link
Allows for testing SAML linking before release
GitOrigin-RevId: 8a8c01aa15f04ba1749e93f4feadb7bf1643c783
|
2019-10-08 10:52:30 +00:00 |
|
Jessica Lawshe
|
bf42f6c5b5
|
Update feature check
GitOrigin-RevId: 82ad7be9f619b03f4d02f39c37940b2040c11030
|
2019-10-08 10:52:24 +00:00 |
|
Ersun Warncke
|
3a7384c83f
|
new UserHelper class for acceptance tests
GitOrigin-RevId: 194593b8b70c74d2771f8e6f695faa47c84beeca
|
2019-10-08 08:58:12 +00:00 |
|
Jessica Lawshe
|
61d895c8fc
|
Merge pull request #2210 from overleaf/jel-provider-id-institution-registration
Include provider ID with email data for institution registrations
GitOrigin-RevId: a752005c03494bab717be0cbb915cbcb7a0aa729
|
2019-10-07 15:41:56 +00:00 |
|
Jessica Lawshe
|
e20c93b581
|
Merge pull request #2203 from overleaf/jel-registration-institution-sso
Registration request with an institution email
GitOrigin-RevId: c544d8af4f6ca91addb638e02e9fe26acad7fbdb
|
2019-10-07 15:41:47 +00:00 |
|
Eric Mc Sween
|
45e5808a35
|
Merge pull request #2202 from overleaf/em-collab-set-permissions
Endpoint for setting a collaborator's permissions
GitOrigin-RevId: eb4d4dcc476908f5a42fefd7b81ef6fcc000be5b
|
2019-10-07 12:29:00 +00:00 |
|
Timothée Alby
|
17babc034f
|
Merge pull request #2204 from overleaf/ta-recurly-countries
Update Countries To Use Recurly's Countries List
GitOrigin-RevId: e6465af0bf4574f0bd45fc790f154d7a5ec1d889
|
2019-10-07 08:46:47 +00:00 |
|
Timothée Alby
|
4c055637a4
|
Merge pull request #2205 from overleaf/ta-replace-loadash-map
Replace Lodash's Map with Native Array's Map
GitOrigin-RevId: 17dac98c39e55b68a60fb0a61708a650e088853a
|
2019-10-07 08:46:41 +00:00 |
|
Timothée Alby
|
5f107374a6
|
Merge pull request #2195 from overleaf/em-collab-permissions
Move collaborators code to async/await
GitOrigin-RevId: 55b5dd8154d024e2cee738208c45a8139870b92b
|
2019-10-07 08:46:36 +00:00 |
|
Timothée Alby
|
b050de1645
|
Merge pull request #2208 from overleaf/ta-handle-express-uri-error
Handle Express URIError
GitOrigin-RevId: 6f22110971c8bdb1a7a2e5ba7043c37348b9092e
|
2019-10-07 08:46:30 +00:00 |
|
Simon Detheridge
|
6c005da303
|
Merge pull request #2201 from overleaf/hb-relative-path-fix
Handle double slash case of safe redirect paths
GitOrigin-RevId: fb6e8ea9d736a65df61f07d563235262b8aaf0f3
|
2019-10-04 14:21:52 +00:00 |
|
Jessica Lawshe
|
4cce43b8d2
|
Merge pull request #2198 from overleaf/ta-user-membership-template-graph-fix
New Approach to Template Graph Access Fix
GitOrigin-RevId: 5865d8cfaf6f825f8cb76724a04091f3659f9f0f
|
2019-10-03 14:35:13 +00:00 |
|
Jessica Lawshe
|
d8e6535691
|
Merge pull request #2184 from overleaf/jel-unlink-institution-and-email-notifications
Unlink institution login and send email link/unlink notifications
GitOrigin-RevId: d0fe96804d69e3c332c2b866fad5af026b5e2f8f
|
2019-10-03 14:34:58 +00:00 |
|
Jessica Lawshe
|
ea0270dbdd
|
Merge pull request #2168 from overleaf/pr-restrict-main-file-options
Restrict main file options based on extension.
GitOrigin-RevId: f7d7a61c0454621dd8bc6ab5edce8a89721018ea
|
2019-10-03 14:34:41 +00:00 |
|
Jessica Lawshe
|
6737637b39
|
Merge pull request #2190 from overleaf/as-invalid-password-errors
Throw Error instead of plain object if email/password is invalid
GitOrigin-RevId: 2a1b040b07834064d547cef7890676ca014ec0ae
|
2019-10-02 14:22:34 +00:00 |
|