github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
6373 commits 3 branches 7 tags 206 MiB
Commit graph

3636 commits

Author SHA1 Message Date
Brian Gough
4bac80dfd5 Merge branch 'bg-prevent-duplicate-filenames' of github.com:sharelatex/web-sharelatex-internal into bg-prevent-duplicate-filenames 2018-01-25 17:09:43 +00:00
Brian Gough
aa5d880902 don't update project structure if file not created 2018-01-25 17:09:32 +00:00
Brian Gough
302bbe8893 rename checkElementName to checkValidElementName 2018-01-25 17:09:31 +00:00
Brian Gough
7ba17a8875 only need to load rootFolder from project 2018-01-25 17:09:31 +00:00
Brian Gough
9d74a0a2f0 handle errors normally in addFolder modal 2018-01-25 17:09:31 +00:00
Brian Gough
e183956d16 check for duplicates on move 2018-01-25 17:09:31 +00:00
Brian Gough
e421192b5c check for duplicates on rename 2018-01-25 17:09:31 +00:00
Brian Gough
6e0881f85d check for duplicates in addFolder 2018-01-25 17:09:31 +00:00
Brian Gough
82a9fc97d9 check for duplicates in putElement 2018-01-25 17:09:30 +00:00
James Allen
3ed805a65a Show different message if user comes from SL rather than OL v2 2018-01-24 16:56:51 +00:00
Brian Gough
ec93cedf27 rename checkElementName to checkValidElementName 2018-01-24 10:07:42 +00:00
Brian Gough
2a0b0d3a87 only need to load rootFolder from project 2018-01-24 10:07:42 +00:00
Brian Gough
9b8ce78eb9 handle errors normally in addFolder modal 2018-01-24 10:07:42 +00:00
Brian Gough
4f5a5cb677 check for duplicates on move 2018-01-24 10:07:42 +00:00
Brian Gough
3881eb1d78 check for duplicates on rename 2018-01-24 10:07:42 +00:00
Brian Gough
c6cca79737 check for duplicates in addFolder 2018-01-24 10:07:42 +00:00
Brian Gough
b537747ccd check for duplicates in putElement 2018-01-24 10:07:42 +00:00
Brian Gough
77adb60a8a fix typo in project getter exclusions 2018-01-24 10:06:53 +00:00
Alberto Fernández Capel
4ca71fb379 Do not track anonymous sessions 
And DRY the controller a bit.
 2018-01-23 15:51:10 +00:00
James Allen
a558d05ac6 Only show import modal for owned projects 2018-01-23 15:12:00 +00:00
James Allen
d7706f642b Show the creator as the owner if no owner present 2018-01-23 13:47:48 +00:00
Alberto Fernández Capel
8714909a9a Build query string with style 2018-01-23 12:47:51 +00:00
James Allen
ce9a1fec87 Revert "Go back to allowing v1 projects to be imported" 2018-01-23 11:49:33 +00:00
James Allen
a5195fcbc3 Merge pull request #285 from sharelatex/hof-modal-success 
Stop import modal button flicker
 2018-01-23 10:35:37 +00:00
James Allen
d5c5d9c204 Merge pull request #268 from sharelatex/as-unsupported-project-error 
Adds UnsupportedBrandError & UnsupportedExportRecordsError types
 2018-01-23 10:30:33 +00:00
James Allen
2fb4059633 Merge pull request #258 from sharelatex/ja-allow-v1-imports 
Go back to allowing v1 projects to be imported
 2018-01-23 10:30:23 +00:00
Alberto Fernández Capel
0bef5531bb Rename editSession -> editingSession 2018-01-23 10:29:11 +00:00
James Allen
a84cc16ce2 Merge pull request #287 from sharelatex/ja-fix-delete-endpoint 
Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents
 2018-01-22 16:47:05 +00:00
