Commit graph

8369 commits

Author SHA1 Message Date
Eric Mc Sween
44ba0895fe Merge pull request #2286 from overleaf/jel-institution-email-primary-tooltip
Tooltip for "Make Primary" for SSO emails

GitOrigin-RevId: 443cd032d4275ba486a632e92104299997c71bbc
2019-10-28 14:28:59 +00:00
Eric Mc Sween
9afb911b89 Merge pull request #2280 from overleaf/em-show-logs-on-timeout
Decaf cleanup of PdfController

GitOrigin-RevId: 20aecd3abd53034e46129b60f86becbeace18781
2019-10-28 14:28:54 +00:00
Ersun Warncke
9319229657 move institutional email check to overleaf-integration
GitOrigin-RevId: 3e08b1e86bb14d90115df5337cab5c36bb6a69fc
2019-10-28 08:36:36 +00:00
Ersun Warncke
3be4883649 block sso registration for institutional sso domains
GitOrigin-RevId: f1ac63cf47bb41bd3f3603e38a50ed43c9f03650
2019-10-28 08:36:29 +00:00
Timothée Alby
4d564d5cf1 Merge pull request #2258 from overleaf/ta-recurly-custom-fields
Recurly Custom Fields Tracking

GitOrigin-RevId: f29f56cf7d0dfa91a8f4152897ba6bd897cb6238
2019-10-25 08:38:57 +00:00
Timothée Alby
61243338be Merge pull request #2284 from overleaf/jel-user-settings
Add type="button" to prevent form submission

GitOrigin-RevId: 747d389ea52f5f32762f98bab3e647b14572c50d
2019-10-25 08:38:50 +00:00
Eric Mc Sween
06de9233b8 Merge pull request #2255 from overleaf/em-audit-log
Project audit logs

GitOrigin-RevId: 439add2959be140c4f56ce9b41b9f59d432c494d
2019-10-23 12:59:04 +00:00
Eric Mc Sween
f6e4be616c Merge pull request #2267 from overleaf/em-audit-log-admin
Show project audit logs in admin panel

GitOrigin-RevId: f0dae4621ed8d62c8d0424f5f8f5612dc16c3eb5
2019-10-23 12:58:57 +00:00
Eric Mc Sween
dad0b56813 Merge pull request #2244 from overleaf/em-ownership-transfer-frontend
Project ownership transfer for regular users

GitOrigin-RevId: 70782be0b1c59980dce0ad61ff2a7fbc1dbf0566
2019-10-23 12:58:52 +00:00
Eric Mc Sween
dbefd0366a Merge pull request #2253 from overleaf/ns-remove-enago
remove enago references

GitOrigin-RevId: 2397685f5504558c4a60ac2a6158a191abb8e81c
2019-10-23 12:58:48 +00:00
Eric Mc Sween
03bbd4f698 Merge pull request #2256 from overleaf/ta-event-tracking-cleanup
Event Tracking Cleanup

GitOrigin-RevId: 9c857b5d92f9f40a87c2aec2e76c99a3744fddad
2019-10-23 12:58:44 +00:00
Eric Mc Sween
082f790fb6 Merge pull request #2180 from overleaf/as-clean-up-makefile
Clean up how tests are run in Makefile

GitOrigin-RevId: 9b52ead16392cca09bdf7edc4365f10dc468ccf2
2019-10-23 12:58:39 +00:00
Ersun Warncke
9902edcfbb pr fixes
GitOrigin-RevId: 15a0371c285256b871a9c3e393077af1371d1e5c
2019-10-23 11:41:13 +00:00
Ersun Warncke
432f4d3a06 add/remove entitlement on v1
GitOrigin-RevId: 3171f77c8cb5376b26a8dc77d4f63630964678e0
2019-10-23 11:41:09 +00:00
Miguel Serrano
da7ef92668 Added modules/modules-*.js to sync with public repo (#2278)
GitOrigin-RevId: 86cc5a7f9129fa774faa63b7a52cd5569dda7a5a
2019-10-23 09:05:31 +00:00
Timothée Alby
480ca112ff Merge pull request #2277 from overleaf/ta-recurly-script-rate-limit
Recurly Script Rate Limit

GitOrigin-RevId: 726580a821daf3b3dc9c49f6739b79ddcae451b8
2019-10-22 12:07:10 +00:00
Alasdair Smith
0def0eaa41 Merge pull request #2261 from overleaf/as-remove-unused-deps
Remove unused vendored dependencies

GitOrigin-RevId: aa4cb3e95f9b19f69adf4eefca06bbcb5e222154
2019-10-22 11:01:49 +00:00
Brian Gough
45ebc42bf6 Merge pull request #2276 from overleaf/bg-reject-invalid-sessions
reject invalid sessions

GitOrigin-RevId: 5dc59609d01d7ad9bc29f9bf18faee1165d10689
2019-10-22 09:25:33 +00:00
Brian Gough
8ffaa5b0ca Merge pull request #2271 from overleaf/bg-reject-invalid-sessions
reject invalid sessions with middleware

GitOrigin-RevId: 07ab8829cbed92bbcb90b2c5f2c9d049e05b77cd
2019-10-22 07:46:41 +00:00
Jessica Lawshe
28a4be296f Merge pull request #2251 from overleaf/jel-dashboard-institution-notifications
Institution SSO dashboard notifications

GitOrigin-RevId: c80117c2732fafdc9d09eed69db06a26ad28a663
2019-10-21 16:23:19 +00:00
Timothée Alby
9e651d77b2 Merge pull request #2270 from overleaf/bg-fix-lock-unit-test
add stub for metrics in unit test

GitOrigin-RevId: 2920a192f6bd4c892cead766d7393909bfcf8b12
2019-10-21 14:08:09 +00:00
Timothée Alby
de4205d6a0 Merge pull request #2273 from overleaf/ta-recurly-get-accounts
Add Script to Print CSV of all Paypal Customers

GitOrigin-RevId: 3aab5a29508a6848934a2858e0ce0edb9c7d6e71
2019-10-21 14:08:03 +00:00
Simon Detheridge
de69d7f2a8 Merge pull request #2266 from overleaf/spd-slow-acceptance-tests
Remove setting that slows down acceptance tests

GitOrigin-RevId: 37630ec90ad4073cddc7803323515d80082e645c
2019-10-18 16:41:42 +00:00
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