Commit graph

9304 commits

Author SHA1 Message Date
Timothée Alby
0c9bf05a0a Merge pull request #2139 from overleaf/ta-subscription-restore-misc
Restore Deleted Subscriptions Extra

GitOrigin-RevId: 6fceb1142af8ba510dc266ef31acc86ddca69f0e
2019-09-10 14:44:18 +00:00
Timothée Alby
71060e8d57 Merge pull request #2123 from overleaf/ta-subscription-restore
Restore Deleted Subscriptions

GitOrigin-RevId: 4df1d2116e5502235e06f47d7317d97ad458b75b
2019-09-10 14:28:55 +00:00
Hugh O'Brien
911a2ded4d Merge pull request #2133 from overleaf/hb-fix-lost-connection-typo
Adding space in reconnection error

GitOrigin-RevId: 76ec0e999fafcddc47301e1f39a2d63db1a12eae
2019-09-10 10:09:06 +00:00
Hugh O'Brien
a319073a08 Merge pull request #2132 from overleaf/spd-collabratec-tests
Make collabratec tests not depend on previous run state

GitOrigin-RevId: 264f946e05b848fa253b6fbdd8e97a4998e4158e
2019-09-10 10:08:59 +00:00
Jessica Lawshe
4defd2b6b5 Render account linking page
Simplify account linking data. Change `institution.name` to `institutionName`

Update emailAlreadyLinked value. The layout checks for 'primary' and 'secondary', not a boolean, so update data passed

Add error messages to Account Linking pages

Rename account linking file name to reflect route change. Changed `institution` to `institutional` on the login route.

GitOrigin-RevId: 4e12b9ec7c1577efbaa8c0628e3c41c70114844e
2019-09-09 14:48:22 +00:00
Eric Mc Sween
abae7ef2a3 Merge pull request #2113 from overleaf/em-project-details-handler-async
Move ProjectDetailsHandler to async/await

GitOrigin-RevId: 5ec9343d6203850641174cc728db9a2e56f44775
2019-09-09 12:05:38 +00:00
Eric Mc Sween
797595bb1a Merge pull request #2128 from overleaf/em-clsi-error-logs
Avoid logging document content in failed compile

GitOrigin-RevId: 7ca296ccb28d814b9fa5610c0ee065e4614875a6
2019-09-09 12:05:32 +00:00
Eric Mc Sween
d0fc8d90e5 Merge pull request #2119 from overleaf/ta-subscription-deletion
Store Deleted Subscriptions

