github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-10-31 21:21:03 -04:00
Code Issues Projects Releases Packages Wiki Activity
5717 commits 3 branches 7 tags 199 MiB
Commit graph

5542 commits

Author SHA1 Message Date
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
Alasdair Smith
c84c00d56d Change query param for nicer api on OL side 2017-12-04 15:19:03 +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
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
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
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
Hayden Faulds
4ec0d07aae remove unused ProjectEntityHandler.copyFileFromExistingProject 2017-12-04 09:42:09 +00:00
Hayden Faulds
90e3b71c1c version replacing files 2017-12-04 09:42:09 +00:00
Hayden Faulds
980e43e478 pass user_id into EditorController.addDoc 2017-12-04 09:42:09 +00:00
Hayden Faulds
e4ca3bc5ad pass user_id into EditorController.addDocWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds
7d63939f79 pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator 2017-12-04 09:42:09 +00:00
Hayden Faulds
300f76bc5c pass user_id into ProjectEntityHandler.addDoc / addDocWithProject 2017-12-04 09:42:09 +00:00
Hayden Faulds
bfd22899a0 fix DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds
62f88402e8 fix DocumentUpdaterHandler casing 2017-12-04 09:42:09 +00:00
Hayden Faulds
acda4c2295 remove inline requires from ProjectEntityHandler 2017-12-04 09:42:09 +00:00
Hayden Faulds
ef68c6a531 avoid N+1 lookups in DocumentUpdaterHandler 2017-12-04 09:42:09 +00:00
Hayden Faulds
953dba0ede pass userId into Editorcontroller.addFile / addFileWithoutLock 2017-12-04 09:42:09 +00:00
Hayden Faulds
42a1deaaca pass userId into ProjectEntityHandler.addFile 2017-12-04 09:42:09 +00:00
Hayden Faulds
c1481d596f call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile 
pass in user_id as null
 2017-12-04 09:42:09 +00:00
Hayden Faulds
6e84c635cf return url from FileStoreHandler.uploadFileFromDisk 2017-12-04 09:42:09 +00:00
Hayden Faulds
0178f78249 handle file additions in DocumentUpdaterHandler.updateProjectStructure 2017-12-04 09:42:09 +00:00
Hayden Faulds
28bcf83d87 better error when project creation fails 2017-12-04 09:25:22 +00:00
Hayden Faulds
eacb19fac9 create user in db and use login endpoint instead of register 2017-12-04 09:25:22 +00:00
Hayden Faulds
938d22da3f get csrf token from /dev/csrf not /register 2017-12-04 09:25:22 +00:00
James Allen
b51ee7ea7e Point track-changes-web-module back at master 2017-12-04 09:22:47 +00:00
Henry Oswald
aaa908187d added layout.pug back in 2017-12-02 13:38:23 +00:00
James Allen
a9ca54b98a Generate docker-compose.yml before any docker-compose command 2017-12-02 13:02:37 +00:00
Henry Oswald
c020e4e6bd moment and fineuploader are loaded seperately in editor, not packaged up 2017-12-02 12:29:06 +00:00
Alasdair Smith
bf23a09644 Move setting sidebar height to OL only file so var can be moved to specific scope 2017-12-01 17:59:02 +00:00
Alasdair Smith
e7f83c73ae Extract v1 dash link styles to file so can define OL only vars 2017-12-01 17:53:52 +00:00
Alasdair Smith
d6e50ac940 Extract var to allowed to be overridden 2017-12-01 17:16:37 +00:00
Alasdair Smith
7f622e2e6b Conditionally show V1 dash link 2017-12-01 17:14:53 +00:00
Alasdair Smith
9a073cdaf0 Add link to V1 dash 2017-12-01 16:58:19 +00:00
James Allen
5e3f192eda Merge pull request #187 from sharelatex/sk-version-fineuploader 
Version the fineuploader library
 2017-12-01 13:34:31 +00:00
James Allen
381761127e Replace previous fineuploader path with old version 2017-12-01 13:26:31 +00:00
Shane Kilkelly
3ee6f5d4be Update fineuploader on project page 2017-12-01 11:27:06 +00:00
Shane Kilkelly
2ea3caf08b Properly version the fineuploader library 2017-12-01 11:22:41 +00:00
Paulo Reis
aeffe1cea9 Style resizers while dragging. 2017-12-01 11:22:12 +00:00
Alasdair Smith
5b8c9b2f4c Add aria role to warning 2017-12-01 11:00:13 +00:00
James Allen
e895a495d6 Move make clean step to before compile 2017-12-01 10:49:00 +00:00
James Allen
e9733514af Fail on failing module acceptance tests 2017-12-01 10:07:09 +00:00
James Allen
65e44d4770 Clean up old docker-shared.yml before running tests 2017-12-01 09:31:22 +00:00
James Allen
fa2a3574db Look for Makefile, not makefile 2017-12-01 09:01:36 +00:00
James Allen
040546b1d3 Move -q flag to correct place 2017-12-01 08:49:10 +00:00
James Allen
e62ec77161 Merge pull request #180 from sharelatex/ja-quiet-npm 
Run npm with -q flag for less verbose test output
 2017-12-01 08:32:46 +00:00
