Nate Stemen
9bf5d1e14c
removing labels service
2017-12-05 13:57:36 -05:00
Joe Green
adaf742a7b
Add a 1 second delay to the smoke tests ( #81 )
...
* Add a 1 second delay to the smoke tests
Fixes a race condition where smoke tests exit before container can be attached to.
See here for more info: https://github.com/overleaf/sharelatex/issues/274
* give the smoke tests additional work to do
* escape slashes
2017-12-05 16:51:59 +00:00
Alasdair Smith
2d66fd7280
Merge pull request #169 from sharelatex/as-import-v1
...
V1 Import Modal
2017-12-05 13:19:49 +00:00
Alasdair Smith
cf9861bace
Merge pull request #186 from sharelatex/as-show-v1-warnings
...
Show warnings on project list for some V1 data
2017-12-05 13:16:58 +00:00
Alasdair Smith
ab6830976e
Merge branch 'master' into as-show-v1-warnings
2017-12-05 11:13:25 +00:00
Alasdair Smith
9f4aef76ea
Merge branch 'master' into as-import-v1
2017-12-05 10:43:07 +00:00
Paulo Reis
5dffdf3efc
Add a small a11y fix.
2017-12-05 10:23:28 +00:00
Paulo Reis
a88538c3fd
Make the back to projects button closer to current SL.
2017-12-05 10:20:25 +00:00
Paulo Reis
aab43f5916
Smaller line-height in the file tree.
2017-12-05 10:07:45 +00:00
Shane Kilkelly
8cae3f66c2
move contacts run file
2017-12-05 09:48:05 +00:00
Alasdair Smith
6a185a838d
Increase height & margin
2017-12-04 17:20:53 +00:00
Paulo Reis
7498ead1f5
Make sure SL synctex controls remain the same.
2017-12-04 15:58:40 +00:00
Paulo Reis
963ad4fece
Style resizer togglers.
2017-12-04 15:48:23 +00:00
Shane Kilkelly
44c289d8dd
Fix unit tests for SubscriptionUpdater
2017-12-04 15:34:46 +00:00
Alasdair Smith
c84c00d56d
Change query param for nicer api on OL side
2017-12-04 15:19:03 +00:00
Shane Kilkelly
e7d8848a6a
Include possible overleaf subscription in feature setting
2017-12-04 15:12:26 +00:00
Paulo Reis
0bad7d8549
Adjustments to synctex controls.
2017-12-04 15:12:13 +00:00
Alasdair Smith
77dc7adf1f
Revert "Move to sidebar template"
...
This reverts commit 15dc1a35184aade8912d129ea75248ffc8b1b4bd.
2017-12-04 14:53:18 +00:00
Paulo Reis
9fda8e62fa
Merge branch 'pr-style-v2-resizers' of github.com:sharelatex/web-sharelatex-internal into pr-style-v2-resizers
2017-12-04 13:48:52 +00:00
Paulo Reis
fd852004fe
Refactor synctex controls z-index handling.
2017-12-04 12:25:40 +00:00
Alasdair Smith
ab78cea48d
Move to sidebar template
2017-12-04 12:24:21 +00:00
Alasdair Smith
1fd518ec58
Add query param to mark as explicitly using V1 dash
2017-12-04 12:22:27 +00:00
Alasdair Smith
65b7b242d9
Merge remote-tracking branch 'origin' into as-v1-dash-link
2017-12-04 12:02:41 +00:00
Hayden Faulds
1ddd199b7d
Merge pull request #104 from sharelatex/hof-version-entity-creation
...
Version entity creation in SL -> OL history
2017-12-04 11:35:54 +00:00
Alasdair Smith
a25464d925
Add check for OL host
2017-12-04 11:34:00 +00:00
Alasdair Smith
f595009911
Switch to existing v1 dash flag
2017-12-04 11:23:09 +00:00
James Allen
eb5ba2814e
Merge branch 'master' into as-import-v1
2017-12-04 10:41:07 +00:00
James Allen
d3b4567a5c
Merge branch 'master' into as-v1-dash-link
2017-12-04 10:40:49 +00:00
James Allen
9e0f5424d0
Merge branch 'master' into as-show-v1-warnings
2017-12-04 10:40:28 +00:00
James Allen
c09bf0a04d
Merge branch 'master' into pr-fix-link-rewriting
2017-12-04 10:17:15 +00:00
James Allen
5da7d170a1
Merge branch 'master' into pr-ol-beta-editor-styling
2017-12-04 10:17:00 +00:00
James Allen
e03dcd3bae
Merge branch 'master' into pr-style-v2-resizers
2017-12-04 10:15:43 +00:00
James Allen
52b414498c
Merge branch 'master' into as-show-v1-warnings
2017-12-04 10:03:38 +00:00
James Allen
0b0fd576eb
Merge branch 'master' into as-v1-dash-link
2017-12-04 10:02:42 +00:00
James Allen
0602fed6e5
Merge branch 'master' into as-import-v1
2017-12-04 10:02:21 +00:00
James Allen
158b0d56cf
Merge branch 'master' into pr-style-v2-resizers
2017-12-04 10:01:45 +00:00
James Allen
f21870aac2
Merge branch 'master' into pr-ol-beta-editor-styling
2017-12-04 10:01:27 +00:00
James Allen
849861073d
Merge branch 'master' into pr-fix-link-rewriting
2017-12-04 10:01:08 +00:00
Hayden Faulds
4094801f18
pass object to DocumentUpdater.updateProjectStructure instead of separate arrays
2017-12-04 09:42:10 +00:00
Hayden Faulds
1405b645f3
fix acceptance tests after rebase
2017-12-04 09:42:10 +00:00
Hayden Faulds
19643f4bb5
pass user_id into editorController.addDoc in ThirdPartyDataStore/UpdateMerger
2017-12-04 09:42:10 +00:00
Hayden Faulds
497c6facd5
fix ProjectEntityHandler.replaceFile
2017-12-04 09:42:10 +00:00
Hayden Faulds
77eac423c7
add tpds project structure acceptance tests
2017-12-04 09:42:09 +00:00
Hayden Faulds
9736513f59
fix ProjectEntityHandler.replaceFile
2017-12-04 09:42:09 +00:00
Hayden Faulds
3466db0aae
add acceptance tests
2017-12-04 09:42:09 +00:00
Hayden Faulds
61a1336ec6
pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject
2017-12-04 09:42:09 +00:00
Hayden Faulds
feee582368
pass user_id into EditorController.replaceFile
2017-12-04 09:42:09 +00:00
Hayden Faulds
08891c7a7f
pass userId into ProjectEntityHandler.replaceFile
2017-12-04 09:42:09 +00:00
Hayden Faulds
088ce33cbc
version ProjectEntityHandler.copyFileFromExistingProjectWithProject
2017-12-04 09:42:09 +00:00
Hayden Faulds
60ee78704a
return url from FileStoreHandler.copyFile
2017-12-04 09:42:09 +00:00