James Allen
d79d6b4ede Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents 2018-01-22 16:25:11 +00:00
Alberto Fernández Capel
868e32c1bc Send edit sessions heartbeat to the analytics service 2018-01-22 15:10:52 +00:00
Alberto Fernández Capel
1a1ccc9f46 Remove trailing whitespace 2018-01-22 15:00:56 +00:00
Hayden Faulds
445ed4d604 fix ng-disabled in v1ImportModal 2018-01-18 16:44:32 +00:00
Alasdair Smith
89af8ba123 More renaming 2018-01-18 16:41:26 +00:00
Alasdair Smith
f8a068ee9e Rename to be more explicit about the error 2018-01-18 15:42:32 +00:00
Alasdair Smith
649ca86a75 Add publisher exports error type 2018-01-18 15:41:14 +00:00
Alasdair Smith
f234e84c95 Export error 2018-01-18 12:09:33 +00:00
Alasdair Smith
950ef0cebb Add unsupported project error 2018-01-17 17:50:09 +00:00
Alasdair Smith
4d29c4d769 Remove unused link sharing onboarding now at 100% 2018-01-17 15:18:40 +00:00
Alasdair Smith
45de9bb5dc Remove unused autocompile rollout logic now that at 100% 2018-01-17 15:17:55 +00:00
Alasdair Smith
89205092b6 Fix v2 faq link 2018-01-17 11:41:25 +00:00
James Allen
c466025df4 Go back to allowing v1 projects to be imported 2018-01-16 09:40:58 +00:00
James Allen
6d04eeaa03 Merge pull request #256 from sharelatex/ja-display-v2-history-users 
Inject v2 user details into project-history updates and diffs
 2018-01-15 14:21:14 +00:00
James Allen
67061154fe Merge pull request #237 from sharelatex/hof-editor-controller-locking 
Project Locking: EditorController
 2018-01-15 14:21:03 +00:00
Timothée Alby
62bc3f947f Merge pull request #257 from sharelatex/ta-remove-proxy-headers 
Remove headers when proxying analytics request
 2018-01-12 15:48:18 +02:00
Hayden Faulds
e781779c24 use LockManager.runWithLock in EditorController 2018-01-12 10:53:36 +00:00
Hayden Faulds
76c7dff33a rename EditorController.replaceFile -> replaceFileWithoutLock 2018-01-12 10:06:18 +00:00
Hayden Faulds
a8818a4149 add locking for EditorController.renameEntity 2018-01-12 10:06:18 +00:00
Tim Alby
7a9d52b0f6 remove all headers when proxying the analytics request 2018-01-11 19:04:41 +02:00
Alberto Fernández-Capel
4dce9e36c3 Merge pull request #251 from sharelatex/fix-group-member-subscription-page 
Fix subscription page for members of a group
 2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel
feaa7c6d3f Merge pull request #242 from sharelatex/rename-entity-bugfix 
Ensure the dirname is not affected when we rename an entity
 2018-01-11 14:41:21 +00:00
James Allen
8edef2f94d Fix next -> callback 2018-01-11 14:11:44 +00:00
James Allen
17a5dfa5a5 Inject v2 user details into project-history updates and diffs 2018-01-11 11:32:16 +00:00
James Allen
945ef25ef5 Merge pull request #244 from sharelatex/hof-lock-file-upload 
Project Locking: ProjectUploadController
 2018-01-11 08:42:36 +00:00
James Allen
79055d0e8d Merge pull request #243 from sharelatex/ja-dont-show-binary-diffs 
Show apology message instead of raw binary files
 2018-01-11 08:42:13 +00:00
Tim Alby
c1febbeb7c run analytics proxy on public API router 2018-01-11 09:34:24 +02:00
Timothée Alby
bdef7b707d Merge pull request #241 from sharelatex/ta-analytics-proxy 
Proxy requests to analytics service
 2018-01-10 15:39:28 +02:00
Timothée Alby
859e03cd4f Merge pull request #234 from sharelatex/hof-remove-unused-method 
remove unused EditorController.getListOfDocPaths
 2018-01-10 15:26:02 +02:00
Tim Alby
08b74c95f5 proxy requests to analytics service 2018-01-10 15:03:14 +02:00
Alberto Fernández Capel
a81b56556f Add test for SubscriptionViewModelBuilder 2018-01-09 17:00:56 +00:00
Hayden Faulds
817840840a use LockManger.runWithLock 2018-01-09 16:37:34 +00:00
Alberto Fernández Capel
6d007bfe74 DRY logic to get subscription from Recurly 
We were making two calls to recurly: one from the SubscriptionController
and another from the SubscriptionViewModelBuilder. This change moves
all the logic to the builder so we only have to do one call.
 2018-01-05 16:32:29 +00:00
