Commit graph

17862 commits

Author SHA1 Message Date
Christopher Hoskin
fed40ff2cc Bump buildscript to v1.1.11 2019-01-11 12:51:22 +00:00
Christopher Hoskin
c59e74f80f Seems to need this too 2019-01-11 12:48:28 +00:00
Christopher Hoskin
f39b51de04 Add **/*.map to .gitignore 2019-01-11 12:11:36 +00:00
Christopher Hoskin
4aa2f7de32 Remove grunt 2019-01-11 12:06:45 +00:00
Christopher Hoskin
cc00d5311b Bump buildscript to 1.1.11 2019-01-11 11:52:10 +00:00
Brian Gough
eb5738886a Merge pull request #1382 from sharelatex/bg-fix-locking-for-copy
fix locking for copy file method in ProjectEntityUpdateHandler

GitOrigin-RevId: a0c2a69f31bd17d8ae5cbfbc1047db22207f9bbe
2019-01-11 10:27:20 +00:00
Christopher Hoskin
fe60edca56 Init metrics at top of app.coffee 2019-01-11 10:19:47 +00:00
Christopher Hoskin
6e3fd0effb Bump logger to v1.5.9 and settings to v1.1.0 2019-01-11 10:18:37 +00:00
Shane Kilkelly
d86d257b05 Merge pull request #50 from overleaf/sk-fix-imported-unchanged-projects
Handle imported, and unchanged, projects
2019-01-10 10:36:58 +00:00
Christopher Hoskin
8b59e77d89 Merge pull request #7 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - contacts
2019-01-10 10:31:54 +00:00
Shane Kilkelly
4dc140aced Add integration test to cover imported-but-not-changed projects 2019-01-10 10:21:31 +00:00
Christopher Hoskin
8843f99ef3 Add **/*.map to .gitignore 2019-01-10 09:29:12 +00:00
Christopher Hoskin
faa071c7c9 Shrinkwrap 2019-01-10 09:28:19 +00:00
Christopher Hoskin
be2459c9a2 Remove grunt 2019-01-10 09:21:59 +00:00
Christopher Hoskin
c01c5930ef Bump buildscript to 1.1.10 2019-01-10 09:18:01 +00:00
Christopher Hoskin
915251252f Bump logger to v1.5.9 and settings to v1.1.0 2019-01-10 09:15:37 +00:00
Christopher Hoskin
69a8d9c7f1 Switch metrics to v2 2019-01-10 09:11:15 +00:00
Christopher Hoskin
ed43bd8da6 Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-10 09:00:57 +00:00
Christopher Hoskin
32c6bb9874 Merge pull request #6 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - notifications
2019-01-10 08:57:59 +00:00
Ersun Warncke
d30c0a964c Merge pull request #1367 from sharelatex/ew-remove-duplicate-v1-ids
remove duplicate v1 ids

GitOrigin-RevId: 9edc94e992f4a8ac653a7cd79490207a0154b3ae
2019-01-10 08:14:53 +00:00
James Allen
ea415ea639 Merge pull request #1374 from sharelatex/as-fix-dash-user-fetch
Include owners email in user fetch to show on dashboard if needed

GitOrigin-RevId: 7175700f77501723f48763b9ee9397c0448d4109
2019-01-09 17:08:57 +00:00
James Allen
7ee0dcbd7c Merge pull request #1377 from sharelatex/as-deemphasise-download-zip
De-emphasise download zip button if not the primary action

GitOrigin-RevId: 041c44109897c30ade9f5ed2ef47a416749a87a5
2019-01-09 17:08:52 +00:00
Henry Oswald
b89db17ea6 reduce logging 2019-01-09 15:41:52 +00:00
Christopher Hoskin
3f21d32808 Add **/*.map to .gitignore 2019-01-09 15:27:14 +00:00
Christopher Hoskin
4c92bead42 Remove grunt 2019-01-09 15:22:57 +00:00
Christopher Hoskin
b9fe57757e Bump build script to v1.1.10 2019-01-09 15:22:17 +00:00
Christopher Hoskin
8a046ddf20 Adapt for metrics v2 2019-01-09 15:20:36 +00:00
Christopher Hoskin
f2230d6f27 Bump metrics to v2.0.12, logger to v1.5.9 and settings to v1.1.0, fixup shrinkwrap 2019-01-09 15:18:15 +00:00
Shane Kilkelly
4f1168a590 Add comments pointing to github issue 2019-01-09 14:24:04 +00:00
James Allen
b969526c19 Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs
Handle UserStubs when linking projects with owners

GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3
2019-01-09 13:41:06 +00:00
James Allen
1530062d00 Merge pull request #1370 from sharelatex/as-update-v1-tag-messaging
Update messaging on v1 tags now that v1 dash is inaccessible

GitOrigin-RevId: 4e2ca9e58ccf9b9feb2e94e92a310f8ce949184e
2019-01-09 13:40:55 +00:00
Christopher Hoskin
6a0d78b101 Merge pull request #37 from sharelatex/csh-ho-docker-issue-1338-bulk-upgrade
Services bulk upgrade - docstore
2019-01-09 12:26:58 +00:00
Shane Kilkelly
b8d252244c Tolerate case where there is no latest version timestamp in version info 2019-01-09 12:23:26 +00:00
Shane Kilkelly
ba8ba001d6 Fetch snapshots in edge-case where version-id is zero 2019-01-09 12:23:00 +00:00
Christopher Hoskin
5b70587765 Add **/*.map to .gitignore 2019-01-09 10:32:59 +00:00
Brian Gough
9d93eee3e8 return a 404 error (instead of a 500) when copying a missing file 2019-01-09 10:31:59 +00:00
Christopher Hoskin
27709709f3 Remove grunt 2019-01-09 10:31:42 +00:00
Christopher Hoskin
6760dd6ce0 Shrinkwrap 2019-01-09 10:29:24 +00:00
Christopher Hoskin
93443c737f Add note on running acceptance tests to README 2019-01-09 10:24:25 +00:00
Christopher Hoskin
b563b1b003 Bump logger to v1.5.9 and settings to v1.1.0 2019-01-09 08:50:53 +00:00
Christopher Hoskin
d1854c1897 Adapt for metrics v2 2019-01-09 08:49:32 +00:00
Christopher Hoskin
5dc2df2a70 Merge branch 'master' into csh-ho-docker-issue-1338-bulk-upgrade 2019-01-09 08:41:10 +00:00
Christopher Hoskin
fe4c75a2ab Remove grunt 2019-01-08 16:39:46 +00:00
Henry Oswald
68a0ff08ea Merge pull request #1366 from sharelatex/ho-bump-compile-size
Bump compile size

GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b
2019-01-08 16:37:00 +00:00
Christopher Hoskin
1c701a2d3d Bump buildscript to v1.1.10 2019-01-08 16:15:04 +00:00
Christopher Hoskin
65e1aba265 Update app.coffee to work with Metrics v2 2019-01-08 16:11:56 +00:00
Christopher Hoskin
85216fbd34 Update metrics to v2.0.12, logger to v1.5.9 and settings to v1.1.0, add npm-shrinkwrap 2019-01-08 16:08:40 +00:00
Christopher Hoskin
3eb2d27d4a Add **/*.map to .gitignore 2019-01-08 15:01:48 +00:00
Christopher Hoskin
5db1913cec Bump settings to v1.1.0 2019-01-08 15:00:26 +00:00
Christopher Hoskin
afaf045d15 Merge pull request #34 from sharelatex/csh-ho-docker-issue-1338-grunt
Merged Additional issue 1338 for real-time
2019-01-08 14:57:09 +00:00