Commit graph

3338 commits

Author SHA1 Message Date
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
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
9736513f59 fix ProjectEntityHandler.replaceFile 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
Henry Oswald
aaa908187d added layout.pug back in 2017-12-02 13:38:23 +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
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
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
Alasdair Smith
5b8c9b2f4c Add aria role to warning 2017-12-01 11:00:13 +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
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
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
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
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
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
2a50a18d23 Merge branch 'ns-package-aware-autocomplete' 2017-11-28 10:24:37 -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
Alasdair Smith
bbaacb4db4 Increase autocompile rollout to 20% 2017-11-28 10:52:46 +00:00
Henry Oswald
7ce56aa3b6 add http catch onto form 2017-11-28 10:13:54 +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
Henry Oswald
b16862fa31 add error handling for form 2017-11-27 18:03:42 +00:00
Shane Kilkelly
f7c8930b90 Convert html to pug for uploader templates 2017-11-27 13:56:49 +00:00
Henry Oswald
7eb2f0d917 move generic sales modal to use new support endpoint 2017-11-27 12:49:12 +00:00
Shane Kilkelly
661041a35d Use template elements for file uploaders, and i18n 2017-11-27 12:06:18 +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
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
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
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
Alasdair Smith
e1fa196de5 Merge pull request #153 from sharelatex/as-remove-old-onboarding
Remove unused onboarding
2017-11-23 10:28:50 +00:00
Alasdair Smith
14d8d7bde3 Merge pull request #151 from sharelatex/as-v1-badge-tooltip
Add tooltips for V1 badges
2017-11-23 10:21:37 +00:00
Alasdair Smith
e61b82c452 Remove unused link sharing rollout, but keep onboarding popup 2017-11-22 17:07:50 +00:00
Shane Kilkelly
57d0bab354 Remove commented out code, and un-used button 2017-11-22 17:00:30 +00:00
Shane Kilkelly
91e2e45029 Remove unused attributes 2017-11-22 16:49:27 +00:00
Alasdair Smith
6f8b0c6e87 Revert "Remove old unused link sharing onboarding"
This reverts commit 66a0a7ff8b5b5081d86df333429cb0455221c81a.
2017-11-22 16:46:16 +00:00
Alasdair Smith
dde4428189 Remove unused track changes modal template 2017-11-22 16:26:10 +00:00
Alasdair Smith
de3b9d6a49 Remove old unused link sharing onboarding 2017-11-22 16:09:32 +00:00
Shane Kilkelly
fee1fc3d1f Fix visuals of file uploader 2017-11-22 15:52:02 +00:00
Alasdair Smith
f85880ba38 Remove old unused track changes notice 2017-11-22 15:03:46 +00:00
Alasdair Smith
8f32f0d65f Remove old unused track changes onboarding 2017-11-22 14:48:22 +00:00
Shane Kilkelly
035e0c1213 Add autoIndex: false option to mongoose connections.
This prevents mongoose from auto-creating missing indexes on boot.
2017-11-22 13:37:57 +00:00
Alasdair Smith
b1c8e7a95a Improve wording slightly 2017-11-22 12:19:32 +00:00
James Allen
fae2d7dbdd Merge pull request #138 from sharelatex/ja-disable-github
Add feature flag for github sync
2017-11-22 11:46:50 +00:00
James Allen
310aa1d49d Merge branch 'master' into ja-turn-off-registration 2017-11-22 11:45:28 +00:00
James Allen
d3f146499c Merge pull request #135 from sharelatex/ja-disable-account-settings-for-ol-v2
Enable the external auth switches when OL OAuth is in use
2017-11-22 11:44:10 +00:00
Alasdair Smith
0d4059764a Add tooltips for V1 badges with dummy copy 2017-11-22 11:37:29 +00:00
Alasdair Smith
ba04875ddc Increase autocompile rollout to 10% 2017-11-22 10:54:46 +00:00
James Allen
5bb06915cc Rename setting and use Features.hasFeatures 2017-11-22 10:45:31 +00:00
James Allen
dd619f44dd Add in setting to control whether the site has a homepage 2017-11-22 10:45:31 +00:00
James Allen
7440d8da58 Change to an 'enableGithubSync' setting 2017-11-22 10:44:57 +00:00
Shane Kilkelly
c11ea59dc1 Increase link-sharing rollout to 100% 2017-11-22 09:50:08 +00:00
Shane Kilkelly
1ddfd948d6 Update the file-upload library 2017-11-21 16:21:58 +00:00
Shane Kilkelly
bda65c0984 use correct partial indexes on project token fields 2017-11-21 10:33:02 +00:00
Alasdair Smith
5bb46a930a Check presence of overleaf settings 2017-11-20 15:55:00 +00:00
Shane Kilkelly
81887dd4f5 wip: upgrade fineuploader 2017-11-20 14:43:13 +00:00
James Allen
4f905af078 Add feature flag for github sync 2017-11-20 11:48:06 +00:00
James Allen
a97c3ba580 Add missed Features.coffee 2017-11-20 11:43:02 +00:00
Alasdair Smith
f3583b1702 Show warning message if V1 connection fails 2017-11-20 11:23:02 +00:00
Alasdair Smith
24ceaffd3a Rename hook for clarity 2017-11-20 11:23:02 +00:00
Alasdair Smith
119be26989 Remove unnecessary project getter
Had bad assumption about whether ol-integration module would be available in
filesystem, now replaced with Module hook
2017-11-20 11:23:02 +00:00
Alasdair Smith
621977c47c Replace call to V1ProjectGetter with Module hook 2017-11-20 11:23:02 +00:00
Alasdair Smith
d9c19ccdc4 Fix V1 tags not showing badge correctly 2017-11-20 11:23:02 +00:00
Alasdair Smith
d5cfd34bb7 Log something useful 2017-11-20 11:23:02 +00:00
Alasdair Smith
e32406a4c4 Dynamically monkey patch impl to check integration once instead of each request 2017-11-20 11:23:02 +00:00
Alasdair Smith
3bc48a7a05 Switch to date builtin instead of moment 2017-11-20 11:23:02 +00:00
Alasdair Smith
4b2e22c257 Remove duplicate dependency 2017-11-20 11:23:02 +00:00
Alasdair Smith
4b25525e9d Add aria labels to V1 badges 2017-11-20 11:23:02 +00:00
Alasdair Smith
08fd092f7c Rename v1 list item template for consistency 2017-11-20 11:23:02 +00:00
Alasdair Smith
9bf74f29bd Improve naming 2017-11-20 11:23:02 +00:00
Alasdair Smith
0724482808 Don't use brand prefix setting to mark v1 2017-11-20 11:23:02 +00:00
Alasdair Smith
8df31590a9 Switch V1 naming instead of OL 2017-11-20 11:23:02 +00:00
Alasdair Smith
8735261022 Extract V1 projects fetch to integration module
OlProjectGetter now just detects if integration module is loaded and proxies
to integration module. If module not loaded, it just bails
2017-11-20 11:23:02 +00:00
Alasdair Smith
d43863d438 Add V1 badge to tags from V1 2017-11-20 11:23:02 +00:00
Alasdair Smith
35883b6b27 Extract V1 badge styles to file 2017-11-20 11:23:02 +00:00
Alasdair Smith
ec64d1fab9 Combine tags with v1 tags 2017-11-20 11:23:02 +00:00
Alasdair Smith
020e8ab8c4 Change wording to v1 2017-11-20 11:23:02 +00:00
Alasdair Smith
c1b3cc3a69 Add v1 filter 2017-11-20 11:23:02 +00:00
Alasdair Smith
5ee52408e5 Inject v1 flag into view model 2017-11-20 11:23:02 +00:00
Alasdair Smith
7910f2109f Switch to V1 wording 2017-11-20 11:23:02 +00:00
Alasdair Smith
3f422dc48c Clean up OL view model 2017-11-20 11:23:02 +00:00
Alasdair Smith
dfe17d63ba Projects removed also treated as archived 2017-11-20 11:23:02 +00:00
Alasdair Smith
20c756ec9a Switch to v1 wording 2017-11-20 11:23:02 +00:00
Alasdair Smith
3c8dd6c421 Link to OL project 2017-11-20 11:23:02 +00:00
Alasdair Smith
fc6da2e2e4 Parse & display OL project last updated 2017-11-20 11:23:02 +00:00
Alasdair Smith
fe90ef047f Temp OL label 2017-11-20 11:23:02 +00:00
Alasdair Smith
532a26c68f Extract out project list item to template and add OL-specific template 2017-11-20 11:23:02 +00:00
Alasdair Smith
d072fabb25 Fix non-beta throwing error because it's expecting OL projects 2017-11-20 11:23:02 +00:00
Alasdair Smith
8c66342a04 Pull in OL projects and process for view 2017-11-20 11:23:02 +00:00
Alasdair Smith
fa0559f8d7 Fetch OL projects using OAuth 2017-11-20 11:23:02 +00:00
Alasdair Smith
f6bbf7fe3f wip 2017-11-20 11:23:02 +00:00
James Allen
745ae8d081 Add in Features module to handle feature flags, and use it to cleanly turn off registration 2017-11-20 10:47:32 +00:00
James Allen
311ebf89c4 Refactor to always use req.externalAuthenticationSystemUsed 2017-11-20 10:10:23 +00:00
James Allen
ca0982a909 Enable the external auth switches when OL OAuth in use 2017-11-17 17:16:12 +00:00
Alasdair Smith
b6289f03e3 Conditional check 2017-11-16 15:58:32 +00:00
Alasdair Smith
8cafda8419 Merge pull request #129 from sharelatex/as-allow-force-rollout
Allow user to force themselves to be part of autocompile rollout
2017-11-16 15:49:28 +00:00
Alasdair Smith
b889a8bb4d Allow user to force themselves to be part of autocompile rollout 2017-11-16 15:38:51 +00:00
Alasdair Smith
a5bb76b2be Increase rollout to 5% 2017-11-16 10:36:35 +00:00
Shane Kilkelly
2a7e68e37b Merge pull request #109 from sharelatex/sk-token-access-redirect-fix
Set redirect when bouncing away from token route; Fixes overleaf/sharelatex#250
2017-11-15 14:56:42 +00:00
Nate Stemen
428ae3aa53 adding labels service back 2017-11-15 09:27:46 -05:00
Alasdair Smith
b1bae4aaae Change to 3% rollout 2017-11-15 13:47:05 +00:00
Shane Kilkelly
5df4556e9c Set redirect when bouncing away from token route
This ensures that when the user logs in they will be redirected back
to this token, the page they wanted to access in the first place.
2017-11-15 13:30:40 +00:00
Alasdair Smith
0d566f8c39 Increase autocompile rollout to 5% 2017-11-15 12:01:47 +00:00
Shane Kilkelly
a15cb64418 Increase link-sharing rollout to 40% 2017-11-15 10:25:17 +00:00
Shane Kilkelly
a0c7295b36 Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal 2017-11-13 10:45:29 +00:00
Shane Kilkelly
bc87bceb5f Update the linksharing rollout to 10% 2017-11-13 10:27:27 +00:00
Hayden Faulds
d084b57d5a Merge pull request #90 from sharelatex/hof-version-renames
version entity renames/moves
2017-11-13 10:13:34 +00:00
Shane Kilkelly
aea8e77f8a Merge branch 'as-fix-rollout-2' 2017-11-13 09:50:46 +00:00
Shane Kilkelly
8ba9073606 Merge branch 'sk-link-sharing-onboarding' 2017-11-13 09:31:44 +00:00