Alberto Fernández Capel
79eddcc736 Fix subscription page for members of a group 
For a member of a group LimitationsManager.userHasSubscriptionOrIsGroupMember
doesn't return any subscription, so when the controller tries to
access subscription.recurlySubscription_id there's an error.

SubscriptionViewModelBuilder already knows how to handle the case
in which the user is a member of a group but has not subscription
of their own, so guarding against the crash is enough to fix
the issue.
 2018-01-05 16:28:49 +00:00
James Allen
626e0a16ef Fix acceptance test when overleaf setting not present 2018-01-04 15:49:31 +00:00
James Allen
e58f6cab47 Merge pull request #248 from sharelatex/ja-disable-import-dialog 
Don't show import dialog for projects, just link to v1 editor
 2018-01-04 15:22:48 +00:00
James Allen
692182c784 Show apology message instead of raw binary files 2018-01-04 10:53:49 +00:00
James Allen
967353d080 Update comment to use button for import dialog for a11y 2018-01-03 17:06:51 +00:00
James Allen
bbfcff30fb Enable project history for new projects if enabled in settings 2018-01-03 16:55:33 +00:00
James Allen
f0d7658bdd Don't show import dialog for projects, just link to v1 editor 2018-01-03 16:46:26 +00:00
Paulo Reis
8b9f3268b1 Make plans page consistent with others, fixing header issues. 2018-01-03 13:54:33 +00:00
James Allen
0f1b0be231 Merge pull request #236 from sharelatex/sk-fix-doc-updater-logging 
Change an erroneous `logger.error` to `logger.log`; Fixes #227
 2018-01-03 11:30:46 +00:00
James Allen
7918232757 Merge pull request #240 from sharelatex/pr-v2-styling-fixes 
v2 styling fixes
 2018-01-03 11:30:39 +00:00
James Allen
ada76e820a Merge pull request #238 from sharelatex/as-ol-emails 
v2 themed emails
 2018-01-03 11:30:28 +00:00
James Allen
882286afb1 Merge pull request #245 from sharelatex/as-autocompile-rollout-100 
Increase autocompile rollout to 100%
 2018-01-03 11:30:10 +00:00
James Allen
2dcc17ad09 Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history 
Handle deleted and renamed files better in v2 history UI; Fixes #226
 2018-01-03 11:29:59 +00:00
Alasdair Smith
b2d92ea482 Increase autocompile rollout to 100% 2018-01-03 10:01:35 +00:00
Hayden Faulds
fe62db05a0 lock project when uploading a file 2018-01-02 12:43:41 +00:00
Alberto Fernández Capel
bf324b5e04 Ensure the dirname is not affected when we rename an entity 
Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93
 2017-12-22 14:24:00 +00:00
Paulo Reis
0484b46027 Redundancy. 2017-12-21 13:52:34 +00:00
Paulo Reis
484d34e296 Only render announcements in SL. 2017-12-21 12:57:07 +00:00
Alasdair Smith
1be9e29f35 Switch from button to link to fit better 2017-12-21 11:10:23 +00:00
Alasdair Smith
fb23b30c45 Merge branch 'master' into as-update-v2-copy 2017-12-21 10:57:16 +00:00
Alasdair Smith
0114ed362f Swap out email templates based on brand prefix 2017-12-21 10:26:14 +00:00
Alasdair Smith
1fc527ff48 Fix OL auto-linking styles 2017-12-21 09:59:19 +00:00
Shane Kilkelly
c76bdaa824 Change an erroneous logger.error to logger.log 2017-12-21 09:54:35 +00:00
Alasdair Smith
9657108146 Add OL themed email templates 2017-12-20 17:53:45 +00:00
Alasdair Smith
7f7916f5b1 Clean up whitespace 2017-12-20 17:52:49 +00:00
James Allen
e6281911f0 Add history-file-tree.pug 2017-12-20 16:42:23 +00:00
James Allen
d0fee7e76c Show a file tree of changed paths, so we can work with renamed and deleted files 2017-12-20 16:22:32 +00:00
Paulo Reis
70b755603d Fix empty project list card. 2017-12-20 16:03:12 +00:00
Paulo Reis
cf30cfd923 Create new style for links inside alerts; apply it to the reconnection alert. 2017-12-20 15:39:50 +00:00
Hayden Faulds
8663dba37c remove unused EditorController.getListOfDocPaths 2017-12-20 15:14:56 +00:00
Alasdair Smith
b1f656826e Remove unnecessary & incorrect title 2017-12-20 14:10:05 +00:00
Shane Kilkelly
18ae27fd66 Merge branch 'sk-account-sync' 2017-12-20 14:02:45 +00:00
James Allen
c191ac2e8d Show deleted files in v2 history 2017-12-20 13:59:17 +00:00
Henry Oswald
ec41f984e6 Merge branch 'ho-remove-groove' 2017-12-20 13:37:15 +00:00
Paulo Reis
0a0c6c6c0c Merge branch 'master' into pr-style-v2-chatpane 2017-12-20 09:50:49 +00:00
James Allen
339b7ec14f Merge branch 'ja-allow-importing-without-history' 2017-12-19 15:06:17 +00:00
James Allen
1d89a535a1 Merge pull request #208 from sharelatex/ja-front-end-history 
Add in web front end that supports v2 history; Fixes #168
 2017-12-19 15:00:34 +00:00
