Nate Stemen
|
d54fc7efc6
|
Decaffeinate: add eslint and prettier rc files
|
2018-12-20 14:13:48 -05:00 |
|
Nate Stemen
|
273b81b806
|
forgot prettier-eslint-cli package. thanks @40thieves
|
2018-12-20 14:13:07 -05:00 |
|
Nate Stemen
|
b751f70436
|
bump settings-sharelatex version to latest release
|
2018-12-20 13:56:51 -05:00 |
|
Brian Gough
|
cf12ec1154
|
use the aws sdk to copy files in S3PersistorManager
to work around problems with knox
|
2018-12-20 16:11:18 +00:00 |
|
James Allen
|
2cf7fefaeb
|
Merge pull request #1307 from sharelatex/pr-git-bridge-modal
Redo the git bridge trial modal.
GitOrigin-RevId: 9ddb61a84a018459fa040ab1514dc35085c93d4e
|
2018-12-20 15:48:58 +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 |
|
Alasdair Smith
|
7112e65dc5
|
Merge pull request #1303 from sharelatex/project-import-refactor
Project import refactor
GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117
|
2018-12-20 12:06:15 +00:00 |
|
Shane Kilkelly
|
0c1e754736
|
Merge pull request #1289 from sharelatex/sk-labeled-versions-in-git-bridge-v2
Add support for labeled-versions in git-bridge api.
GitOrigin-RevId: 94858627034ffd000d49b92ba5c7ab45e7294840
|
2018-12-20 10:55:59 +00:00 |
|
Shane Kilkelly
|
97e357f772
|
Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status
Remove deprecated display of v1 team data in v2
GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d
|
2018-12-20 10:55:52 +00:00 |
|
nate stemen
|
efadf662f2
|
Merge pull request #2 from sharelatex/afc-js-settings
Allow .js setting files
|
2018-12-19 15:18:08 -05:00 |
|
Simon Detheridge
|
531f5fb6ee
|
Merge pull request #1280 from sharelatex/spd-open-in-overleaf-conversions
open-in-overleaf: Add support for partner and client_media_id parameters
GitOrigin-RevId: a4c18a03affa62a1ef2cfb0c595766724ba8969b
|
2018-12-19 16:02:47 +00:00 |
|
Simon Detheridge
|
d2465f8d6a
|
Merge pull request #1297 from sharelatex/ja-rate-limit-v2-login
Add rate limit to v2 login end point
GitOrigin-RevId: 81b14387e4a6381f4c0eae17e43af84b2af7fea5
|
2018-12-19 16:02:38 +00:00 |
|
Simon Detheridge
|
b0b87a7b6e
|
Merge pull request #1299 from sharelatex/spd-redirect-bypass-header
Add support for header to allow bypass of redirects
GitOrigin-RevId: 2d40c51c23809c19f0a053093e8ee0719a0190e2
|
2018-12-19 16:02:29 +00:00 |
|
Chrystal Maria Griffiths
|
366dbbd54f
|
Merge pull request #1288 from sharelatex/cmg-cancel-comments-ff
Make comments cancel when you cancel them on firefox
GitOrigin-RevId: 68b8be1ac34f0510103f3b9a8e7b617988fb55de
|
2018-12-19 10:38:35 +00:00 |
|
Chrystal Maria Griffiths
|
2b556df43c
|
Merge pull request #1294 from sharelatex/mm-exportstatus-fields
F1000 export fixes
GitOrigin-RevId: 8f9a149cded8f204949750fc2788bc02223b84af
|
2018-12-19 10:38:29 +00:00 |
|
Ersun Warncke
|
bfeefe8406
|
Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects
Support importing projects with collabratec users to v2
GitOrigin-RevId: 2dd3781dde158cdab6bf95138311224a032ab8a4
|
2018-12-18 15:14:37 +00:00 |
|
Douglas Lovell
|
740dce07a9
|
Merge remote-tracking branch 'origin/hb-publisher-management'
GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad
|
2018-12-18 13:42:56 +00:00 |
|
Paulo Jorge Reis
|
e139abb110
|
Merge pull request #1273 from sharelatex/ja-password-reset-v1
Handle v1-only users in v2 password reset flow
GitOrigin-RevId: 38ce8e9aebd3330b980e73640a23661d8015d4f3
|
2018-12-18 11:48:53 +00:00 |
|
Paulo Jorge Reis
|
4563ce864c
|
Merge pull request #1285 from sharelatex/pr-history-compare-labels-fixes
History compare labels fixes
GitOrigin-RevId: 176750c4017e5511a22f1792e37ab8918a142ec3
|
2018-12-18 11:48:49 +00:00 |
|
Christopher Hoskin
|
3e5bb147ec
|
Merge pull request #107 from sharelatex/csh-issue-1309-node-6.15
Bump node to 6.15
|
2018-12-18 11:16:25 +00:00 |
|
Christopher Hoskin
|
19bd4791dd
|
Add npm-shrinkwrap.json
|
2018-12-18 11:03:06 +00:00 |
|
Alasdair Smith
|
1160620afc
|
Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page
Revert "Import status page"
GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd
|
2018-12-17 15:45:36 +00:00 |
|
Christopher Hoskin
|
b57342128d
|
package-lock not supported until npm 5
|
2018-12-17 15:31:45 +00:00 |
|
Christopher Hoskin
|
dd3774b7a9
|
Bump node to 6.15.1
|
2018-12-17 15:29:56 +00:00 |
|
Alasdair Smith
|
56784c4089
|
Merge pull request #1240 from sharelatex/as-import-status-page
Import status page
GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a
|
2018-12-17 14:01:24 +00:00 |
|
Paulo Reis
|
4ff98f0237
|
Import history compare controller.
GitOrigin-RevId: 61d9a3f340703b07046bb6d7a6d67905befd6faa
|
2018-12-17 12:54:07 +00:00 |
|
Paulo Jorge Reis
|
d5c651c132
|
Merge pull request #1276 from sharelatex/pr-fix-history-v1
Undo rename and removal of the v1 history list controller.
GitOrigin-RevId: 7201214134e8c8988e49d99ebb308ea12010c694
|
2018-12-17 12:16:20 +00:00 |
|
Shane Kilkelly
|
8e25bbf61a
|
Merge pull request #48 from overleaf/sk-extend-request-timeouts
Extend http request timeouts
|
2018-12-17 10:48:26 +00:00 |
|
Paulo Jorge Reis
|
217bc180ac
|
Merge pull request #1251 from sharelatex/pr-history-labels-compare
History labels compare
GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c
|
2018-12-17 10:10:48 +00:00 |
|
Shane Kilkelly
|
40add6985f
|
Remove override of connect timeout
|
2018-12-17 09:39:19 +00:00 |
|
Jessica Lawshe
|
bd8642cedd
|
Merge pull request #1272 from sharelatex/jel-login-password-error-view
Add password reset link when password wrong/missing
GitOrigin-RevId: b0b5b5c0f8019d73e028890543da51e5e474a883
|
2018-12-14 21:12:19 +00:00 |
|
Shane Kilkelly
|
2195af88dd
|
Set timeouts on Post requests too
|
2018-12-14 16:34:48 +00:00 |
|
Shane Kilkelly
|
46904bfe73
|
Set timeouts on http requests to 3 minutes, up from the default of 20 seconds.
|
2018-12-14 16:13:58 +00:00 |
|
Jessica Lawshe
|
7666c8a481
|
Merge pull request #1236 from sharelatex/jel-password-reset
Reset password via API request to v1
GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6
|
2018-12-14 16:02:14 +00:00 |
|
Henry Oswald
|
a2ed182942
|
add process.env['LOG_LEVEL'] varable to let us change the logging level
|
2018-12-14 14:30:01 +00:00 |
|
Christopher Hoskin
|
424a8c3d2a
|
Merge pull request #106 from sharelatex/csh-prom-metrics
Use promethus metrics
|
2018-12-14 10:21:40 +00:00 |
|
Shane Kilkelly
|
0bc82e6936
|
Merge pull request #46 from overleaf/sk-increase-push-timeout
Change push timeout to three minutes
|
2018-12-14 09:46:46 +00:00 |
|
Shane Kilkelly
|
26ff545415
|
Merge pull request #47 from overleaf/sk-print-good-error-when-404
When user clone/pull/etc a project which doesn't exist, print a nice message
|
2018-12-14 09:46:26 +00:00 |
|
Nate Stemen
|
f6ef1cd6a3
|
d'oh add individual decaffed files before committing
|
2018-12-13 16:59:55 -05:00 |
|
Nate Stemen
|
9c44a2c9fc
|
download rc files in script and quote filenames
|
2018-12-13 16:55:47 -05:00 |
|
Christopher Hoskin
|
392884356e
|
Revert "Bump buildscript to 1.1.10"
This reverts commit 38874f9169abfb1bcc7297988abe22c012a4c107.
|
2018-12-13 17:37:16 +00:00 |
|
Christopher Hoskin
|
45a7adab6e
|
Revert "Initialise metrics at begining of app"
This reverts commit 855f26c5205039e96cfea8d224eff5ebb743e046.
|
2018-12-13 17:33:45 +00:00 |
|
Shane Kilkelly
|
a72b29efd8
|
Merge pull request #1259 from sharelatex/ja-sso-settings-link
Add link from v2 settings page to manage linked accounts in v1
GitOrigin-RevId: 2aabd0669349023d6b0da520c55587feb19b5201
|
2018-12-13 15:09:59 +00:00 |
|
Shane Kilkelly
|
1836932256
|
Merge pull request #1247 from sharelatex/sk-git-bridge-acceptance-tests
Git bridge acceptance tests (initial)
GitOrigin-RevId: 66736ed568296674046b368861446eeb6eae664b
|
2018-12-13 15:09:53 +00:00 |
|
Shane Kilkelly
|
c423e483ba
|
Merge pull request #1256 from sharelatex/sk-file-upload-retry
Add a retry around `FileStoreHandler.uploadFileFromDisk`
GitOrigin-RevId: 2fc54036acdeda15c00a3d0222fd1a83683a5798
|
2018-12-13 15:09:48 +00:00 |
|
Christopher Hoskin
|
b49de8e57c
|
Bump buildscript to 1.1.10
|
2018-12-13 14:45:40 +00:00 |
|
Christopher Hoskin
|
f9b0ac0e80
|
Initialise metrics at begining of app
|
2018-12-13 14:24:44 +00:00 |
|
Christopher Hoskin
|
533ec9128e
|
Bump metrics-sharelatex to v2.0.12
|
2018-12-13 14:21:32 +00:00 |
|
Henry Oswald
|
f0fd0299fe
|
Merge pull request #15 from sharelatex/ho-profiler
add google profiler
|
2018-12-13 14:18:35 +00:00 |
|
Christopher Hoskin
|
2559b63f04
|
Bump metrics-sharelatex.git to v2.0.11
|
2018-12-13 14:15:19 +00:00 |
|