GitOrigin-RevId: c7004f1807dee6b6ec82eeb2a8fe939801ce3e8b
2019-09-09 12:05:23 +00:00
Miguel Serrano
bc233e6eba Restored Sharelatex Template publishing UI (#2137)
GitOrigin-RevId: b322130a64baa93602ef5a8e79f1cefdff32feb1
2019-09-09 08:45:46 +00:00
Miguel Serrano
08f8bbce9b Update 'affiliations' feature flag to support Server Pro (#2127)
GitOrigin-RevId: 93633994e052badf73b48e5b10971ea6257503ac
2019-09-09 08:45:39 +00:00
Timothée Alby
294ce1a13c remove dead code around syncUserToSubscription (#2122)
GitOrigin-RevId: d489365a4bceb9d675e6a75b25be61baa3aa010e
2019-09-04 11:45:24 +00:00
Miguel Serrano
dc6e4b3a12 Added missing email field when registering user token (#2130)
GitOrigin-RevId: f7aaeae1f82e0188c838d7d1d975a81664950f78
2019-09-04 11:17:15 +00:00
Miguel Serrano
7c68947100 Added public/src/ide/index.js to launchpad module (#2112)
GitOrigin-RevId: b5d77547546e6e5c2997b162fc78ac75c891382f
2019-09-03 15:25:44 +00:00
Brian Gough
7d9fe92f28 Merge pull request #2120 from overleaf/bg-fix-rate-limit
Revert "Add a rate limit to the `/project` page"

GitOrigin-RevId: 1bcd88e03a4cea2defbd4779bc81d0d972f1cd4e
2019-09-03 15:25:38 +00:00
Simon Detheridge
b57adcf02a Merge pull request #2107 from overleaf/spd-max-recon-interval
Shrink MAX_RECONNECT_GRACEFULLY_INTERVAL to 45 seconds

GitOrigin-RevId: f84983b772d0dde5fc76d9439a3424cefb66ec06
2019-09-03 15:25:32 +00:00
Simon Detheridge
e69b66fac3 Merge pull request #2117 from overleaf/spd-joinproject-ratelimit
Increase editor join-project rate limit

GitOrigin-RevId: 4d0d210e9d69804184765cad89cc3f67e0c482b7
2019-09-03 15:25:27 +00:00
Shane Kilkelly
6c6d8ba373 Merge pull request #2110 from overleaf/ta-affiliations-feature
make affiliations feature depend on the existence of v1 API

GitOrigin-RevId: 0050c2f338eaab254583f4547630694725d90463
2019-09-03 15:25:21 +00:00
Shane Kilkelly
84de1af960 Merge pull request #2108 from overleaf/sk-add-rate-limit-to-project-page
Add a rate limit to the `/project` page

GitOrigin-RevId: ef77f092c94c6a88fc73354cee6b8572b84d3d3a
2019-09-03 15:25:13 +00:00
Eric Mc Sween
869fcf7952 Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe
Handle error on Mailchimp unsubscribe when deleting users

GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b
2019-09-03 15:25:01 +00:00
Eric Mc Sween
3791b8d288 Merge pull request #2104 from overleaf/ta-user-membership-acceptance-tests
Acceptance Tests for UserMembership Authorization

GitOrigin-RevId: caad99727fd2fedc91f2b2063ed83a1e02d9ea1d
2019-09-03 15:24:53 +00:00
Chrystal Maria Griffiths
6f2b4d3da3 Merge pull request #2081 from overleaf/cmg-per-user-trash
Add per-user trashed state to project model

GitOrigin-RevId: 16a753702d3503eee011dd2adca5dc8df3da87f4
2019-08-27 10:50:05 +00:00
Chrystal Maria Griffiths
c1f8ac8de1 Merge pull request #2090 from overleaf/hb-fix-daterangepicker
Cleanup Metrics Daterange Picker

GitOrigin-RevId: ae5ef24c5b7f007f5bdd38ecebea2d0830611b71
2019-08-27 10:49:57 +00:00
Chrystal Maria Griffiths
1335d21136 Merge pull request #2097 from overleaf/em-chai-spies
Remove chai-spies

GitOrigin-RevId: 7fa41fe32c1be985d761b7327950995d6afe7c4e
2019-08-27 10:49:50 +00:00
Timothée Alby
03460ba229 Merge pull request #2020 from overleaf/ta-recurly-sca
SCA Integration

GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1
2019-08-22 12:10:46 +00:00
Miguel Serrano
b90d07fc6f Replace sharelatex logo with Overleaf in launchpad (#2088)
GitOrigin-RevId: 3649630ea69d2e4b2e21ca1da94895fd3e75b2da
2019-08-22 11:07:55 +00:00
Eric Mc Sween
95f9a08768 Merge pull request #2033 from overleaf/ns-em-add-english-dialects
add languages config to default settings

GitOrigin-RevId: 12f89c21e3bcca3e2fb72f032b1264060531950b
2019-08-20 13:00:07 +00:00
Eric Mc Sween
358cd22f54 Merge pull request #2087 from overleaf/subscription-invoices-link
Add Link to Invoices for Recurly Subscriptions

GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7
2019-08-20 12:59:58 +00:00
Eric Mc Sween
25970e94da Merge pull request #2078 from overleaf/update-closed-message
Reference status page from maintenance page

GitOrigin-RevId: 6ddda6e479d78d38be3c23ff7e82cd23e07059cb
2019-08-20 12:59:52 +00:00
Eric Mc Sween
1fc64fc4e2 Merge pull request #2084 from overleaf/ta-new-subscription-country
Fix Country Auto-Selection on New Subscription Form

GitOrigin-RevId: fdf7b197017ee9ce527dd7737240756ff16d206a
2019-08-20 12:59:47 +00:00
Eric Mc Sween
ced31d6131 Merge pull request #2055 from overleaf/jel-sso-layouts
Layouts for login, register, institutional log in, & linking pages

GitOrigin-RevId: af0ea36e3bd6e39b0a6305bf0882c296eb931d5b
2019-08-20 12:59:41 +00:00
Eric Mc Sween
0e8866f651 Merge pull request #2079 from overleaf/ta-institution-new-licences
Add Routing for New Licences Metrics Graph

GitOrigin-RevId: 9e7def383d257db1eef03b1224b4b5fef376427c
2019-08-20 12:59:36 +00:00
Eric Mc Sween
4d69b63993 Merge pull request #2070 from overleaf/pr-fix-light-drag-and-drop
Change hover highlights and draggable helper when moving files

GitOrigin-RevId: b7a6e9cd1484115fa5fbf1ed40127a6aba525cbd
2019-08-20 12:59:30 +00:00
Alasdair Smith
c5da705fa0 Use babel-eslint for parsing (#2073)
Eslint's default parser cannot handle some newer es6+ syntax (e.g.
dynamic import() function). Babel-eslint uses babel for parsing instead
which can handle the newer syntax

GitOrigin-RevId: 0a5666ac3bdc3c0885842dcdbc6f6d3b4dbf2d4b
2019-08-19 15:20:06 +00:00
Miguel Serrano
9a8a182c1b Fix UserGetter email retrieval with affiliations disabled (#2085)
GitOrigin-RevId: f868333f3c18f674b7ba9c387315c2d5ad1fd80b
2019-08-19 15:19:57 +00:00
Miguel Serrano
8c55989166 Create User.emails field for newly created users in launchpad (#2083)
GitOrigin-RevId: b6cfad25eeba21294f70769e11c3e3fa825f93aa
2019-08-19 15:19:51 +00:00
Miguel Serrano
9386bdeaff Delete copybara sync server pro (#2082)
This actually reverts https://github.com/overleaf/web-internal/pull/2052

GitOrigin-RevId: c282655cf29533e8cb523f854247bd37396b1346
2019-08-16 14:27:30 +00:00
Miguel Serrano
e8790a638c affiliations flag checks Settings.overleaf (#2080)
GitOrigin-RevId: c0dc5a8c1e6ad6c5ddb055ccfc21c901d66a9827
2019-08-15 14:00:24 +00:00
Brian Gough
9833f1ec93 Merge pull request #2060 from overleaf/spd-linkedfiletests-nondependent
Refactor and clean up LinkedFileTests to not be dependent on previous run

GitOrigin-RevId: 199a4ab6b463b2248244a067c765078816da182b
2019-08-14 15:19:40 +00:00
Brian Gough
b591c950e0 Merge pull request #2077 from overleaf/bg-fast-reconnect-for-websocket
handle 'retry' messages from realtime

GitOrigin-RevId: a896b491f978e37a4afef67e434795b0f7cd301c
2019-08-14 15:19:35 +00:00
Henry Oswald
87605d835e Merge pull request #2075 from overleaf/ho-setting-doc-log-level
downgrade log of no root doc to log to reduce noise

GitOrigin-RevId: f729f44b46704a26a8bcd808e64a239a0da38107
2019-08-14 15:19:29 +00:00
Eric Mc Sween
df2d46b332 Merge pull request #2074 from overleaf/em-o-error
Introduce OError in CLSI manager

GitOrigin-RevId: 4299de10a21242be4a127e761720de48f587412b
2019-08-13 12:50:25 +00:00
Eric Mc Sween
29dec409d6 Merge pull request #2072 from overleaf/as-fix-local-lint
Fix linting locally

GitOrigin-RevId: eeb6dab09f3e3f7208ea104e7ceecd3d0e29564b
2019-08-13 12:50:05 +00:00
Eric Mc Sween
1bb9d2f944 Merge pull request #2049 from overleaf/jel-cms-decaf-cleanup
CMS eslint and post decaf cleanup

GitOrigin-RevId: 67d98668f0b9c1d8f973116dc689486ef418a3fd
2019-08-13 12:49:46 +00:00
Eric Mc Sween
72ea7eb5f0 Merge pull request #1992 from overleaf/pr-history-file-selection-improvements
History file selection and scrolling improvements

GitOrigin-RevId: e5f31eca07a72b25245f8883aec1664c320c0788
2019-08-13 12:49:32 +00:00
Simon Detheridge
6defe1a693 Make tests in RegistrationTests not depend on previous run state
GitOrigin-RevId: 68bcf9530ec6f5831c67449f35d0f010e5104f78
2019-08-13 08:50:19 +00:00
Simon Detheridge
7d253651ca Remove 'this' usage from UserUpdater
GitOrigin-RevId: f49126b69b22f8f6860d77ba07d9ae8fd68b5aaf
2019-08-13 08:50:13 +00:00
Ersun Warncke
c0cc8fdd3f add tests for error handling, clean up
GitOrigin-RevId: 8b102d54fd3d7f703dca81da182d3ab8eae3c9c2
2019-08-13 08:50:01 +00:00
Ersun Warncke
cd57ff4e7f return errors and clean up ProjectOptionsHandler
GitOrigin-RevId: 5be79a317419998216e9f207313c114888beb415
2019-08-13 08:49:55 +00:00
Ersun Warncke
39cb437bb6 more package.json changes
GitOrigin-RevId: 00ae56b88127d858250d56c876c5a65afc338cd8
2019-08-13 08:49:50 +00:00
Ersun Warncke
6ff5ef92ce add version for timekeeper
GitOrigin-RevId: ec3664df27823ae2ee63982070dcd0615de19e5b
2019-08-13 08:49:44 +00:00