Commit graph

308 commits

Author SHA1 Message Date
Timothée Alby
03b2d184b5 Merge pull request #4052 from overleaf/ab-subscription-page-split-test-2
Subscription page split test

GitOrigin-RevId: 022a91d97f20d584e47e1f6b5575e689983df129
2021-05-20 02:05:00 +00:00
Jakob Ackermann
7db7cd4a49 [misc] merge pdf caching into main (#4033)
* [frontend] WIP: pdf caching using service worker -- squashed

Ref: 920fbaa00b31530f7c457a2d93bad5e553798057
Co-Authored-By: Brian Gough <brian.gough@overleaf.com>
Co-Authored-By: Eric Mc Sween <eric.mcsween@overleaf.com>

* [misc] add contentId into the URL for protecting PDF stream contents

* [misc] gracefully handle missing ranges in serviceWorker

* [misc] support PDF stream caching for anonymous users

* [misc] polish header names and add URL to error message when fetch fails

* [misc] polish event handler registration

* [misc] limit serviceWorker scope to /project/ -- trailing slash

This will block the service worker from intercepting requests on the
 project dashboard.

* [misc] add per-request feature flag for enabling PDF stream caching

* [misc] expose compile stats and timings to the frontend

* [misc] serviceWorker: support clsiServerId and compileGroup url params

* [misc] serviceWorker: polish header maps

* [misc] serviceWorker: drop TODO for p-limit -- the browser has a queue

* [misc] serviceWorker: drop verbose log message on every fetch

* [misc] cut down size of diff in backend code

* [misc] add test case for forwarding of pdf caching and metrics details

* [misc] serviceWorker: drop all the log lines

* [misc] serviceWorker: add boundary guards to the compile request regex

Co-authored-by: Brian Gough <brian.gough@overleaf.com>
Co-authored-by: Eric Mc Sween <eric.mcsween@overleaf.com>
GitOrigin-RevId: 4b291b4a4f2866cf07bccf8ec9068f33bbfdc916
2021-05-18 02:07:57 +00:00
Alexandre Bourdin
87b3654bff Merge pull request #4001 from overleaf/ab-hash-split-test
Add hashing to compute the user's percentile in a split test

GitOrigin-RevId: 94302cd1c0ab9e9075a506096b4f36ba50b9b7fa
2021-05-07 02:13:17 +00:00
Jakob Ackermann
8faae673b4 Merge pull request #4000 from overleaf/jpa-skip-pug-compile
[Server] optionally skip pre-compiling pug templates in production

GitOrigin-RevId: c50e6007dae3b0ab83a7edbce07a695a17e71404
2021-05-07 02:13:13 +00:00
Chrystal Maria Griffiths
3dfcb95802 Merge pull request #3960 from overleaf/cmg-binary-file
[BinaryFile] Reopening of Binary file React migration

GitOrigin-RevId: 050e66e3321bd6579d44932b669fc0a31df06d18
2021-04-29 02:09:38 +00:00
Alexandre Bourdin
1436731053 Merge pull request #3929 from overleaf/as-block-ie-config
Add IE11 to unsupported browser config

GitOrigin-RevId: 0a9c5a736a842ec8ccddf9ce7feefec7ac5a2b35
2021-04-28 02:10:12 +00:00
Alexandre Bourdin
affaae14b7 Merge pull request #3917 from overleaf/ab-example-project-ab-test
Example Project Split Test

GitOrigin-RevId: a9d68811c878e32b92e0547311c9e477e4096135
2021-04-28 02:10:08 +00:00
Chrystal Maria Griffiths
4e9d7c36ff Merge pull request #3952 from overleaf/revert-cmg-binary-file
Revert "Merge pull request #3526 from overleaf/cmg-binary-file"

GitOrigin-RevId: 5f539f26992fefd01b07922b1f43a3a3bc753141
2021-04-24 02:10:12 +00:00
Eric Mc Sween
1186c3e9a4 Merge pull request #3526 from overleaf/cmg-binary-file
[BinaryFile] Binary file React migration

GitOrigin-RevId: e229ad8ec3781607b5ca28387927b84d4af95060
2021-04-24 02:10:07 +00:00
Alf Eaton
2621a1d5bb Merge pull request #3933 from overleaf/ae-csp-report-percentage
Add CSP_REPORT_PERCENTAGE

GitOrigin-RevId: 4afde0da6e3660c83df8c5c9cd31a3f246e9e572
2021-04-22 02:09:40 +00:00
Timothée Alby
0ecebefb0c Merge pull request #3804 from overleaf/msm-react-publish-button
[ReactNavigationToolbar] Submit button

GitOrigin-RevId: 9b40e09f001b44bd2f5035469f0d0c852fea7199
2021-04-20 02:10:19 +00:00
Alf Eaton
dcd6bd347f Use the full (relative) view path for CSP exclusion (#3916)
GitOrigin-RevId: f6828a447abcc550f0c7dfd0fc6fc72f4b5b1f7e
2021-04-17 02:09:56 +00:00
Miguel Serrano
f9962fefe8 React git-bridge modal (#3869)
GitOrigin-RevId: 5b2609ed9ad7909a10cb08342053e955447688f5
2021-04-01 02:06:05 +00:00
Simon Detheridge
467aa16da7 Merge pull request #3835 from overleaf/ho-mf-file-extension
add mf files as editable in editor

GitOrigin-RevId: b22d59af3fcd0c647cc436d6ac72130d8f29b4aa
2021-03-31 02:05:29 +00:00
Timothée Alby
b2b9a05e3c Merge pull request #3706 from overleaf/msm-jlm-configurable-text-extensions
New ADDITIONAL_TEXT_EXTENSIONS env to support extra editable files

GitOrigin-RevId: 03bec0a1a9dbd303754f0b90377d1b7d1ec3f528
2021-03-30 02:05:04 +00:00
Alf Eaton
a5637651b5 Add Content-Security-Policy header (#3783)
* Add Content-Security-Policy header
* Add nonce attribute to script tags
* Use source-map for webpack devtool
* Add ng-csp attribute when CSP is enabled
* Allow overriding CSP settings with environment variables
* Hook into render and allow routes to disable the CSP header

GitOrigin-RevId: a873736a3514198165f1b2f1e18d002b65f20d30
2021-03-26 03:04:55 +00:00
Paulo Jorge Reis
3f0e897e32 Logs UI variant without popup (#3794)
* Add logs UI without pop-up variant

* Implement frontend for logs UI without pop-up

* Add logs UI variants to admin panel and front user info

* Fix existing UI subvariant window global

GitOrigin-RevId: 075db56032354d782e489b5235925f55b1a67e0b
2021-03-24 03:04:41 +00:00
Alf Eaton
ba4300d9e1 Merge pull request #3518 from overleaf/ae-react-create-file-modal
Migrate "Add Files" modal to React

GitOrigin-RevId: fc5235108ee65294e3176da9c327791c34aa5b3c
2021-03-19 03:04:46 +00:00
Alf Eaton
a481ffef17 Merge pull request #3645 from overleaf/ae-import-config
Add config for optional modules

GitOrigin-RevId: 082261eff5d505ce98dfaafe179547b312c0511b
2021-03-04 03:04:21 +00:00
Paulo Jorge Reis
60d32f3e55 Prepare a staged rollout for the new compile UI (#3639)
GitOrigin-RevId: 9c0ef74514336238ff48d271474ec39eb163236a
2021-02-11 03:04:40 +00:00
Timothée Alby
89ce01901c Merge pull request #3498 from overleaf/as-remove-brand-prefix
Remove brandPrefix setting

GitOrigin-RevId: f415d10e81b79d35159000e554b9174304f5a41b
2021-01-06 03:07:45 +00:00
Eric Mc Sween
55bf16c06d Merge pull request #3437 from overleaf/em-project-specific-blobs
Use per-project v1 history blob URLs for git-bridge

GitOrigin-RevId: b68ee2129ceb57f4b7f68262c5bcbadc0952b56f
2020-12-11 03:05:03 +00:00
Jakob Ackermann
cb9d207ba0 Merge pull request #3427 from overleaf/jpa-rewite-smoke-tests
[SmokeTests] rewrite

GitOrigin-RevId: eda39db6b339d997f5669cb9bfca2aefe7d96699
2020-12-10 03:04:18 +00:00
Jessica Lawshe
63a60765c7 Merge pull request #3366 from overleaf/em-remove-queues-redis-fallback
Remove fallback when QUEUES_REDIS_* variables are not set

GitOrigin-RevId: c20e30e33da3193dad691a4ae0b177a6ae0c0066
2020-11-10 03:04:45 +00:00
Jakob Ackermann
0a5cc39671 Merge pull request #3345 from overleaf/jpa-i18n-escape-vars
[misc] i18n escape vars

GitOrigin-RevId: 5b0a8ca7229f3817c823b126203c8597f7fd0913
2020-11-06 03:04:54 +00:00
Eric Mc Sween
d5a49038df Merge pull request #3302 from overleaf/em-analytics-queues
Send analytics events through a queue

GitOrigin-RevId: b9eb12e469faf16e32aba5fae665c5f85dfbc52c
2020-11-05 03:05:06 +00:00
Jakob Ackermann
87634be542 Merge pull request #3351 from overleaf/revert-3348-revert-3298-jpa-re-land-mongoose-latest
[misc] re-land: remove mongojs and bump mongoose

GitOrigin-RevId: eba9f80fbd58dbb8aed131fead3ec0b928a555aa
2020-11-04 03:04:21 +00:00
Jakob Ackermann
e249a2e5be Merge pull request #3348 from overleaf/revert-3298-jpa-re-land-mongoose-latest
Revert "[misc] re-land: remove mongojs and bump mongoose"

GitOrigin-RevId: 45a284435c88898d96769ab258651fb8d6d20ff5
2020-11-03 03:05:09 +00:00
Jakob Ackermann
28fe397f38 Merge pull request #3298 from overleaf/jpa-re-land-mongoose-latest
[misc] re-land: remove mongojs and bump mongoose

GitOrigin-RevId: 02f78d52ffc2d373c8c0bc4860d3b2326a46f5c9
2020-11-03 03:04:52 +00:00
Eric Mc Sween
d708f6f0db Merge pull request #3319 from overleaf/em-enabled-services
Use ENABLED_SERVICES variable to choose which routes to set up

GitOrigin-RevId: 6b1f8d593de23d72802c178d2e3cc89757257675
2020-10-28 03:05:16 +00:00
Miguel Serrano
2e7e64578f Merge pull request #3299 from overleaf/jpa-cleanup-tpr-import
[tpr] cleanup dead code and add request timeout

GitOrigin-RevId: 363b12efd4e9d9391bfb486e7b7f301c1ff2ce33
2020-10-28 03:04:21 +00:00
Jakob Ackermann
db422ecafa Merge pull request #3258 from overleaf/jpa-config-mongo-server-selection-timeout
[misc] add a config option for the mongo serverSelectionTimeoutMS

GitOrigin-RevId: 89b79e4fd5043b003da4ef103ddc919909aa7893
2020-10-06 02:04:45 +00:00
Jakob Ackermann
e3c6637339 Merge pull request #3187 from overleaf/jpa-mongodb-native
[misc] migrate the app to the native mongo driver

GitOrigin-RevId: 9030b18c4cf62e3a01d3d8f450bf0e02f9f89c22
2020-10-02 02:04:18 +00:00
Jakob Ackermann
0829e823a8 [misc] optionally skip adding the routes of the launchpad module (#3194)
GitOrigin-RevId: 1fb797cf13fe715efe7b1161bdcfd8735f8f349e
2020-09-16 02:05:08 +00:00
Jakob Ackermann
674954f96f Merge pull request #3094 from overleaf/sk-restrict-admin-flag
Check domain of emails on admin users

GitOrigin-RevId: 75de9cff30e3c628249fcd0ea3446a33d51d39b4
2020-08-20 02:06:19 +00:00
Jakob Ackermann
397bd034c7 Merge pull request #3011 from overleaf/jpa-optionally-increase-mongo-timeout
[misc] optionally increase the mongo timeout

GitOrigin-RevId: f204b017cf3bbb195667739d714b99bfd8a7eaa1
2020-07-16 02:06:56 +00:00
Jakob Ackermann
53927bca95 [misc] move /user/activate into a module (#2962)
* [misc] move /user/activate into a module

Co-Authored-By: Nate Stemen <nate.stemen@overleaf.com>

* [misc] setup copybara for the new user-activate module

* [misc] move the /user/activate route behind a feature flag

...which is by default enabled.

Co-authored-by: Nate Stemen <nate.stemen@overleaf.com>
GitOrigin-RevId: 87fc5ae869a7e282ffdbeea0ff7b7c55b8b9b31b
2020-07-16 02:06:51 +00:00
Brian Gough
49784e8ac0 Merge pull request #2990 from overleaf/bg-add-health-check-on-active-handles
add health check limit on active handles (optional)

GitOrigin-RevId: c26071c96b220935178012d881bb53013df64155
2020-07-11 02:04:15 +00:00
Jakob Ackermann
ae068781ca Merge pull request #2978 from overleaf/jpa-expose-hostname
[misc] optionally expose the hostname in the X-Served-By response header

GitOrigin-RevId: f3ac14aeb75cef8c9ed1d8cb1d649dd7f909b99b
2020-07-08 02:04:24 +00:00
Jakob Ackermann
ccb5811cb6 Merge pull request #2945 from overleaf/jpa-pug-compileDebug-false
[misc] disable debug mode for pre-compile of pug templates by default

GitOrigin-RevId: 0a6798eec577f1be24017ba91f1378b16d80b528
2020-06-27 02:10:24 +00:00
Jakob Ackermann
991c4f9876 Merge pull request #2928 from overleaf/jpa-sentry-unified-release-and-env-annotation
[misc] expose release and environment to frontend

GitOrigin-RevId: 2adab7cfb2c63f6d5bc34c367393449c84ef2690
2020-06-24 02:10:53 +00:00
Chrystal Maria Griffiths
50585a22b3 Merge pull request #2881 from overleaf/jpa-socket-io-retry-handshake
[misc] socket.io: retry the initial connection attempt

GitOrigin-RevId: e7f7e8eb233015f41b2b8c67e46c4661b8fad3c9
2020-06-06 02:09:55 +00:00
Timothée Alby
460be2d99e Merge pull request #2863 from overleaf/ta-2fa-env
Use ENV Vars for 2FA Settings

GitOrigin-RevId: 1b6f943ba5d9b58a2db2d082849a7f142d74a254
2020-06-03 10:30:40 +00:00
Timothée Alby
c4ec032ffa Merge pull request #2858 from overleaf/sk-make-lock-timeout-configurable
Make lock timeout configurable

GitOrigin-RevId: c1df72a7cae56db125e090ada75b2c56ca9853bb
2020-06-03 10:30:33 +00:00
Jakob Ackermann
419100d167 Merge pull request #2860 from overleaf/jpa-socket-io-v2-percentage-rollout
[misc] prepare for a percentage roll-out of socket.io v2

GitOrigin-RevId: 792eddeb4a9b41aded67fee13faa949122cd0faf
2020-05-27 03:15:52 +00:00
Tim Alby
deeaed66f9 Revert "use ENv vars for 2FA settings"
This reverts commit b32b2d62d0f9145e5c59b8984b44940c855a1d91.

GitOrigin-RevId: 81a4d3bc292d89dabf9f292f2d08e3ee7b69a509
2020-05-26 03:11:28 +00:00
Tim Alby
9279e97cdc use ENv vars for 2FA settings
GitOrigin-RevId: b32b2d62d0f9145e5c59b8984b44940c855a1d91
2020-05-26 03:11:23 +00:00
Ersun Warncke
e9d199a0cf use relative path for default data dir
GitOrigin-RevId: a3d9e6583aba48b9814eea991460ffde7fe49984
2020-05-19 03:19:58 +00:00
Miguel Serrano
0ba6a1f11d Merge pull request #2805 from overleaf/jpa-bg-bcrypt-rounds-env
[misc] configure the bcrypt rounds via the env variable BCRYPT_ROUNDS

GitOrigin-RevId: 68a2f5b491c7162e943edfbb7e05758114d2b3d8
2020-05-07 03:27:51 +00:00
Jakob Ackermann
d3240b8f9c [perf] speedup login times for acceptance tests: use weak bcrypt params (#2801)
The overhead of password checks goes down from about 200ms to
 sub-millisecond times on a modern i7 processor (3.8GHz).
In my testing on server CPUs (2.4GHz) this goes down from 400ms to
 single digit ms.

GitOrigin-RevId: 895580fcbf1cde0bae5213ed6d8aae30c67fcfa3
2020-05-05 03:22:22 +00:00
Simon Detheridge
61e338fa7d Merge pull request #2727 from overleaf/jel-td-allowed-style-attribute
Allow style attribute on td

GitOrigin-RevId: 2886f5fdfed2d7b225e3f2e827a9313237a59ab0
2020-04-09 03:21:33 +00:00
Timothée Alby
dea9730503 Merge pull request #2694 from overleaf/ta-jl-otp
Two Factor Authentication for Staff

GitOrigin-RevId: 7028e93cb4a4cd88c138a52b0528817056b930d9
2020-04-08 03:14:35 +00:00
Jakob Ackermann
155b22caf9 Merge pull request #2713 from overleaf/jpa-custom-wsurl-for-beta-users
[misc] custom wsUrl for beta users

GitOrigin-RevId: e731ae7245e9c5586ae82cbc4c6716a74e56f2c9
2020-04-03 03:20:47 +00:00
nate stemen
c301d8bc25 Merge pull request #2666 from overleaf/em-max-json-request-size
Separate max_doc_length from max JSON request size

GitOrigin-RevId: 4c725028111966bf04109080d80d4672273dd697
2020-03-19 04:17:05 +00:00
Simon Detheridge
08a35b8998 Merge pull request #2541 from overleaf/revert-2382-msm-remove-recaptcha-default-config
Revert "Remove Recaptcha default config"

GitOrigin-RevId: 70e5b7b1f52e89a676fc0cea3654fbe5f59739ce
2020-01-28 04:18:49 +00:00
Simon Detheridge
a8483fbc89 Merge pull request #2516 from overleaf/spd-oio-samesite-cookies
Handle 'samesite=lax' session cookies on POST to open-in-overleaf

GitOrigin-RevId: d856f372e91134be47cc301a515ec08511618631
2020-01-22 04:23:00 +00:00
Miguel Serrano
1c759ad413 Add option to disable email confirmation banner (#2469)
GitOrigin-RevId: ef5e08a6359346cc53dff4ce7978affb71fdb556
2019-12-19 04:21:37 +00:00
Eric Mc Sween
b055612e3c Removal of default API passwords (#2422)
GitOrigin-RevId: d831adcf2fb8bec8792dda624c255474480bb897
2019-12-19 04:21:30 +00:00
Jessica Lawshe
cbe22f5cc7 Add Google Optimize
GitOrigin-RevId: 4c485be83456bf632d1b5f6790f2757d2b3aad54
2019-12-03 14:20:41 +00:00
Miguel Serrano
debb82960c Added settings.salesEmail to web config (#2392)
GitOrigin-RevId: 67b215e4141063fe00b29917324197923824ab8e
2019-11-27 10:26:17 +00:00
Miguel Serrano
9bfe58a959 Remove Recaptcha default config (#2382)
GitOrigin-RevId: 07fcddc135596f30614b087411e8116abad29770
2019-11-25 10:34:50 +00:00
Miguel Serrano
11419845e8 Remove v1 defaults (#2391)
GitOrigin-RevId: e9812c9d7785ac64500dcd3925a6b5be4cb04d7c
2019-11-21 10:24:41 +00:00
Miguel Serrano
475e6971a2 Revert "Remove settings.apis.v1 defaults (#2365)" (#2388)
This reverts commit 53d191a080fd50b83236f4e16a0dd10e72e705ad.

GitOrigin-RevId: 15b703670efd1cb13ebe9bd12015ec1109f60bb8
2019-11-20 12:06:18 +00:00
Miguel Serrano
e4d180955f Remove settings.apis.v1 defaults (#2365)
GitOrigin-RevId: 53d191a080fd50b83236f4e16a0dd10e72e705ad
2019-11-20 12:06:08 +00:00
Eric Mc Sween
bdc5360bc0 Merge pull request #2372 from overleaf/em-mongo-connection-pool
Use the default Mongoose connection pool for all models

GitOrigin-RevId: d227b7eb36f130085c9eb1480dc07bd50ba57768
2019-11-18 14:20:43 +00:00
Miguel Serrano
8a0b28e7c4 Revert "Remove settings.apis.v1 defaults (#2332)" (#2364)
This reverts commit 2763f0afbe153b59ec9b238d7a4f0495677e86ad.

GitOrigin-RevId: 2c741281f268d10d66e0d4613a087919ca462125
2019-11-14 16:44:22 +00:00
Miguel Serrano
c7d1f9fb76 Remove settings.apis.v1 defaults (#2332)
GitOrigin-RevId: 2763f0afbe153b59ec9b238d7a4f0495677e86ad
2019-11-14 16:44:14 +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
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
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
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
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
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
Miguel Serrano
6006c8ca79 Fixed incompatibilities between overleaf.com and community (#2028)
GitOrigin-RevId: fc1e4e3e179cab75144043d83197f09e4f6c7642
2019-08-12 11:39:17 +00:00
Timothée Alby
b9ab0edf69 Merge pull request #2015 from overleaf/ta-recurly-upgrade
Upgrade Recurly

GitOrigin-RevId: 9a7c4804d2fafa31ea634498359dbfd95416b2ae
2019-07-31 08:33:31 +00:00
Timothée Alby
109585d20c Merge pull request #1947 from overleaf/ta-cleanup-guard-1
Remove __guard__ Function Used to Access Settings

GitOrigin-RevId: 15e3749990a9fc68f8d344390b1bf0d09d839106
2019-07-15 13:23:38 +00:00
Jessica Lawshe
8c2da6afab Merge pull request #1673 from overleaf/jel-cms-table-style
Styling for features table

GitOrigin-RevId: a8c37cf9bcda7c93d3d910036cd08f3cba06209e
2019-05-20 16:10:56 +00:00
Brian Gough
f583ffdbff Merge pull request #1740 from sharelatex/spd-captcha-on-register
Don't add captcha fields to register form if captcha is disabled

GitOrigin-RevId: 7ac3a3b41734377243ac1e31a99b3778c9a2e77d
2019-05-02 10:18:57 +00:00
nate stemen
bec56ccafa Merge pull request #1713 from sharelatex/ns-captchas-two
turn off captchas for project invite

GitOrigin-RevId: 3e044ba8c6bb2ffb77ea4486f7b51a587133839c
2019-04-16 18:47:56 +00:00
Chrystal Maria Griffiths
36d0e8e199 Merge pull request #1654 from sharelatex/ns-add-status-page
add status.overleaf.com to 500 page

GitOrigin-RevId: 47988918a4c2ea83b2edbd9f850d65a0d2bcdf82
2019-04-10 09:52:46 +00:00
nate stemen
2ae27fbc6a Merge pull request #1702 from sharelatex/revert-1650-ns-toggle-captchas
Revert "allow toggling of captchas via setting"

GitOrigin-RevId: 422daf84d2b02a10dd9b771e5c0f672139da0613
2019-04-08 15:20:49 +00:00
nate stemen
5aac144d5b Merge pull request #1650 from sharelatex/ns-toggle-captchas
allow toggling of captchas via setting

GitOrigin-RevId: 09decba22f6b7b4e97b04a57534a2797e10940c4
2019-04-08 13:53:54 +00:00
Simon Detheridge
d9522f563d Merge pull request #1631 from sharelatex/ho-remove-recurly-sign
remove RecurlyWrapper.sign and recurly private api key

GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152
2019-03-25 15:52:54 +00:00
Henry Oswald
d12dd862c8 Merge pull request #1551 from sharelatex/ho-docker-debug
Add missing config into defaults file

GitOrigin-RevId: 7d47bce6b6b429eab8d2765b081967ce52908c27
2019-03-11 11:01:34 +00:00
Henry Oswald
d55b38cc05 Merge pull request #1471 from sharelatex/ho-docker2
Move to docker image based builds

GitOrigin-RevId: 992aeaf69bfea4d1847a07c457575a63985d4407
2019-03-11 10:59:20 +00:00
Ersun Warncke
57450bb0fb Merge pull request #1522 from sharelatex/ew-smoke-test-remove-rate-limit
Remove smoke test rate limit, use POST for logout

GitOrigin-RevId: 0152f259b4a4375147857cc25156621de87f8bc9
2019-03-11 10:59:09 +00:00
Chrystal Maria Griffiths
bf5a28b258 Merge pull request #1509 from sharelatex/as-update-google-config
Use env var for brandPrefix for compatibility with google infrastructure

GitOrigin-RevId: c7749007d3fbd3746cd8f6771d6b394f5864dd9f
2019-02-15 13:33:49 +00:00
Alasdair Smith
9b97af8977 Merge pull request #1403 from sharelatex/as-swap-brand-prefix
Swap brand prefix so OL is the default

GitOrigin-RevId: 60f4f03598fb6befc1ce790d39f546490612a1db
2019-02-12 11:32:28 +00:00
Ersun Warncke
81e3db260c Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route
Add close site setting and private disconnect all users route

GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0
2019-02-06 14:24:52 +00:00
Brian Gough
c51461da09 Merge pull request #1480 from sharelatex/bg-allow-separate-websocket-url
allow setting separate wsUrl for websockets

GitOrigin-RevId: afd4f441397c6b4b402e342f1dec01c971847a0f
2019-02-06 10:20:36 +00:00
Henry Oswald
68a0ff08ea Merge pull request #1366 from sharelatex/ho-bump-compile-size
Bump compile size

GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b
2019-01-08 16:37:00 +00:00
Jessica Lawshe
a521a86fb7 Merge pull request #1340 from sharelatex/jel-sanitize-html-options
HTML sanitize options for icons and tables

GitOrigin-RevId: 1f2cc444120ebbefb9583eda95e8edfba4e7d1d8
2019-01-07 16:15:57 +00:00
Jessica Lawshe
e619185569 Merge pull request #1347 from sharelatex/jel-sanitize-html-options-del
Allow <del> in sanitize HTML default options

GitOrigin-RevId: 212c13e77e62717abc85248d0255c6e9729031a9
2019-01-07 16:15:45 +00:00
James Allen
5a7f72c9f9 Merge pull request #1302 from sharelatex/jel-cms-iframe-attr
Allow style attribute on iframes

GitOrigin-RevId: f6a88f544eab665fecc00b8c89e87d489f39b88d
2018-12-20 15:48:52 +00:00
James Allen
e603afe106 Merge pull request #1217 from sharelatex/ja-download-zip-version
Add option to download zip file of version in history

GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68
2018-12-05 12:32:26 +00:00
Jessica Lawshe
c20a506f0e Merge pull request #1161 from sharelatex/jel-extend-sanitize-options-cms
Extend sanitize HTML options

GitOrigin-RevId: da9dd1741ca31f095e4fafe91c1beb9abd019567
2018-11-20 18:05:36 +00:00
Paulo Jorge Reis
0bf66e8b99 Merge pull request #1150 from sharelatex/sk-add-git-bridge-public-base-url
Add `gitBridgePublicBaseUrl` to default settings

GitOrigin-RevId: 19aeb6b9cf2e04e38ec24c15538fed1bcab9c784
2018-11-15 10:04:39 +00:00
Shane Kilkelly
81b09c7800 Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2
Enable git-bridge in v2

GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7
2018-11-14 11:29:35 +00:00
James Allen
140f97eb20 Merge pull request #1107 from sharelatex/ja-purchase-groups
Purchase group/team accounts directly via app

GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0
2018-11-13 13:50:46 +00:00