James Allen
0a4febfce6 Merge pull request #225 from sharelatex/ho-hash-on-minifiy-only 
only hash the static content when minified is on
 2017-12-19 15:00:15 +00:00
James Allen
e18dc1e41d Merge pull request #214 from sharelatex/hof-version-entity-deletion 
version entity deletion
 2017-12-19 14:59:37 +00:00
James Allen
731cd57250 Make intermediate argument signature clearer 2017-12-19 13:59:06 +00:00
James Allen
5463b608ad Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history 2017-12-19 13:59:06 +00:00
James Allen
8311101ec0 Split project_history.enable in initializeHistoryForNewProjects and sendProjectStructureOps 2017-12-19 13:58:47 +00:00
James Allen
d84580f12d Label actions with text rather than icons 2017-12-19 13:58:47 +00:00
James Allen
8a3fadbfc1 Style the edit/add/rename options 2017-12-19 13:58:47 +00:00
James Allen
50b12e88a2 Add HistoryV2Manager alongside existing HistoryManager 2017-12-19 13:58:47 +00:00
James Allen
4691a6e85c Get diffs showing in client 2017-12-19 13:58:47 +00:00
James Allen
a1615e6d84 Prototype of requesting history information by doc path, while tracking renames 2017-12-19 13:58:47 +00:00
Shane Kilkelly
529d35936d Merge pull request #203 from sharelatex/sk-prevent-archived-deletion 
Prevent user from trying to delete archived project they don't own
 2017-12-19 13:36:26 +00:00
Henry Oswald
70298ba65c only hash the static content when minified is on 2017-12-19 13:13:31 +00:00
Paulo Reis
cb83e2c1b2 Tone down chat colors. 2017-12-19 10:52:23 +00:00
Alasdair Smith
f3342f327d Merge pull request #202 from sharelatex/as-v2-upgrade-redirect 
Use V1 trial page on V2 instead of legacy SL
 2017-12-19 10:07:08 +00:00
