Commit Graph

4947 Commits

Author SHA1 Message Date
Alasdair Smith cab3efd77c Merge pull request #25 from sharelatex/hof-history-name
show user.name in history if available
2017-10-03 10:57:52 +01:00
Brian Gough b7330801bd Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal 2017-10-02 11:06:18 +01:00
Joe Green 3c9c94f3c2 release number (#32)
Replace release number in pug template for sentry
2017-09-29 10:37:39 +01:00
Brian Gough c50f309b09 add missing whitespace in pdf.pug 2017-09-28 15:12:37 +01:00
Brian Gough 13628f82ec Merge pull request #17 from sharelatex/bg-lock-compiles
show error for compile in progress
2017-09-27 13:54:16 +01:00
Hayden Faulds 96a129a860 show user.name in history if available 2017-09-27 10:54:06 +01:00
James Allen 63097aaf73 Merge pull request #24 from sharelatex/ja-dockerize-acceptance-tests
Set up acceptance tests to run in docker container; Fixes overleaf/sharelatex#138
2017-09-27 11:01:49 +02:00
James Allen 23bd840796 Fix MockDocStoreApi name 2017-09-27 10:53:00 +02:00
James Allen ffc35d9d65 Include docker command directly because node isn't available in Jenkins 2017-09-27 10:50:34 +02:00
James Allen 1502da85cf Set up acceptance tests to run in docker container 2017-09-27 10:37:20 +02:00
Hayden Faulds 02d54d815f Merge pull request #16 from sharelatex/as-prevent-hidden-autocompile
Prevent autocompile if PDF preview hidden
2017-09-26 15:38:31 +01:00
Hayden Faulds a9b18e4435 Merge pull request #10 from sharelatex/hof-history-apis
Add User and Project endpoints by overleaf ids
2017-09-26 15:37:32 +01:00
Hayden Faulds 4adf88ca01 handle OL or SL ids in UserInfoController.getPersonalInfo 2017-09-26 11:40:05 +01:00
Hayden Faulds 2c0e9bb89a return overleaf details from ProejctsDetailsHandler.getdetails 2017-09-26 10:19:30 +01:00
Brian Gough 0f855689a7 show error for compile in progress 2017-09-26 08:07:35 +01:00
Alasdair Smith 5b3c9f4033 Prevent autocompile if pdf preview is hidden 2017-09-25 15:46:43 +01:00
Alasdair Smith e31464b47d Keep track of pdf layout hidden state 2017-09-25 15:46:29 +01:00
Alasdair Smith 2d3bae2f7b Merge pull request #9 from sharelatex/as-decode-ranges
Decode comments & track changes from real-time
2017-09-22 13:50:37 +01:00
Alasdair Smith 96d13215e3 Be more defensive when checking encoded text 2017-09-22 09:36:50 +01:00
Alasdair Smith f8d4923547 Wrap in try/catch 2017-09-21 15:41:24 +01:00
Alasdair Smith 42b604dcda Clean up decoding from websockets 2017-09-21 15:41:24 +01:00
Alasdair Smith a022f83cce Fix order of args 2017-09-21 15:22:56 +01:00
Alasdair Smith e2bb6dcecb Pass option to encode range
To ensure backwards compat with clients not refreshing, pass a flag to enable
encoding.  This way, old client won't receive encoded ranges, but also won't
have decoding logic. The flag can then be removed once all clients are up to
date
2017-09-21 14:23:39 +01:00
Alasdair Smith b33929fa83 DRY up 2017-09-21 13:36:31 +01:00
Alasdair Smith 24f44889a7 First pass at decoding changes & comments in ranges 2017-09-21 13:25:19 +01:00
Alasdair Smith e2547e0051 Merge pull request #6 from sharelatex/as-fix-autocompile-setting
Send JSON in autocompile setting event payload
2017-09-19 15:57:33 +01:00
Alasdair Smith 4007fc682b Send JSON in autocompile setting event payload 2017-09-19 15:55:00 +01:00
Alasdair Smith 66bed67270 Merge pull request #4 from sharelatex/as-client-auto-compile
Client-side auto compile
2017-09-19 15:20:07 +01:00
Alasdair Smith 963a14b33c Fix incorrectly named var and remove unneccessary semicolon 2017-09-19 14:25:30 +01:00
James Allen 8852e09274 Merge pull request #1 from sharelatex/jpallen-patch-1
Delete cleanup.js
2017-09-18 14:30:04 +02:00
James Allen 5a7e4f9fb0 Merge pull request #3 from sharelatex/ja-oss-sync
Push master branch to public repo after successful build
2017-09-18 14:15:33 +02:00
James Allen d0ce22b0f8 Add in overleaf-integration module to build 2017-09-18 11:30:43 +02:00
James Allen ece7a4cbb7 Merge pull request #601 from sharelatex/ns-raise-safari-regex-count
Raising the limit on safari regex count
2017-09-18 11:16:49 +02:00
James Allen 1bafba8992 Merge pull request #586 from sharelatex/ns-add-SL-command-data
adding commands that appear in top 100 from SL-CLSI analysis
2017-09-18 11:16:41 +02:00
James Allen fa13e1051a Merge pull request #585 from sharelatex/sk-ac-refactor-autocompletemanager
Refactor out common code in AutocompleteManager.
2017-09-18 11:16:29 +02:00
James Allen a0ac11eb0d Actually push to master branch 2017-09-18 11:11:33 +02:00
James Allen f0092bc85a Push master branch to public repo after successful build
Note that this has to happen outside of the docker container to
work around issues with git and user ids, so we've had to
modify the pipeline to explicitly run the steps inside docker
as needed.
2017-09-18 11:10:22 +02:00
Henry Oswald a7217f1d37 Merge branch 'ho-csrf-acceptence-tests' 2017-09-15 13:50:17 +01:00
James Allen adf211a226 Merge pull request #594 from sharelatex/ja-include-token-in-project-schema
Include OL tokens in project schema
2017-09-15 11:41:24 +02:00
Brian Gough 1bca1e11a9 fix broken unit test 2017-09-15 09:20:53 +01:00
Brian Gough 9f9c15f6f5 Merge pull request #599 from sharelatex/bg-reset-project-state
clear docupdater project state in deleteAuxFiles
2017-09-15 09:09:29 +01:00
James Allen a0e25386fc Delete cleanup.js 2017-09-14 17:00:44 +02:00
Brian Gough 28a80cf23d Merge pull request #604 from sharelatex/bg-fix-root-doc-in-incremental-compile
fix root doc in incremental compile
2017-09-13 13:47:22 +01:00
Brian Gough 046c0b856d Merge pull request #605 from sharelatex/ta-remove-extra-headers
Remove extra security headers
2017-09-13 11:07:36 +01:00
Tim Alby a04adbf132 remove extra security headers 2017-09-13 11:53:11 +02:00
Brian Gough 51eb94a493 handle incremental compile without root doc 2017-09-13 10:10:44 +01:00
Shane Kilkelly c623fa9f3f Merge pull request #603 from sharelatex/sk-pin-chai-dependency
Pin chai version
2017-09-12 11:40:12 +01:00
Brian Gough 0e87b8950e update clearProjectState endpoint 2017-09-12 11:40:00 +01:00
Shane Kilkelly 54070c7734 pin chai 2017-09-12 11:21:34 +01:00
Timothée Alby 573b5bedf1 Merge pull request #597 from sharelatex/secure-headers
Add security headers
2017-09-12 11:54:11 +02:00