Commit graph

17824 commits

Author SHA1 Message Date
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
Brian Gough
1ee4a1816c Merge pull request #1483 from sharelatex/jel-cms-table-style
Add styling for tables on CMS pages

GitOrigin-RevId: 3d258c5453cd47b434a6d3804687ca044cc704eb
2019-03-11 10:58:57 +00:00
Brian Gough
15a6169a06 Merge pull request #1526 from sharelatex/revert-1467-as-global-search-keybind
Revert "Enable search keybinding globally in editor"

GitOrigin-RevId: 423bebb48a237c8bda935bb6cb70c5cf953b7015
2019-03-11 10:58:47 +00:00
Brian Gough
43899589dc Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html

GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56
2019-03-11 10:58:32 +00:00
Brian Gough
2ab346e762 Merge pull request #1511 from sharelatex/as-inc-linked-file-rev
Increment rev of linked file to fix bug where dropbox not syncing

GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284
2019-03-11 10:58:21 +00:00
Ersun Warncke
b31022e329 remove jsx and react from eslint config and add eslint modules 2019-03-08 12:16:21 -04:00
Ersun Warncke
a2b5793f49 add eslint and prettier 2019-03-08 12:06:24 -04:00
Henry Oswald
266c6c368e have track changes make calls to web_api not web 2019-03-08 15:32:58 +00:00
Ersun Warncke
83597e8723 use ring buffer for logging and include with error 2019-03-08 10:09:44 -04:00
Shane Kilkelly
1da276fe2b Merge pull request #55 from overleaf/sk-refuse-v1-ids-redux
Reject v1 ids earlier in the pipeline
2019-03-08 12:09:53 +00:00
Shane Kilkelly
8f72cb89c8 Reject v1 ids earlier in the pipeline 2019-03-08 11:45:31 +00:00
Shane Kilkelly
78220d6430 Merge pull request #54 from overleaf/sk-upgrade-jgit-5.2-redux
Sk upgrade jgit 5.2 redux
2019-03-07 14:03:25 +00:00
Ersun Warncke
5a6e00e12b decaf 2019-03-06 16:08:38 -04:00
Shane Kilkelly
788fad5ce7 Remove a deprecated method, no longer compatible with JGit 5.2 2019-03-06 11:43:27 +00:00
Shane Kilkelly
600aa8d9cf Do mvn clean before build.
We've had build issues be hidden by caching. So we should build from
clean each time, in immitation of the prod build process.
2019-03-06 11:41:59 +00:00
Shane Kilkelly
c1e7969342 Revert "Revert "Upgrade JGit dependency to 5.2.1""
This reverts commit 42b5a32670e43b307ec2b0a34380e373b16be1fe.
2019-03-06 10:59:40 +00:00
Shane Kilkelly
0943248334 Revert "Upgrade JGit dependency to 5.2.1"
This reverts commit c0d9fb961396aa285e7ebf563b707c9fb299776c.
2019-03-06 10:31:07 +00:00
Shane Kilkelly
6d9e8d38e9 Merge pull request #53 from overleaf/sk-refuse-v1-ids
Refuse to process project-ids that look like they come from v1
2019-03-06 10:17:17 +00:00
Shane Kilkelly
a517035e2c Refuse to process project-ids that look like they come from v1 2019-03-06 10:16:55 +00:00
Shane Kilkelly
5ebfe68af2 Merge pull request #52 from overleaf/sk-upgrade-jgit-5.2
Upgrade JGit dependency to 5.2.1
2019-03-06 10:16:09 +00:00
Henry Oswald
4d7f9f3c1a add sentry into settings.defaults 2019-03-05 17:34:27 +00:00
Henry Oswald
b9e3853a47 add sentry into settings.defaults 2019-03-05 17:33:52 +00:00
Henry Oswald
4445b390af add sentry into settings.defaults 2019-03-05 17:33:23 +00:00
Henry Oswald
37b039abf0 add sentry to settings.defaults.coffee 2019-03-05 17:20:16 +00:00
Henry Oswald
e54a376d0e Merge branch 'master' of github.com:sharelatex/track-changes-sharelatex 2019-03-05 17:10:40 +00:00
Henry Oswald
d47dcca0d6 add sentry dsn to config 2019-03-05 17:10:18 +00:00
Christopher Hoskin
f89a5baeab Merge pull request #113 from sharelatex/ho-osx-epoll
add epoll_pwait to secomp profile
2019-03-04 14:57:01 +00:00
Christopher Hoskin
efb80b8135 Merge pull request #115 from sharelatex/csh-issue-204-clsi-log-stackdriver
Bump logger to v1.6.0
2019-03-04 14:56:17 +00:00
Christopher Hoskin
da7e65715b Bump logger to v1.6.0 2019-03-04 12:05:28 +00:00
Shane Kilkelly
845397639e Upgrade JGit dependency to 5.2.1 2019-03-04 10:15:34 +00:00
Shane Kilkelly
e3494f95d7 Merge pull request #98 from sharelatex/sk-update-readme
Update the readme with a short explanation of how this code works
2019-03-01 11:16:32 +00:00
Shane Kilkelly
f8b3741292 remove bit from readme 2019-03-01 11:16:12 +00:00
Christopher Hoskin
d6def184c6 Merge pull request #19 from sharelatex/ho-docker
Bump node to 6.16.0
2019-02-25 09:17:10 +00:00
Christopher Hoskin
18518ce803 Merge pull request #16 from sharelatex/cmg-csh-ho-docker-spelling
Bump node to 6.16.0
2019-02-25 09:07:59 +00:00
Christopher Hoskin
67f3cc7f31 Fix aspell-ta 2019-02-23 01:40:28 +00:00
Brian Gough
6877baf314 increase acceptance test timeout to 1 minute 2019-02-22 13:58:12 +00:00
Brian Gough
b48d45f996 Merge pull request #114 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html
2019-02-22 11:35:24 +00:00
Brian Gough
60cee0a219 Merge pull request #55 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html
2019-02-22 10:20:16 +00:00
Brian Gough
11f07d1f09 Merge pull request #45 from sharelatex/bg-avoid-text-html-content-type-in-responses
use explicit json content-type to avoid security issues with text/html
2019-02-22 09:24:30 +00:00
Christopher Hoskin
49c9108788 Fix aspell or, te and no. Still need to fix ta 2019-02-21 10:15:23 +00:00
Christopher Hoskin
59c18c470d Clarify which dicts are from Ubuntu 2019-02-21 09:09:07 +00:00
Christopher Hoskin
9869be319e Merge branch 'master' into cmg-csh-ho-docker-spelling 2019-02-21 08:56:17 +00:00
Christopher Hoskin
52b172ae87 Merge pull request #18 from sharelatex/ho-docker
Move to dual Linode / GKE deploy
2019-02-20 07:36:15 +00:00
Henry Oswald
5119db43a7 Merge pull request #37 from sharelatex/ho-continual-pub-sub-traffic
setup continualPubsubTraffic to keep pub sub happy
2019-02-19 11:28:06 +00:00
Shane Kilkelly
9727c374b7 Update the readme with a short explanation of how this code works 2019-02-19 10:22:40 +00:00
Henry Oswald
26e903f384 setup continualPubsubTraffic
this keeps the pub sub channel ticking along happily
2019-02-15 17:04:49 +00:00
Chrystal Maria Griffiths
d0c9c469e8 Merge pull request #36 from sharelatex/cmg-fix-acceptance-test
Fix test to accommodate changes to anonymous users
2019-02-15 15:39:11 +00:00
Chrystal Griffiths
507c4e5ce2 Fix test to accommodate changes to anonymous users 2019-02-15 15:18:17 +00:00
Chrystal Maria Griffiths
0b88a63444 Merge pull request #35 from sharelatex/cmg-anonymous-display-name
Nameless logged in user labelled as anonymous
2019-02-15 14:53:18 +00:00