Alasdair Smith
dc2ddf7e09 Check for OL free trial instead of host as it may be fragile indicator 2017-12-18 16:53:58 +00:00
Hayden Faulds
ac36de9629 make ProjectEntityHandler._clean* argument signatures consistent 2017-12-18 15:15:36 +00:00
Hayden Faulds
938caed4f7 set userId when deleting entities via the tpds 2017-12-18 15:15:36 +00:00
Hayden Faulds
ca15fdb6eb pass userId to EditorHttpController.deleteEntity 2017-12-18 15:15:36 +00:00
Hayden Faulds
5f6686ed3b pass userId to ProjectEntityHandler.deleteEntity 2017-12-18 15:15:36 +00:00
Hayden Faulds
2ac74b9adc pass userId into _clean methods in ProjectEntityHandler 2017-12-18 15:15:36 +00:00
Hayden Faulds
475e84b039 version entity deletions in ProjectEntityHandler 2017-12-18 15:15:36 +00:00
Hayden Faulds
81c061c6a7 acceptance test moving entities 2017-12-18 15:15:36 +00:00
Hayden Faulds
e5e75a8ccb update DocumentUpdaterHandler.updateProjectStructure to support entity deletions 2017-12-18 15:15:36 +00:00
Shane Kilkelly
56ec81bb3e Change 'oveleafPlanCode' to 'v1PlanCode' 2017-12-18 13:52:37 +00:00
Alasdair Smith
61900cc1ea Restyle step 2 for side-by-side layout 2017-12-15 16:01:00 +00:00
Alasdair Smith
75a34024bc Restyle step 1 for side-by-side layout 2017-12-15 13:48:53 +00:00
Henry Oswald
7aaf08da48 added no-cache endpoint 2017-12-15 13:38:34 +00:00
Alasdair Smith
8862ed383c Fix project title & bold 2017-12-15 13:28:53 +00:00
Alasdair Smith
7130d0b270 Update v1 import modal with updated copy 2017-12-15 12:49:17 +00:00
Alasdair Smith
2b3b8b2c3b Use hardcoded OL url instead of settings - no point in linking to staging faq 2017-12-15 12:29:39 +00:00
Alasdair Smith
96af59d6b5 Update v1 project/tag tooltips 2017-12-15 12:17:08 +00:00
Alasdair Smith
a6cd210ef6 Update v1 dash pane with new copy & restyle to fit correctly 2017-12-15 12:02:11 +00:00
Henry Oswald
7693d274b7 Merge pull request #209 from sharelatex/ho-hash-static 
Main.js Ide.js and libs.js (now libraries.js) use hash in file name when minified
 2017-12-15 09:52:23 +00:00
Alasdair Smith
da2c0b3fea Switch redirectToOLFreeTrialUrl to calculate trial url 
Sending unnecessary query params to OL seems like a footgun, so switch to
compromise that is more explicit but doesn't send unnecessary query params
 2017-12-14 17:09:11 +00:00
Alasdair Smith
7322522323 Use freeTrialBaseUrl instead of potentially fragile v1BaseUrl 2017-12-14 17:05:12 +00:00
Henry Oswald
bf276b0814 ripped file fingerprinting out 2017-12-14 12:11:13 +00:00
Henry Oswald
cbf656518f remove versioned files from fingerprinting 2017-12-14 11:24:47 +00:00
Paulo Reis
36c79979bd More color adjustments. 2017-12-14 11:24:06 +00:00
Paulo Reis
c03ce6fdf7 Configure chat messages colors per brand. 2017-12-14 11:24:05 +00:00
Paulo Reis
e47b20390b Add per brand UI specific chat message styles. 2017-12-14 11:24:05 +00:00
Paulo Reis
ca68f01a9d Build chat message styles on the controller side (allowing for extra parameters). 2017-12-14 11:23:22 +00:00
Henry Oswald
d947da26d7 Merge branch 'ho-hash-static' of https://github.com/sharelatex/web-sharelatex-internal into ho-hash-static 2017-12-14 11:03:20 +00:00
Henry Oswald
288af6772a write hashes for all files we fingerprint 2017-12-14 10:59:46 +00:00
Henry Oswald
bbbba701b0 Update editor.pug 2017-12-14 10:21:53 +00:00
Henry Oswald
490c56c692 libs -> libraries 
don't use hash in non minjs version
 2017-12-13 17:15:44 +00:00
Henry Oswald
716b309208 remove todo statments 2017-12-13 16:50:18 +00:00
Henry Oswald
f021f21f11 only hash when minified 2017-12-13 16:37:51 +00:00
Henry Oswald
ccbb15c82e remove fingerprint from ide 2017-12-13 14:54:08 +00:00
Alasdair Smith
e7992e65e4 Merge branch 'master' into as-v2-upgrade-redirect 2017-12-13 14:45:51 +00:00
Alasdair Smith
4a9c9c563a Merge branch 'master' into as-autocompile-rollout-60 2017-12-13 14:44:31 +00:00
Henry Oswald
dd6bd3b91e Merge branch 'master' into ho-hash-static 2017-12-13 14:25:32 +00:00
Henry Oswald
357617d952 works with libs compiled into it 2017-12-13 14:19:19 +00:00
Henry Oswald
88334959d7 added remove extension 2017-12-13 14:13:45 +00:00
Henry Oswald
65efbbce53 seems to work now. 2017-12-13 13:06:38 +00:00
Alasdair Smith
60b00d2b94 Merge pull request #196 from sharelatex/as-clean-up-failed-import 
Add unsupported file type error
 2017-12-13 10:31:02 +00:00
