Commit graph

17824 commits

Author SHA1 Message Date
Simon Detheridge
237c4113cd Ensure fakes3 is healthy before running tests 2019-12-10 16:36:33 +00:00
Miguel Serrano
c4104806c3 Hotfix 2.0.2 (#130) 2019-12-10 15:06:40 +01:00
Simon Detheridge
cf684dcd98 Fix fakes3 configuration in ci yml 2019-12-10 11:38:19 +00:00
Timothée Alby
8d6e72bd8f Merge pull request #2446 from overleaf/ta-refresh-features-script-fix
Script To Refresh All Users' Features Fix

GitOrigin-RevId: 545c68e6fd868bd50baf27e8e9e987bbeaf72732
2019-12-10 08:25:14 +00:00
Timothée Alby
7c9e83de2a Merge pull request #2441 from overleaf/em-cg-null-users
Remove existing sessions of deleted users

GitOrigin-RevId: cde9f8421fd9745b0922849a2269b44508d670f1
2019-12-10 08:25:09 +00:00
Simon Detheridge
6f326d5650 Use SSL setting based on url protocol 2019-12-09 17:41:20 +00:00
Simon Detheridge
48aa141591 Add metric for s3 ingress 2019-12-09 17:06:00 +00:00
Simon Detheridge
1d1106bc67 Add metric for s3 egress 2019-12-09 17:06:00 +00:00
Simon Detheridge
c01603b1e7 Support custom S3 endpoints 2019-12-09 17:06:00 +00:00
Simon Detheridge
96457597ac Add fake s3 server and initial config 2019-12-09 17:06:00 +00:00
Simon Detheridge
86b9e4b53a Rename request -> s3Request to prevent overwriting main import 2019-12-09 17:05:58 +00:00
theunbound
feda446983 Remove make targets in web (#670) 2019-12-09 18:02:52 +01:00
Simon Detheridge
e92ae3ac57 Merge pull request #3 from overleaf/spd-security-and-deprecation
Replace deprecated createCipher with createCipheriv for new tokens
2019-12-09 16:09:06 +00:00
Simon Detheridge
620573c0ad Add an explicit test for a 2019 string 2019-12-09 16:07:25 +00:00
Simon Detheridge
b8d5f6baeb Split methods to reduce code duplication 2019-12-09 15:35:22 +00:00
Jessica Lawshe
827fb7119c Merge pull request #2444 from overleaf/jel-beta-test-saml
Refactor account setttings SSO UI checks and allow beta testing

GitOrigin-RevId: 882c6aed107a2facfb0941bc49ef6cbd86473efb
2019-12-09 15:24:15 +00:00
Jessica Lawshe
1a91b5d65c Merge pull request #2442 from overleaf/ew-check-saml-beta-on-login
use samlBeta flag to test university with sso_enabled=false

GitOrigin-RevId: 3f0dc09b23f5e7814ba78af148685a6a07e30242
2019-12-09 15:24:11 +00:00
Jessica Lawshe
bf1d112d78 Merge pull request #2431 from overleaf/jel-sso-info-link
Add wiki link to dash notification and remove unused notifications

GitOrigin-RevId: e766fcd27632b3d6b2c06c37c98849cde2718c6e
2019-12-09 15:24:06 +00:00
Jessica Lawshe
609fe21402 Merge pull request #2438 from overleaf/jel-gallery-pagination
Gallery pagination

GitOrigin-RevId: 0592f60bcc094360bd3d5eddd9251630a4a892b6
2019-12-09 15:24:01 +00:00
Simon Detheridge
73f293cf49 Remove unneeded 'async' dependency
Co-Authored-By: Jakob Ackermann <das7pad@outlook.com>
2019-12-09 15:01:31 +00:00
Simon Detheridge
a9e39af24f Keep oldmethods and use old method when app uses an older label 2019-12-09 14:49:23 +00:00
Copybot
05800f0143 Merge pull request #700 from das7pad:perf-move-system-message-query
GitOrigin-RevId: b39d6afeef14b868f4b5bc4784663ab5bcd8f84d
2019-12-09 11:36:43 +00:00
Brian Gough
a1d4685dd8 Merge pull request #59 from overleaf/bg-add-comments-about-aws-sdk-migration
add comments about aws-sdk and s3 backends
2019-12-09 11:11:43 +00:00
Brian Gough
2ec38068aa add comments about aws-sdk and s3 backends 2019-12-06 14:35:13 +00:00
nate stemen
2d9b089e16 Merge pull request #2401 from overleaf/cmg-ns-pretty-less
Fix inconsistent use of tabs and spaces in less files

GitOrigin-RevId: c69667f0dc6bc70ea3623890e2b2b741e358d454
2019-12-06 04:19:26 +00:00
Timothée Alby
a5757b447c Merge pull request #2434 from overleaf/ta-team-invite-email-fix
Fix Spam Safe Inviter Name for Group Invites

GitOrigin-RevId: e5e01afd53d22cd53016352c32ad1de28137ea17
2019-12-06 04:19:21 +00:00
Timothée Alby
2705aea54c Merge pull request #2435 from overleaf/ta-group-invite-form-fix
Add UI Feedback To Group Invite Form

GitOrigin-RevId: aec05d586c4ccfc7739b6b94d1f49763ea229c6e
2019-12-06 04:19:17 +00:00
Timothée Alby
5783f99fbd Merge pull request #2439 from overleaf/ta-refresh-features-script
Add Script To Refresh All Users' Features

GitOrigin-RevId: 3ec107d170af7d65b7fe5bf90598e18d738bfad5
2019-12-06 04:19:12 +00:00
Simon Detheridge
c1cd5c65e7 Update dev dependencies 2019-12-05 08:58:49 +00:00
Simon Detheridge
120890bb08 Update lib/coffee/AccessTokenEncryptor.coffee
Co-Authored-By: Jakob Ackermann <das7pad@outlook.com>
2019-12-05 08:57:19 +00:00
Christopher Hoskin
3de7e69a8d Merge pull request #2433 from overleaf/csh-issue-308-copybara-script
Copybara script

GitOrigin-RevId: 6a51a7b4a2205742d45b772cbb8db555240dfa6f
2019-12-04 14:48:44 +00:00
Hugh O'Brien
d1a668ffda Merge pull request #2436 from overleaf/revert-2408-as-dynamic-public-path
Revert "Fetch dynamically fetched scripts from CDN"

GitOrigin-RevId: c443fb278b7e53890d0e83cd02307fad939f5f8c
2019-12-04 13:48:37 +00:00
Hugh O'Brien
687d3c1b22 Merge pull request #2408 from overleaf/as-dynamic-public-path
Fetch dynamically fetched scripts from CDN

GitOrigin-RevId: b480f261a6b4ba2d6a8819fd0e7a354605ed9a82
2019-12-04 12:22:43 +00:00
Hugh O'Brien
01c89d3af2 Merge pull request #2404 from overleaf/hb-handle-ejp-and-emis-resubmissions
Handle ejp and emis resubmissions

GitOrigin-RevId: 10eb76c5d106f062b8fb171920f09a701d3acfc9
2019-12-04 10:50:56 +00:00
Simon Detheridge
c2fc2ed178 Replace deprecated createCipher with createCipheriv for new tokens
Co-authored-by: Alasdair Smith <ali@alasdairsmith.co.uk>
2019-12-04 10:09:39 +00:00
Simon Detheridge
4d6ed4fd3a Run tests via 'npm test' 2019-12-04 10:02:20 +00:00
Jakob Ackermann
b17f29e695 [perf] lookup system messages from the project-list route only
The messages are displayed above the project list only.
There is no need to query the system messages from ALL the other routes.

Note: the admin view uses the same variable, but injects an uncached
 value into the template.

Additional context at https://github.com/overleaf/web/pull/699

Signed-off-by: Jakob Ackermann <das7pad@outlook.com>
2019-12-03 20:43:42 +01:00
Ersun Warncke
4ed005b855 serialize saml log data
GitOrigin-RevId: b432b55c8dfa2990b2b96298e6c62b53a036a644
2019-12-03 14:21:13 +00:00
Henry Oswald
176604a938 add once callback to templates manager for v1 templates
see if it fixes sl headers crashing

GitOrigin-RevId: 72e7d716155ed7584e8e163801921f852b358f8f
2019-12-03 14:21:08 +00:00
Tim Alby
3f83648e81 add spacing at the bottom of the editor menu
GitOrigin-RevId: 117d34415dca6ce63018181298b9c349eae20127
2019-12-03 14:21:04 +00:00
Tim Alby
eb13ceafd5 only show editor support buttons if support enabled
GitOrigin-RevId: 8b5cb3c08eefa89673e5f1f16ba98ab57cad4788
2019-12-03 14:20:56 +00:00
Tim Alby
154f1c9235 add help section in editor menu
GitOrigin-RevId: 45347dec29d35a601ec967efeb918302aef395d1
2019-12-03 14:20:51 +00:00
Jessica Lawshe
cbe22f5cc7 Add Google Optimize
GitOrigin-RevId: 4c485be83456bf632d1b5f6790f2757d2b3aad54
2019-12-03 14:20:41 +00:00
Chrystal Maria Griffiths
2cf76ba39a Merge pull request #2421 from overleaf/fix-user-projects-json
Fix exception for project.trashed.find

GitOrigin-RevId: 18b32b0a5badd29893e6a98c9915737bfd8cef2a
2019-12-02 17:26:10 +00:00
Eric Mc Sween
93fe30a451 Merge pull request #2412 from overleaf/em-password-trim
Preserve spaces in password in password reset flow

GitOrigin-RevId: 9a2dfb2988ae99be73934b722e635056b5ab1a18
2019-12-02 14:09:57 +00:00
Eric Mc Sween
a493ec94b2 Merge pull request #2414 from overleaf/ta-features-overrides
Persistent Features Override

GitOrigin-RevId: 9bb389458a4fde3cc36dbc5b8c3f7185b7e4e9bf
2019-12-02 14:09:53 +00:00
Eric Mc Sween
86352c58be Merge pull request #2367 from overleaf/cmg-theme-search-color
Override find & replace results count text to black

GitOrigin-RevId: 754b37b266bde32abc705bd2ca61836d03dea828
2019-12-02 14:09:45 +00:00
Christopher Hoskin
9b59dcded9 Merge pull request #2420 from overleaf/csh-issue-2504-cdn-upload
Script for CDN upload

GitOrigin-RevId: f90a3b07178d8a231a2a7babac52bed3577065c1
2019-12-02 12:34:01 +00:00
Simon Detheridge
20dbbbeb58 Merge pull request #12 from overleaf/spd-force-race
Handle duplicate-notification race condition when using forceCreate
2019-11-29 10:35:48 +00:00
Simon Detheridge
70f5c71864 Handle duplicate-notification race condition when using forceCreate 2019-11-28 16:40:14 +00:00