James Allen
c433ac7e2d Merge pull request #183 from sharelatex/hof-module-acceptance-files 
acceptance test changes for module test
 2017-12-01 08:32:14 +00:00
Paulo Reis
cd6b51a1f6 Increase v2 resizer hit area. 2017-11-30 17:00:42 +00:00
Paulo Reis
ce3e410250 Configure resizer colors. 2017-11-30 17:00:25 +00:00
Alasdair Smith
7d58427485 Show warnings on project list for some V1 data 2017-11-30 16:59:13 +00:00
Paulo Reis
3a959cccfd Use custom chat resizer values. 2017-11-30 15:24:48 +00:00
Paulo Reis
826f49b9a4 Add default resizer values to layout directive. 2017-11-30 15:24:39 +00:00
Paulo Reis
024741ac51 Correct chat resizer values. 2017-11-30 15:24:10 +00:00
Alasdair Smith
52ad852814 Add check for OL host to prevent failure on legacy SL 2017-11-30 15:14:47 +00:00
Paulo Reis
e38c0de6b9 Merge branch 'pr-ol-beta-editor-styling' into pr-style-v2-resizers 2017-11-30 15:13:00 +00:00
Paulo Reis
71604ebd5c Create uiConfig Pug local; render it in the HTML. 2017-11-30 15:12:36 +00:00
Alasdair Smith
a5cdcea9c7 Update modules gitignore to ignore everything except specific modules 2017-11-30 13:32:23 +00:00
Hayden Faulds
e916fc906a add mkdirp dev dependency 2017-11-30 13:15:39 +00:00
Hayden Faulds
78709d819e generate test acceptance files volume for modules 2017-11-30 13:15:23 +00:00
James Allen
b2a3e06717 Find / replace mistake 2017-11-30 11:20:25 +00:00
James Allen
870e87ebe1 Run npm with -q flag for less verbose test output 2017-11-30 11:00:28 +00:00
Alasdair Smith
f232899f3f Show warning symbol on second step 2017-11-30 10:16:15 +00:00
Alasdair Smith
6eae1d59ea Use asyncForm directive to trigger import 2017-11-30 10:16:15 +00:00
Alasdair Smith
3aaf6559c8 Add image of v2 editor 2017-11-30 10:16:15 +00:00
Alasdair Smith
265e659999 Add multiple steps 2017-11-30 10:16:15 +00:00
Alasdair Smith
958e4cad9b Fix wrong controller 2017-11-30 10:16:15 +00:00
Alasdair Smith
b68d6411ee Basic styles for import modal 2017-11-30 10:16:15 +00:00
Alasdair Smith
0e11668a61 Change v1 project link to button which opens import modal 2017-11-30 10:16:15 +00:00
Alasdair Smith
cbba7c38df Add basic v1 import modal template & controller 2017-11-30 10:16:15 +00:00
James Allen
488e6d7c5d Merge pull request #158 from sharelatex/ja-dockerise-tests 
Dockerize unit and acceptance tests using docker-compose
 2017-11-30 10:09:07 +00:00
Alasdair Smith
dba0ab003c Merge pull request #166 from sharelatex/as-autocompile-rollout-20 
Increase autocompile rollout to 20%
 2017-11-30 10:08:55 +00:00
Nate Stemen
c2bb8b9f89 removing calls 2017-11-29 13:30:53 -05:00
Nate Stemen
74ba7402de Merge branch 'ns-file-completer' 2017-11-29 09:20:09 -05:00
James Allen
bb74f8318a Support make clean install usage 2017-11-29 14:16:29 +00:00
James Allen
50b3045548 Tidy up docker-compose and makefile 2017-11-29 13:49:36 +00:00
Shane Kilkelly
c203a8d80a Merge branch 'sk-use-recurly-hosted-details-page' 2017-11-29 09:45:54 +00:00
Shane Kilkelly
8b5115ff03 Merge branch 'sk-update-fineuploader' 2017-11-29 09:41:14 +00:00
Nate Stemen
26df9bca05 Merge pull request #136 from sharelatex/ns-autocomplete-bugs 
fixing popup and code folding issues
 2017-11-28 10:28:54 -05:00
Nate Stemen
2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -05:00
Nate Stemen
8ef48925c1 Merge pull request #71 from sharelatex/ns-package-completer 
fixing package completer
 2017-11-28 08:56:49 -05:00
Shane Kilkelly
cc9986cefd Remove the obsolete update-billing-details page 2017-11-28 11:52:14 +00:00
Shane Kilkelly
22c163c60a Move the recurly-billing-details link up to main subscription page 2017-11-28 11:40:48 +00:00
Paulo Reis
2c0fcb51e0 Unneeded LESS guard. 2017-11-28 11:27:45 +00:00
Alasdair Smith
bbaacb4db4 Increase autocompile rollout to 20% 2017-11-28 10:52:46 +00:00
Paulo Reis
0091d639bf Use white review icon in OL. 2017-11-28 10:49:04 +00:00
Alasdair Smith
d082e8eab2 Merge pull request #165 from sharelatex/ja-move-unit-tests 
Move test/UnitTests -> unit/test
 2017-11-28 09:51:19 +00:00
