Commit graph

17862 commits

Author SHA1 Message Date
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
Henry Oswald
946beb78f9 Merge pull request #46 from sharelatex/ho-pendingUpdates-key
use redis cluster key in defaults for pendingupdates
2019-02-15 14:03:52 +00:00
Henry Oswald
937e8fe071 use redis cluster key in defaults for pendingupdates 2019-02-15 13:58:29 +00:00
Chrystal Maria Griffiths
e379691767 Merge pull request #1521 from sharelatex/as-fix-noreferrer-noopener
Add some missing rel="noreferrer noopener" attributes

GitOrigin-RevId: 470de17ba724b8ba544b736bf3a7682b3d499a5d
2019-02-15 13:33:54 +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
Chrystal Maria Griffiths
d52c30f272 Merge pull request #1512 from sharelatex/as-rate-limit-confirm-uni-domain-endpoint
Rate limit confirm university domain endpoint

GitOrigin-RevId: 1d03eec3c0e8208e5f643000693f685957e15442
2019-02-15 13:33:42 +00:00
Chrystal Maria Griffiths
96f283e2c6 Merge pull request #1477 from sharelatex/as-confirm-quick-action-archive-leave
Confirm archive or leave when clicking quick action buttons

GitOrigin-RevId: 95d728f22284bab17887a5ac7bc7461d501db7a2
2019-02-15 13:33:38 +00:00
Chrystal Maria Griffiths
b1c40d2c58 Merge pull request #1501 from sharelatex/cmg-anonymous-display-name
Label only truly anonymous users as anonymous

GitOrigin-RevId: c33a5c0584bd8a0603921fcf1579204b5fcac009
2019-02-15 13:33:33 +00:00
Chrystal Maria Griffiths
9abea8ae5f Merge pull request #1516 from sharelatex/as-sanitize-team-notice
Show sanitized HTML for team notice on subscription page

GitOrigin-RevId: 20256eed298a709d663bdfd0057e0d8462722a0c
2019-02-15 13:33:28 +00:00
Chrystal Maria Griffiths
778af6ca40 Merge pull request #1510 from sharelatex/ns-moar-contrast
better contrast in github modal

GitOrigin-RevId: b841f18933bfa2c916c8d2092578a895db0346dd
2019-02-15 13:33:23 +00:00
Jessica Lawshe
429e392fbb Merge pull request #1518 from sharelatex/jel-search-result-url
encodeURIComponent on wiki search result

GitOrigin-RevId: 87cb53784de691677a56a5e3fc139a35ad7ae941
2019-02-14 18:24:27 +00:00
Jessica Lawshe
c9eab36031 Merge pull request #1455 from sharelatex/jel-cms-color-block
Add color block feature to CMS pages

GitOrigin-RevId: 51a9828d62275308422bdb0d6e2e90cfef0a638a
2019-02-14 18:24:22 +00:00
Brian Gough
cc613f4370 Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors
Return error status to the publish modal on export creation error

GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8
2019-02-14 15:03:42 +00:00