Commit graph

22485 commits

Author SHA1 Message Date
Henry Oswald
0939a558d7 point real time to web api 2019-02-01 19:27:56 +00:00
Henry Oswald
6cdfd5b659 added http auth to config 2019-02-01 17:25:45 +00:00
Henry Oswald
19007befb2 Merge branch 'master' into ho-docker 2019-02-01 16:26:45 +00:00
Henry Oswald
fd143cf2bf bulk update build scripts, internal packages
moved internal packages from git to npm
2019-02-01 16:23:24 +00:00
Henry Oswald
38dbea4b0e bulk upgrade to 1.1.12, moved to npm rather than git 2019-02-01 16:18:23 +00:00
Henry Oswald
d949e64e2e Merge pull request #17 from sharelatex/ho-dual-statsd-prom
MVP for running both statsd and prom side by side
2019-02-01 09:00:43 +00:00
Henry Oswald
b38b5989db bulk upgrade to 1.1.12, moved to npm rather than git 2019-01-31 16:44:24 +00:00
Henry Oswald
10f71a6a9d bump build scripts and move to npm modules 2019-01-31 16:13:21 +00:00
Henry Oswald
ea845f4935 bulk upgrade to 1.1.12, moved to npm rather than git 2019-01-31 16:01:20 +00:00
Henry Oswald
3051d7db4b bulk upgrade to 1.1.12, moved to npm rather than git 2019-01-31 16:00:24 +00:00
Henry Oswald
cfd6225b1c bulk upgrade to 1.1.12, moved to npm rather than git 2019-01-31 15:48:17 +00:00
Henry Oswald
23e0ce678e call app real-time 2019-01-31 15:33:11 +00:00
Henry Oswald
6f06598eb5 bulk update build scripts
- logger, metrics build scripts updates
2019-01-31 15:01:49 +00:00
Timothée Alby
01a8cc9aea Merge pull request #1460 from sharelatex/ns-remove-only
remove only call

GitOrigin-RevId: cfe130bec782079cce9aa8bf7e5c7541def6159d
2019-01-30 20:11:45 +00:00
Henry Oswald
463aee6140 Merge branch 'master' into ho-docker 2019-01-30 15:27:27 +00:00
Chrystal Maria Griffiths
d9692b7f91 Merge pull request #1168 from sharelatex/cmg-range-prototype
Rich text track changes pt. 1 view changes

GitOrigin-RevId: a50ba1491a46525894b32b87a8c05be0af90084d
2019-01-30 14:07:06 +00:00
nate stemen
d0de92ea8e Merge pull request #19 from sharelatex/spd-settings-sharelatex-git-tag
Use correct git tag for settings-sharelatex repository
2019-01-30 11:25:53 +00:00
Henry Oswald
bf18c6e513 MVP for running both statsd and prom side by side
statsd code is from v1.8.1
2019-01-30 11:11:37 +00:00
Ersun Warncke
d4a2e7e3bf Merge pull request #10 from sharelatex/ew-check-log-level
check dynamic log level in gce metadata
2019-01-30 06:37:34 -04:00
Douglas Lovell
dc60d6b630 Merge remote-tracking branch 'origin/as-validate-email-length'
GitOrigin-RevId: 00f46c637a7563443e903f491ec39446dc570b5f
2019-01-29 20:32:28 +00:00
Ersun Warncke
128c9f7c39 lower case prod check, bump version 2019-01-29 12:00:14 -04:00
Ersun Warncke
8764c7378b check dynamic log level in gce metadata 2019-01-29 10:13:26 -04:00
Timothée Alby
9a0dd31d8c Merge pull request #1061 from sharelatex/ja-remove-domain-license-code
Remove deprecated domain license code

GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714
2019-01-29 12:08:29 +00:00
Timothée Alby
bc2ee419eb Merge pull request #1451 from sharelatex/ns-check-institution-users-patch
remove extra emails call in mongo query

GitOrigin-RevId: d64ab2ef72fe7691bc29e56210de0e04743ee917
2019-01-29 12:08:24 +00:00
James Allen
286dd564e2 Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection
Fix history default file selection and bug when comparing with version zero

GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1
2019-01-29 10:12:17 +00:00
James Allen
b85595b8ca Merge pull request #1426 from sharelatex/as-cleanup-grunt
Cleanup grunt config & dependencies

GitOrigin-RevId: e44445e727e8cf56d03bf33a8741b9a47418a620
2019-01-29 10:12:10 +00:00
James Allen
abb259a98b Merge pull request #1432 from sharelatex/as-upgrade-angular-sanitize-1.6.4
Upgrade to angular-sanitize 1.6.4