Alasdair Smith
c5f459a531 Merge pull request #159 from sharelatex/as-show-v1-owner 
Show v1 project owner's name in project list
 2017-11-28 09:51:04 +00:00
Paulo Reis
b66e28df19 Use a non-breakable space to give height. 2017-11-27 17:12:14 +00:00
Paulo Reis
e94cef12b7 Use ::before to fill empty space in indented filetree items. 2017-11-27 17:11:32 +00:00
James Allen
3e90103d9c No need to bind to 0.0.0.0 when running in same container 2017-11-27 17:10:58 +00:00
James Allen
054964dd85 Clean out module js on make clean 2017-11-27 17:10:58 +00:00
James Allen
4c504ad8eb Remove debugging command 2017-11-27 17:10:58 +00:00
James Allen
5e0fc24c1a Allow modules to specific their own acceptance tests 2017-11-27 17:10:58 +00:00
James Allen
2bc0f666ba Add some documentation 2017-11-27 17:10:58 +00:00
James Allen
49057a5ab7 Only mount coffee and needed files into Docker so js isn't written back to local system 2017-11-27 17:10:58 +00:00
James Allen
492b37aa6e Add missing bin/ files 2017-11-27 17:10:58 +00:00
James Allen
7efef12981 Fix Jenkinsfile syntax 2017-11-27 17:10:58 +00:00
James Allen
d9d7c96958 Get module unit tests running inside Docker as well as main tests 2017-11-27 17:10:58 +00:00
James Allen
fbf8cc2d03 Run acceptance tests via docker compose 2017-11-27 17:10:58 +00:00
James Allen
62de9d8946 Move test/UnitTests -> unit/test 2017-11-27 17:10:22 +00:00
Shane Kilkelly
f7c8930b90 Convert html to pug for uploader templates 2017-11-27 13:56:49 +00:00
Shane Kilkelly
661041a35d Use template elements for file uploaders, and i18n 2017-11-27 12:06:18 +00:00
Paulo Reis
1177f34125 Adjustments to keep the current SL look and feel. 2017-11-24 16:43:02 +00:00
Paulo Reis
860399d9de Adjust toolbar paddings; adjust Overleaf menu icon width. 2017-11-24 16:03:30 +00:00
Paulo Reis
926fd69bb5 Use resizer icons in Overleaf, to switch the PDF layout. 2017-11-24 15:53:49 +00:00
Paulo Reis
39602d78ed Make sure all toolbar icons and buttons are vertically centered. 2017-11-24 15:36:23 +00:00
Paulo Reis
f4f2fa4e19 Use Overleaf logo as the main menu icon. 2017-11-24 15:33:48 +00:00
Alasdair Smith
099305d909 Show v1 project owner name 2017-11-23 17:10:42 +00:00
Paulo Reis
2464bec280 Style the recompile button; use flexbox for the toolbar. 2017-11-23 16:42:38 +00:00
Shane Kilkelly
c121653dc4 Add error-handling to attempt to get user subscription 2017-11-23 16:22:57 +00:00
Shane Kilkelly
caa65dddc1 Send user to hosted recurly billing-details page. 
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
 2017-11-23 16:16:13 +00:00
Brian Gough
2c3ee253e1 fix unit tests 2017-11-23 15:47:11 +00:00
Brian Gough
bb2d1321d4 Merge pull request #91 from sharelatex/bg-add-project-history-flag 
route history requests based on project
 2017-11-23 15:36:45 +00:00
Paulo Reis
f55ffff960 Refactor toolbar variants as mixins. 2017-11-23 15:21:06 +00:00
Brian Gough
98fe352a8c use a separate flag for reading from history 
the overleaf.history object controls writing to the project history
service, we need a separate flag to determine whether to read from it or
from track changes.
 2017-11-23 15:14:33 +00:00
James Allen
e35356b4a4 Merge pull request #148 from sharelatex/hof-compile-acceptance-tests 
Run acceptance tests on CI
 2017-11-23 14:47:18 +00:00
Alasdair Smith
c052aa72ad Fix missing import, fixing broken onboarding popup 2017-11-23 11:18:23 +00:00
Hayden Faulds
19d9aafbbd use release of SL acceptance-test-runner rather then fork 2017-11-23 10:39:30 +00:00
Hayden Faulds
e54e2c8328 fix acceptance tests 2017-11-23 10:39:30 +00:00
Hayden Faulds
5cdddc7d0e debugging output if acceptance tests fail on CI 2017-11-23 10:39:21 +00:00
Hayden Faulds
09964cfe95 compile acceptance tests 2017-11-23 10:38:55 +00:00
Shane Kilkelly
10fc89c8cf Merge pull request #142 from sharelatex/sk-fix-token-indexes 
use correct partial indexes on project token fields
 2017-11-23 10:30:31 +00:00