Commit Graph
18100 Commits
Author SHA1 Message Date
Chrystal Maria Griffiths 91594eee6d Merge pull request #1473 from sharelatex/as-fix-notification-translation
Inject data into translation string to workaround removed potential XSS

GitOrigin-RevId: 6d9fa7050dafa1d48e3622765586eb4350dc514b
2019-02-04 16:24:57 +00:00
Chrystal Maria Griffiths f5a6992aaa Merge pull request #1475 from sharelatex/sk-dont-require-login-email-confirmation
Don't require login for email confirmation action

GitOrigin-RevId: 653baa394a8cdc08e4a52681d64fbd18ae34baca
2019-02-04 16:24:52 +00:00
Chrystal Maria Griffiths d187b6b186 Merge pull request #1463 from sharelatex/jel-quote-style
Set a min-width on .quote-by

GitOrigin-RevId: 843c4bca65ca19308814521556af16d56f4af5ad
2019-02-04 16:24:47 +00:00
Chrystal Maria Griffiths 09444a5e42 Merge pull request #1456 from sharelatex/sk-references-refresh
When refreshing linked file, if it's from mendeley/zotero, re-index

GitOrigin-RevId: 4f9916d0682335e1477674b46c1133a4a9d0e6af
2019-02-04 16:24:40 +00:00
Chrystal Maria Griffiths 2463fef390 Merge pull request #1454 from sharelatex/hb-subscriptions-page-messaging
Subscription page messaging updates

GitOrigin-RevId: c29999d22636dfe11c55b3f6110a38992645fad3
2019-02-04 16:24:35 +00:00
Chrystal Maria Griffiths e73a7dbe9c Merge pull request #1431 from sharelatex/mm-pubmodal-show-errors
Show export creation errors to the user

GitOrigin-RevId: fc116cfcfc2ca49d19188f01ef7b3460e4619503
2019-02-04 16:24:30 +00:00
Chrystal Maria Griffiths cdf9bb432b Merge pull request #1442 from sharelatex/bg-ignore-generated-files-in-vscode
add vscode workspace settings to ignore generated files

GitOrigin-RevId: 59d58bc98b3707ff32ca925dcfb34abf78d18999
2019-02-04 16:24:25 +00:00
Chrystal Maria Griffiths d1150ec13d Merge pull request #1461 from sharelatex/ns-escape-double-backslash
fix double backslash not being escaped

GitOrigin-RevId: 901d5f1bfdf1434edcef4e28c5c15a848b40134b
2019-02-04 16:24:20 +00:00
Chrystal Maria Griffiths 11b6ae0982 Merge pull request #1457 from sharelatex/ns-tikz-highlight
Better TikZ support

GitOrigin-RevId: 963853cea4e3bdd9046b5b44b5719cc1a82ece5f
2019-02-04 16:24:15 +00:00
Chrystal Maria Griffiths 210e2700a9 Merge pull request #1467 from sharelatex/as-global-search-keybind
Enable search keybinding globally in editor

GitOrigin-RevId: 8e36dbe44ffd385d212bf9dabb549fd04b84a428
2019-02-04 16:24:09 +00:00
Henry Oswald a07e516f65 update redis key 2019-02-04 10:22:26 +00:00
Henry Oswald 8d3fb729c5 point to web_api 2019-02-01 20:10:47 +00:00
Henry Oswald e44a02391a standardise name of document-updater 2019-02-01 20:04:43 +00:00
Henry Oswald 98de529e42 make config look like chef config 2019-02-01 19:52:00 +00:00
Henry Oswald 6a3506aed9 update redis key schema for cluster 2019-02-01 19:42:14 +00:00
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