GitOrigin-RevId: 80ce995bdc622c83f7247b1184dd9aeda381902e
2019-01-29 10:12:02 +00:00
Jessica Lawshe
87eb794ccc Merge pull request #1424 from sharelatex/as-fix-overlapping-toolbar
Fix overlapping toolbar

GitOrigin-RevId: 0b901ddb2d52024aee0e4151180bcbc2223a3181
2019-01-28 16:23:26 +00:00
Timothée Alby
b311f997aa Merge pull request #1444 from sharelatex/ta-ns-check-institution-users
add script to check all if users on institution are upgraded

GitOrigin-RevId: 903f3a65fc038862178a82f43d97a5a4630cf470
2019-01-28 14:38:29 +00:00
Timothée Alby
7739e0ece8 Merge pull request #1351 from sharelatex/hb-csv-metrics-export
Add metrics csv download button

GitOrigin-RevId: 51597ef5b5901b1a659763d190648ed8d37e42ed
2019-01-28 14:38:21 +00:00
Timothée Alby
300e7d2f12 Merge pull request #1449 from sharelatex/ta-subscription-page-fix
Fix Subscription Page for Users with Free Affiliation

GitOrigin-RevId: 3b3b2649c4ade40c7dc04e7c090748408de1fb6e
2019-01-28 14:38:16 +00:00
Timothée Alby
6985f7d1a3 Merge pull request #1443 from sharelatex/jel-vat-plans-page
Add VAT text to plans page

GitOrigin-RevId: a0693737cbf57bbb094e9ee77273bab1b687e619
2019-01-28 14:38:08 +00:00
Henry Oswald
85011ed0e7 add path into inc options 2019-01-28 14:37:54 +00:00
Henry Oswald
d279a9149c add dispatcherCount to config file 2019-01-25 17:24:19 +00:00
Henry Oswald
76b054c7f4 bump node redis to 1.0.5 2019-01-25 17:01:59 +00:00
Henry Oswald
2e46cfb3eb bump node redis to 1.0.5 2019-01-25 16:38:42 +00:00
Henry Oswald
c8070cd191 Merge pull request #5 from sharelatex/ho-redis-io-4
Bump to redisio 4
2019-01-25 15:54:43 +00:00
Christopher Hoskin
a708c347d4 Run gpg with no tty 2019-01-25 11:33:23 +00:00
Henry Oswald
08e48afcb9 more logging 2019-01-25 10:57:36 +00:00
Henry Oswald
338bee061c remove the cluster key as well 2019-01-25 10:50:34 +00:00
Henry Oswald
01d3d9d13e remove natmap 2019-01-25 10:37:00 +00:00
Henry Oswald
2b1f67b6fa remove natmap from defaults config 2019-01-25 10:30:31 +00:00
Henry Oswald
b193045a2a log out real time settings 2019-01-25 10:04:26 +00:00
Chrystal Griffiths
6eccaf30a3 Bump build scripts to 1.11 and node to 6.16.0 2019-01-25 09:41:33 +00:00
Henry Oswald
9eb3b0b221 add epoll_pwait to secomp profile
Last year golang changed from epoll_wait to epoll_pwait https://github.com/golang/go/issues/23750

This causes golang panic errors on mac when running secomp secure compiles using docker 18.09.1. It may start to become a problem on linux where we are running on 17.03.2-ce in production.
2019-01-24 12:30:37 +00:00
Douglas Lovell
2a72804434 Merge remote-tracking branch 'origin/as-different-share-copy-for-link-sharing'
GitOrigin-RevId: e8a0dfdc175e036dd491db41ab17d70604dd0cc3
2019-01-24 12:13:23 +00:00
Douglas Lovell
d2bccbec25 Merge remote-tracking branch 'origin/sk-admin-panel-projects'
GitOrigin-RevId: 56f17fe3bec6252bd3d933899e540813550a36ff
2019-01-24 12:13:16 +00:00
Douglas Lovell
bd9adbae52 Merge remote-tracking branch 'origin/bg-case-sensitive-import'
GitOrigin-RevId: d8d4fff4b4803f3cae6195ce1b60628cca326296
2019-01-24 12:13:11 +00:00
Douglas Lovell
c294a8425b Merge remote-tracking branch 'origin/ns-new-file-modal'
GitOrigin-RevId: 8017778fcf909edc499e9ca2a1bc5267f5a5906c
2019-01-24 12:13:02 +00:00
Douglas Lovell
59d4bd6182 Merge remote-tracking branch 'origin/ns-new-file-modal-error-handling'
GitOrigin-RevId: 4eadc159d779c10918e045e080e3b8be12e807a2
2019-01-24 12:12:56 +00:00