github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
17888 commits 3 branches 7 tags 199 MiB
Commit graph

17888 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Gough
3a5374c6f9 increase minor version for backwards compatible addition 2019-12-16 10:22:50 +00:00
Brian Gough
93df87eff3 allow options for count 2019-12-16 10:18:30 +00:00
Brian Gough
a2e63d009e fix migration phase check 2019-12-16 09:55:26 +00:00
Simon Detheridge
330ba41dd6 Merge pull request #50 from das7pad/logging/keep-logger-name 
[logging] do not overwrite the logger name
 2019-12-16 09:43:01 +00:00
Simon Detheridge
dab44f6fec Merge branch 'master' into logging/keep-logger-name 2019-12-16 09:42:18 +00:00
Simon Detheridge
32b7f25404 Merge pull request #49 from das7pad/misc/node10plus-support 
[misc] add support for node 10+
 2019-12-16 09:39:00 +00:00
Brian Gough
a85dffbcef fix acceptance tests 2019-12-16 09:27:00 +00:00
Brian Gough
d0c5eb5698 support migration of project history keys to separate redis instance 2019-12-13 16:38:41 +00:00
Simon Detheridge
26c37c7ce2 Merge pull request #58 from overleaf/spd-cleanup-and-metrics 
Add metrics for S3 ingress and egress, and improve acceptance tests
 2019-12-13 10:57:38 +00:00
Brian Gough
d61ab1ff08 Merge pull request #104 from overleaf/bg-fix-acceptance-tests 
allow pending updates to clear in acceptance tests
 2019-12-12 09:46:54 +00:00
Alasdair Smith
40d274092a Merge pull request #2437 from overleaf/revert-2436-revert-2408-as-dynamic-public-path 
Undo revert of Fetch dynamically fetched scripts from CDN

GitOrigin-RevId: e317f0e32bbf5da4badf74440622637a54ef5477
 2019-12-12 04:15:06 +00:00
Christopher Hoskin
2cb158340d Merge pull request #2450 from overleaf/csh-issue-730-copybara-flag 
Make copybara conditional

GitOrigin-RevId: 04ec7af1820b9e594af6a1f845fd09d12ea57d61
 2019-12-12 04:15:02 +00:00
Brian Gough
1bb12a5035 allow pending updates to clear in acceptance tests 2019-12-11 14:43:59 +00:00
Simon Detheridge
56b38af678 Explicitly wait for S3 in acceptance tests 2019-12-10 17:43:34 +00:00
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