Henry Oswald
80e6a660be wip, this does not work minified yet 
for some reason lib.js is not being requested no, console errors or network errors
 2017-12-12 17:21:01 +00:00
Shane Kilkelly
603252f3b4 Prevent user from trying to delete archived project they don't own 
This change disables the select-project checkbox if the user
is on the 'archived' project pane and they don't own the project.
The request to delete would fail anyway, but this prevents UI confusion
 2017-12-12 16:23:24 +00:00
Alasdair Smith
5c62ac4f8a Change error type for consistency 2017-12-12 12:59:10 +00:00
Alasdair Smith
4126e9bd31 Merge branch 'master' into as-v1-dash-link 2017-12-12 09:55:48 +00:00
Alasdair Smith
f5c914ed6c When upgrading track changes on V2, redirect to V1 trial page 2017-12-11 18:03:09 +00:00
Paulo Reis
edfc259c53 Fix missing border on SL. 2017-12-11 16:55:50 +00:00
Paulo Reis
59e675797e Merge branch 'master' into pr-style-v2-resizers 2017-12-11 15:55:50 +00:00
Paulo Reis
0652fc62a0 Configure resizer cursors for v2. 2017-12-11 15:33:00 +00:00
James Allen
53dc8cddfc Refactor captcha into middleware and angular service 2017-12-11 12:58:55 +00:00
James Allen
69499847e4 Refactor front end code into validateCaptcha service 2017-12-11 12:32:43 +00:00
James Allen
0b03bbc7c3 Don't inject recaptcha element if recaptcha is not enabled 2017-12-11 12:04:33 +00:00
James Allen
83086e4a79 Add recaptch to share endpoint 2017-12-11 11:57:59 +00:00
Henry Oswald
314dcd1901 added null checks to mandrill 2017-12-11 11:48:31 +00:00
Alasdair Smith
89bdb6eff9 Increase autocompile rollout to 60% 2017-12-11 11:45:53 +00:00
Henry Oswald
bd7e2d956d add mandrill as email option 2017-12-11 11:05:04 +00:00
Shane Kilkelly
eefe56d0f7 Fix up error handling in SubscriptionUpdater 2017-12-08 11:37:24 +00:00
Alasdair Smith
6198491e5f Add unsupported file type error 2017-12-08 11:31:44 +00:00
Shane Kilkelly
a675e774b8 Fix how the getOverleafPlanCode integration is done 2017-12-08 11:29:11 +00:00
Shane Kilkelly
3adbc52089 Add a method to explicitely refresh subscription feature 2017-12-07 16:28:07 +00:00
Shane Kilkelly
4e86a03b46 Fix a problem with the order of module initialization 2017-12-07 15:06:32 +00:00
Nate Stemen
d224e09b5e Merge pull request #192 from sharelatex/ns-remove-labels 
removing labels service
 2017-12-07 09:38:00 -05:00
Shane Kilkelly
a1f1c25294 Merge branch 'master' into sk-account-sync 2017-12-07 11:51:41 +00:00
Paulo Reis
7c5a7880b0 Merge branch 'master' into pr-style-v2-resizers 2017-12-06 15:49:18 +00:00
Alasdair Smith
48cd048e5c Merge branch 'master' into as-v1-dash-link 2017-12-06 15:12:29 +00:00
Paulo Jorge Reis
37a571283a Merge pull request #194 from sharelatex/as-autocompile-rollout-40 
Increase autocompile rollout to 40%
 2017-12-06 11:22:40 +00:00
Paulo Jorge Reis
a5f99ccce3 Merge pull request #167 from sharelatex/pr-ol-beta-editor-styling 
V2 editor styling
 2017-12-06 11:22:28 +00:00
Alasdair Smith
fa89b91ac6 Increase rollout to 40% 2017-12-06 09:58:38 +00:00
Nate Stemen
9bf5d1e14c removing labels service 2017-12-05 13:57:36 -05: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
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
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
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
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
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