Commit graph

22485 commits

Author SHA1 Message Date
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
Christopher Hoskin
3288d6d321 Add **/*.map to .gitignore 2019-01-08 14:28:10 +00:00
Christopher Hoskin
4a3711aba8 Bump settings to v1.1.0 2019-01-08 14:26:05 +00:00
Henry Oswald
df906f300a Merge pull request #43 from sharelatex/ho-disable-exec-flag
Disable exec with settings flag
2019-01-08 13:39:42 +00:00
Henry Oswald
5d7104ed4b Merge pull request #110 from sharelatex/ho-increase-compile-size
pull clsi compile size limit into setting and bump to 7mb
2019-01-08 13:30:00 +00:00
James Allen
563cdfd439 Merge pull request #1363 from sharelatex/as-gdpr-notice
Add note about deleting a project if no owner to import status page

GitOrigin-RevId: 3c88ab66b6e8c351c7111c87ba3b8d9df701bdb4
2019-01-08 13:02:19 +00:00
James Allen
8653a3d9cd Merge pull request #1364 from sharelatex/ja-fix-user-stub-owner-imports
Handle UserStubs for project owner

GitOrigin-RevId: ab3d9edf6e44a7867285430c14c73b3e64fd4c04
2019-01-08 13:02:14 +00:00
Henry Oswald
00cc5f05e5 pull clsi compile size limit into setting and bump to 7mb 2019-01-08 12:56:16 +00:00
Alasdair Smith
42cf6a1216 Merge pull request #1362 from sharelatex/as-fix-status-page
Fixes for import status page

GitOrigin-RevId: 65c18e1c0ea981bf6e5cc8b65045566e14d5fb12
2019-01-08 12:02:58 +00:00
Shane Kilkelly
766dcc379c Merge pull request #49 from overleaf/sk-git-bridge-handle-deprecation
Handle when v1 is deprecated, print a message instead of an error
2019-01-08 10:09:29 +00:00
Shane Kilkelly
779778fdb1 Use newUrl if supplied when v1 is deprecated 2019-01-08 09:47:01 +00:00
Ersun Warncke
c303af5d4d Merge pull request #1354 from sharelatex/ew-async-zip-download
use async project history zip download api

GitOrigin-RevId: 847e22eb3bf89e2e9e3c86bcc9ae92f8c90b25b1
2019-01-07 17:38:33 +00:00
Jessica Lawshe
a521a86fb7 Merge pull request #1340 from sharelatex/jel-sanitize-html-options
HTML sanitize options for icons and tables

GitOrigin-RevId: 1f2cc444120ebbefb9583eda95e8edfba4e7d1d8
2019-01-07 16:15:57 +00:00
Jessica Lawshe
c6879a2184 Merge pull request #1339 from sharelatex/jel-single-wiki-index
Update contact form to use main wiki index

GitOrigin-RevId: 5fd4f6ef0a38e1e11e0fa4367fd6b21d1afbccc9
2019-01-07 16:15:51 +00:00
Jessica Lawshe
e619185569 Merge pull request #1347 from sharelatex/jel-sanitize-html-options-del
Allow <del> in sanitize HTML default options

GitOrigin-RevId: 212c13e77e62717abc85248d0255c6e9729031a9
2019-01-07 16:15:45 +00:00
Jessica Lawshe
fc6cec5758 Merge pull request #1349 from sharelatex/jel-screen-reader-del
Add accessibility styling for <del>

GitOrigin-RevId: 85a52f777d05a7da886075e03ccaaa52d2aa2382
2019-01-07 16:15:40 +00:00
Henry Oswald
3614f217e6 add enableConversions flag to disable conversions which we can't do on
k8
2019-01-07 15:54:24 +00:00
Shane Kilkelly
0d0c5458dd Handle when v1 is deprecated, print a message instead of an error 2019-01-07 11:54:44 +00:00
James Allen
e624f697d2 Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes
Handle import of zip files that include filenames with backslashes

GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41
2019-01-07 11:33:35 +00:00
James Allen
1bddd03335 Merge pull request #1319 from sharelatex/ja-account-deletion-message
Change account deletion message when v1 access is removed

GitOrigin-RevId: c81cc85042b30fcff998283cf1ffea0503d0ed40
2019-01-07 11:33:30 +00:00
James Allen
47ab15c39f Merge pull request #1318 from sharelatex/ja-hide-v1-dash-link
Hide link back to v1 dash after we start force exporting to v2

GitOrigin-RevId: 1221bfc3d09224b09040604e0a3f6120d63d8946
2019-01-07 11:33:25 +00:00
James Allen
87b983ec6b Merge pull request #1348 from sharelatex/as-tweak-import-status-page
Tweak import status page

GitOrigin-RevId: df30c354dfeb27828225f535e3bfab782212ee60
2019-01-07 11:33:19 +00:00
James Allen
12a2d71ac9 Merge pull request #1346 from sharelatex/ew-use-new-api-for-project-importing
use different api to check if project is exporting

GitOrigin-RevId: 720012669c833f7482be087ac9d588c354c45147
2019-01-07 11:33:14 +00:00
Christopher Hoskin
f0086b7a26 Add **/*.map to .gitignore 2019-01-05 07:47:26 +00:00
Christopher Hoskin
202ad40fb0 Bump settings to v1.1.0 2019-01-05 07:46:03 +00:00
Christopher Hoskin
f94754d041 Remove grunt 2019-01-05 07:44:30 +00:00
Christopher Hoskin
982c180225 Merge pull request #42 from sharelatex/csh-ho-docker-issue-1338-grunt
Additional issue 1338 for filestore
2019-01-04 17:13:14 +00:00
James Allen
0de359b70b Merge pull request #1345 from sharelatex/ja-remove-git-warning
Remove warning about no git bridge in import modal

GitOrigin-RevId: 7b5f83c1ad5d419ddb418313cfb49b13672a1077
2019-01-04 16:33:49 +00:00