Commit graph

9007 commits

Author SHA1 Message Date
Hayden Faulds
57de597e60 404 when resyncing deleting projects 2018-03-16 15:26:19 +00:00
Hayden Faulds
f514b68936 Merge pull request #416 from sharelatex/hof-history-disabled-resync
disable history resync when project-history is not enabled
2018-03-16 14:08:22 +00:00
Hayden Faulds
482d140716 add overleaf to projection 2018-03-16 13:29:22 +00:00
Alberto Fernández Capel
6609c10d36 Use exponential backoff to retry request to analytics 2018-03-15 17:14:50 +00:00
Hayden Faulds
d22d8324af disable history resync when project-history is not enabled 2018-03-15 16:57:39 +00:00
Alasdair Smith
19645bd7f4 Merge pull request #399 from sharelatex/as-webpack-prod
Production webpack
2018-03-15 14:09:12 +00:00
Alberto Fernández Capel
a2ec6849dd Clean up npm-shrinkwrap.json
I followed these steps (from master, in the docker dev env):

 - rm -rf node_modules/*
 - npm install
 - npm shrinkwrap --dev
2018-03-15 12:23:40 +00:00
Alasdair Smith
2e0804c728 Fix opts not passed to buildJsPath 2018-03-15 12:15:00 +00:00
Alasdair Smith
4d79c68f41 Rename webpack prod compile to minify_es and run as part of minify step
Fixes issue where webpack prod files were wiped after running minify on CI
2018-03-15 11:29:36 +00:00
Alasdair Smith
7e990dc67e Use global var for underscore
This is simpler than extracting as an external, though less explicit, as
getting webpack & AMD to play nice is hard
2018-03-15 09:42:26 +00:00
Alasdair Smith
fe3636c714 Ignore compiled es directory 2018-03-15 09:42:26 +00:00
Alasdair Smith
44998c05df Prod webpack outputs to minjs dir 2018-03-15 09:42:26 +00:00
Alasdair Smith
408c195c6a Instead of using webpack chunk hashing, use existing system 2018-03-15 09:42:26 +00:00
Alasdair Smith
8537c7b9b6 Add production webpack npm script 2018-03-15 09:42:26 +00:00
Alasdair Smith
4a801d266e Copy paste some prod webpack config from v1 2018-03-15 09:42:26 +00:00
James Allen
de94e33b5d Merge pull request #397 from sharelatex/ja-fix-project-upload
Add files to project in series to avoid lock contention
2018-03-13 13:33:16 +00:00
James Allen
371caa41ca Merge pull request #378 from sharelatex/hof-history-resync
resync project history endpoint
2018-03-13 13:33:08 +00:00
James Allen
d9b301023a Use eachSeries rather than a job array 2018-03-13 13:30:06 +00:00
James Allen
33904fe7be Add files to project in series to avoid lock contention 2018-03-13 13:21:48 +00:00
Alasdair Smith
1f7ef3ad6e Merge pull request #393 from sharelatex/as-fix-cm-sharejs
Fix CM/ShareJS adapter from throwing error when deleting
2018-03-13 11:21:52 +00:00
Alasdair Smith
458506ff66 Merge pull request #394 from sharelatex/as-karma-fake-img
Handle fake images in karma, preventing 404 warnings
2018-03-13 11:21:22 +00:00
Alasdair Smith
41d8a50a8e Merge pull request #385 from sharelatex/sk-add-recent-team-activity-proxy
Add a proxy to `AnalyticsRouter` for `/recentTeamActivity`
2018-03-13 11:20:55 +00:00
Alasdair Smith
8abf3593fb Prevent CM/Sharejs adapter from overwriting value in editor 2018-03-13 11:16:56 +00:00
Alasdair Smith
9cf9a7e4fc Fix CM/ShareJS adapter using old CM api
Fixes bug where deleting text in CM would throw an error in some
circumstances
2018-03-13 11:16:49 +00:00
Alasdair Smith
ef0b550234 Handle fake images in karma, preventing 404 warnings 2018-03-12 15:06:58 +00:00
Shane Kilkelly
2ceb7daa97 Merge pull request #361 from sharelatex/ta-record-new-project-event
Record New Project Event
2018-03-12 13:11:20 +00:00
Shane Kilkelly
9dc8600588 Add a unit test for the analytics events sent from project-creation 2018-03-12 10:50:15 +00:00
Hayden Faulds
a7945e9b96 extra logging for DocumentUpdaterHandler 2018-03-09 11:16:35 +00:00
Hayden Faulds
75f5fbcdbf refactor DocumentUpdaterHandler 2018-03-09 11:15:18 +00:00
Hayden Faulds
af9cc28419 additional logging 2018-03-09 11:11:06 +00:00
Hayden Faulds
792e8bbd7e fix route name 2018-03-09 11:11:06 +00:00
Hayden Faulds
9ab0ded8f1 update project history resync url 2018-03-09 11:11:06 +00:00
Hayden Faulds
5b2e7d981a resyncProject -> resyncProjectHistory 2018-03-09 11:11:06 +00:00
Hayden Faulds
50fdfec6e8 add unit tests for project history resync 2018-03-09 11:11:06 +00:00
Hayden Faulds
926f91dd3b wrap project resync in project structure lock 2018-03-09 11:11:06 +00:00
Hayden Faulds
4d2f0218af add resync project history endpoint 2018-03-09 11:11:06 +00:00
Henry Oswald
d93f5fa6be Merge pull request #387 from sharelatex/ho-fix-system-messages
added padding-top for system messages
2018-03-08 10:03:12 +00:00
Henry Oswald
5b51d190c7 Update navbar.less 2018-03-08 09:56:23 +00:00
Henry Oswald
2abafdbf64 added padding-top for system messages 2018-03-07 17:27:32 +00:00
Alasdair Smith
2a7d367d1c Merge pull request #386 from sharelatex/as-fixture-fix
Fixes frontend fixtures and improves command
2018-03-07 10:51:33 +00:00
Alasdair Smith
8bde5120dd Change frontend test commands so its easier to run locally in debug mode 2018-03-07 09:52:08 +00:00
Alasdair Smith
9ed4f121b1 Append fixture el to actual DOM 2018-03-07 09:51:54 +00:00
Tim Alby
d5109d22d2 record both project-created and project-imported events 2018-03-06 18:26:25 -05:00
Tim Alby
4b291fab2a Record new project event 2018-03-06 18:13:24 -05:00
Shane Kilkelly
f6e66b9346 Add a proxy to AnalyticsRouter for /recentTeamActivity 2018-03-06 16:21:28 +00:00
Alasdair Smith
8781023b80 Merge pull request #380 from sharelatex/as-eslint-warning
Remove eslint from webpack compile
2018-03-06 14:41:04 +00:00
Shane Kilkelly
84fff5e9b7 Merge pull request #379 from sharelatex/sk-geolocate-user-sessions
Geolocate user, and pass country-code to editing-sessions
2018-03-06 11:33:50 +00:00
Shane Kilkelly
0d7ca1fc40 Merge pull request #383 from sharelatex/as-karma-fixtures
Add fixtures support to frontend tests
2018-03-06 11:33:34 +00:00
Alasdair Smith
2453e55ebb Remove eslint loader
After using the webpack set up a bit more, having linting block compiles in
dev is more annoying than helpful. Linting pre commit is more valuable
2018-03-06 11:18:40 +00:00
Shane Kilkelly
7d81c42b9c More explicit handling of empty-string country-code 2018-03-06 10:32:28 +00:00