Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/file folder selectors #328

Merged
merged 183 commits into from
Aug 26, 2021
Merged

Feature/file folder selectors #328

merged 183 commits into from
Aug 26, 2021

Conversation

TatianaLopaeva
Copy link
Contributor

At the File Module:

  • Added SelectFile component for select file,
  • Added SelectFolder component for select folder.

Integration of the Editor with the File Module:

  • Added SelectFile component for insert "Image from Storage" option.
  • Added SelectFolder component for "Save as" option.
  • Added "Mail merge" option.

@TatianaLopaeva
Web: Files: Added SelectFolderDialog and FolderTreeBody, and translat…
2771ff5 
…ions for them.
@TatianaLopaeva
Web: Files: SelectFileDialog: Renamed parameters.
ac59a0d
@TatianaLopaeva
Web: Files: Added SelectFolderInput component.
e12db8f
@TatianaLopaeva
Web: Files: Added styles to separate file.
3fa967f
@TatianaLopaeva
Web: Files: Added StyledPanels.
e08630f
@TatianaLopaeva
Web: Common: Added api method.
426fce6
@TatianaLopaeva
Web: Settings: Removed icons to common folder.
15a268f
@TatianaLopaeva
Web: Files: Added parameter "without provider" to the tree folders.
3b4477e
@TatianaLopaeva
Web: Files: Added "certain folder" parameter.
bed81a4
@TatianaLopaeva
Web: Files: SelectFolderDialog: Added last selected folder.
34f536b
@TatianaLopaeva
Web: Files: SelectFolderDialog: Deleted useless code.
57276f3
@TatianaLopaeva
Web: Files: FolderTreeBody: Fixed styles.
ee35648
@TatianaLopaeva
Web: Files: Added SelectFileDialog component.
568aeb8
@TatianaLopaeva
Web: Files: Added SelectFileInput.
b4fef17
@TatianaLopaeva
Web :Files: SelectFileInput: Added styles to separate file.
2845141
@TatianaLopaeva
Web: Settings: Fixed imports.
574fb26
@TatianaLopaeva
Web: Files: Added styles.
9754b50
@TatianaLopaeva
Web: Common: Added api methods.
5ef780d
@TatianaLopaeva
Web: Files: Added translations.
cfe2ad8
@TatianaLopaeva
Web: Files: SelectFileInput: Refactoring.
c63287a
@TatianaLopaeva
Web: Files: SelectFileDialog/SelectFileInput: Added latest selected f…
c65771b 
…older.
@TatianaLopaeva
Web: Files: Added border to the SelectFileDialog.
996e1d6
@TatianaLopaeva
Web: Files: SelectFileDialog/SelectFileInput: Added custom header.
c9665cf
@TatianaLopaeva
Web: Files: Removed icon to common folder.
0d4159a
@TatianaLopaeva
Web: Files: SelectDolderDialog: Added scrollbar to the modal view dia…
b68b976 
…log.
@TatianaLopaeva
Web: Files: Removed scrollbar to the FolderTreeBody, added height con…
94b6783 
…tent custom parameters.
@TatianaLopaeva
Web: Settings: SelectFolder/SelectFolderInput: Added aside and modal …
ae9a3b7 
…view.
@TatianaLopaeva
Web: Files: Fixed not showing files, when latest folder was empty.
aa93554
@TatianaLopaeva
WEb: Files: SelectFolderDialog: Added based selected folder.
5e97c7d
@TatianaLopaeva
(onlyoffice.conf) Added location for icons from root.
a4a5a50
@TatianaLopaeva
Web: Editor: Refactoring.
c6ec0fb
@TatianaLopaeva
Web: Editor: Deleted useless code.
0f2bb18
@TatianaLopaeva
WEb: Files: SelectFileDialog: Optimization (removed repeated API call…
5a5c735 
… when the selected folder doesn't change).
@TatianaLopaeva
Merge branch 'develop' into feature/file-folder-selectors
3b8cf0a 
# Conflicts:
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/utils.js
#	web/ASC.Web.Editor/src/Editor.jsx
@TatianaLopaeva
Web: Fixed after merge.
8e03204
@TatianaLopaeva
Web: Editor: Fixed sharing settings display.
1bc7863
@TatianaLopaeva
Web: Files: Added missing import.
9fa19d9
@TatianaLopaeva
Web: SelectFileDialog/SelectFolderDialog: Optimization and refactorin…
ed70c45 
…g components.
@TatianaLopaeva
Web: Files: SelectFileInput: Added missing props.
bbba517
@TatianaLopaeva
WEb: Editor: Deleted useless code.
fc32619
@TatianaLopaeva
Merge branch 'develop' into feature/file-folder-selectors
258c866
@ilyaoleshko ilyaoleshko merged commit e20f2db into develop Aug 26, 2021
@ilyaoleshko ilyaoleshko deleted the feature/file-folder-selectors branch August 26, 2021 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gopienkonikita gopienkonikita gopienkonikita approved these changes

@ilyaoleshko ilyaoleshko ilyaoleshko approved these changes

@AlexeySafronov AlexeySafronov Awaiting requested review from AlexeySafronov

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@TatianaLopaeva @gopienkonikita @ilyaoleshko @vafomin @AlexeySafronov @pavelbannov