27b8ca28b7
Web:Common:Catalog: added text hiding on mobile device, when user clicked back button
2021-09-29 17:26:26 +08:00
2cd8235f16
Web:Common: fixed display article
2021-09-29 15:50:58 +08:00
24772e88ad
Web: fixed document catalog loader
2021-09-28 18:25:23 +08:00
0963b8fad7
Web: added support IOS device (adding margin-top for catalog)
2021-09-27 22:29:28 +08:00
a5c57fea52
Web: added catalog layout and document catalog
2021-09-27 20:59:37 +08:00
50becafef7
Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox
2021-09-24 15:07:44 +03:00
cf5a7c8ff2
Bug 52726 - Client.Files.Image: Fix After removing the image from the viewer, the following media file is displayed on the page.
2021-09-23 17:05:04 +03:00
8ad5ac73c6
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-09-22 13:52:09 +03:00
a7597a42e2
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-09-21 14:01:12 +03:00
d702b47502
Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox
2021-09-21 14:01:06 +03:00
11935dc196
Web: Common: delete useless
2021-09-21 14:00:59 +03:00
6691e523a8
Fix bug 52626, 52622: Media Viewer crash
2021-09-21 13:48:13 +03:00
aa6c02b190
Merge branch 'develop' into feature/backup
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
2021-09-20 16:26:34 +03:00
11dfddb031
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
2021-09-14 18:33:01 +05:00
fe2cf74350
Web: Common: fix headline font size
2021-09-14 13:46:15 +03:00
52dfeaa6e7
Web: Disabled body selection for macOS (for touchpad).
2021-09-14 12:28:13 +03:00
e6e49559a9
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
2021-09-13 14:59:06 +05:00
1fe11360a8
Web: Components: added portals to drop-down
2021-09-13 14:56:02 +05:00
899507000f
Web: fixed login route
2021-09-08 16:24:20 +03:00
019deb54ab
Web: Common: fixed article scroll
2021-09-07 16:41:10 +03:00
ef920a2023
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
2021-09-07 12:57:13 +03:00
d51887f642
Web: Common: Fixed Article loaders + added MainButtonLoader
2021-09-07 12:29:55 +03:00
009a801be7
Web: Personal: fixed redirect to login
2021-09-07 11:38:24 +03:00
80f264dd34
Web: Files: fixed filter search
2021-09-06 15:59:41 +03:00
f32b4f1c9d
Web: Files: fixed filter crash
2021-09-03 17:07:07 +03:00
7d69053fc1
Fixed Bug 52088 - Client.Files. Restricted the file selection for the select box
2021-09-02 18:03:42 +03:00
7f08893134
Fix Bug 52311 - Client.Files. Fixed filter block
2021-09-02 13:01:42 +03:00
701e61a6d1
Fix Bug 52188 - Client.Files. Fixed filter reset
2021-08-31 15:01:31 +03:00
ccd7532161
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
ff7f3926ce
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
26c5d2ed90
Web: Common: PageLayout: moved isArticlePinned to settingsStore
2021-08-26 15:07:29 +03:00
ea31c0f258
Web: Files: Fixed article height for tablet view, deleted useless styles.
2021-08-26 15:05:21 +03:00
91199a0de0
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
2021-08-24 15:50:17 +03:00
d223fb6406
Web: Components: Added application block visibility to article for tablet view.
2021-08-24 15:50:12 +03:00
b46a3ae6f0
Web: Common: PrivateRoute: fixed redirect to login
2021-08-24 11:47:00 +03:00
0cfb70d9e2
Error 52089 - Client.Files. Elements of the page are not selected using left mouse button.
2021-08-23 13:50:21 +03:00
0870d65c20
Web: Common: added video loaded error
2021-08-20 12:06:00 +03:00
31bee632e0
Web: Common: fixed MediaViewer
2021-08-19 13:30:42 +03:00
dd3140129b
Fix bug 51929: view tiff format
2021-08-19 05:23:50 +03:00
7cde8b26f1
Web: Common: MediaViewer refactoring
2021-08-19 04:10:32 +03:00
b7df3903dd
Web: Files: fixed the hiding of the article
2021-08-18 15:52:27 +03:00
b4d6beb1ae
Web: Common: fixed main-snackbar style
2021-08-17 17:54:42 +03:00
e8991a612b
Fix bug Bug 51927: MediaViewer updateHammer TypeError
2021-08-17 01:00:07 +03:00
f5e9e17e11
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-16 10:53:48 +03:00
c7efd52424
Web: Common: simplified condition
2021-08-13 16:54:05 +03:00
9a5034386b
Fix bug 51930: wrong order media
2021-08-13 07:21:10 +03:00
f3b06cf04f
Web: Common: fixed video play
2021-08-13 06:45:00 +03:00
26641ad77c
Fix bug 51692: autoplay next file
2021-08-11 00:21:34 +03:00
d84918b6e5
Fix bug 51861: esc closed MediaViewer
2021-08-10 16:49:17 +03:00
65b7b75e26
Fix bug 51693: keyboard navigation
2021-08-10 16:12:51 +03:00
6b1447bb72
Web: Common: fixed video autoplay
2021-08-05 12:38:38 +03:00
85817fc25f
Web: Common: fixed close button size
2021-08-04 17:50:50 +03:00
fccd79c997
Web: Common: added space button action
2021-08-04 12:50:44 +03:00
48f92c6ad2
Web: Common: added action on press delete
2021-08-04 12:43:31 +03:00
edc522d317
Web: Common: start video by click
2021-08-04 12:35:24 +03:00
0457bd714a
Web: Common: disabled media autoplay
2021-07-30 12:03:38 +03:00
6829a2c854
Web: People: added table view, refactoring
2021-07-29 20:21:26 +03:00
b13e71fcae
Web: Files: fixed table filter
2021-07-28 17:45:09 +03:00
2abbd580c2
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
2021-07-28 16:53:23 +03:00
475d6d638f
Web: Files: added column filtering
2021-07-27 15:22:51 +03:00
d86605e2da
Web: Files: added drag and drop for table
2021-07-23 18:13:06 +03:00
ee453f8111
Web: Common: fixed main-bar style
2021-07-21 12:51:03 +03:00
c92d8318f1
Web: Files: fixed header sorting, removed unused code
2021-07-21 12:16:46 +03:00
5ed5adbb9b
Web: Components: Table: added settings, fixed table group menu header
2021-07-19 14:09:09 +03:00
0297620036
Fix SnackBar usage
2021-07-09 17:25:20 +03:00
3556497de6
Merge branch 'develop' into feature/personal
2021-07-08 14:38:26 +03:00
84fa1f8eb3
Web: Common: fixed height
2021-07-08 13:59:48 +03:00
67902f2072
Merge branch 'develop' into feature/backup
2021-07-07 15:15:59 +03:00
523fb66248
Web: Common: fixed buttons height
2021-07-07 13:20:16 +03:00
2e2f121d26
Web: Common: disabled hover
2021-07-07 12:47:01 +03:00
04173a1426
Web: Common: fixed
2021-07-07 11:05:18 +03:00
a9ed86fee7
Web: Common: open selector on button
2021-07-06 17:37:07 +03:00
db7ea5c88f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
2021-07-06 11:38:02 +03:00
a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
c940aae128
Web: refactoring translation loaders
2021-07-02 12:25:36 +03:00
513ec04e33
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
2021-07-01 16:47:34 +03:00
3d662a53ee
Web: Added transition to the preparation page.
2021-07-01 12:12:09 +03:00
bcf7ceb568
Merge branch 'develop' into feature/translations-loaders
...
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
2021-07-01 09:13:17 +03:00
b419c640bc
Web: Settings: Added preparation portal page.
2021-06-30 20:09:00 +03:00
c93a4eda8e
Merge branch 'develop' into feature/privacy-rooms-page
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-06-30 17:20:54 +03:00
Artem Tarasov
ef25c07ddc
Web: Common: FilterInput: fixed transfer viewSettings
2021-06-30 17:05:11 +03:00
69889cab4c
Merge branch 'develop' into feature/privacy-rooms-page
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
1083fd8416
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:09:53 +03:00
dae7215376
Web: Common: fixed article max width
2021-06-30 13:57:48 +03:00
567d3b46ed
Web: Common: fixed button height on mobile
2021-06-30 13:49:33 +03:00
0a82baea4c
WebL Common: fixed article max width
2021-06-30 13:38:53 +03:00
2576784207
Web: Common: added borderRadius prop
2021-06-30 12:57:05 +03:00
2a013c9c5c
Web: Common: refactoring tree menu loader
2021-06-30 12:54:10 +03:00
Artem Tarasov
4da80d3f0c
Web: Files: deleted unnecessary code
2021-06-30 10:50:06 +03:00
1a3cfcbf27
Web: Common: added new loaders
2021-06-30 10:22:01 +03:00
Artem Tarasov
4613940d15
Wb: Common: FileteInput: fixed display ViewSelector on mobile
2021-06-29 16:54:30 +03:00
Artem Tarasov
3385d367d4
Web: Files: refactoring
2021-06-29 15:48:17 +03:00
Artem Tarasov
0cae3990cc
Web: Files: added usage ViewSelector
2021-06-29 15:32:48 +03:00
Artem Tarasov
879aaf1ffd
Web: Common: Loaders: fixed description for Loaders.Tile, Loaders.Tiles
2021-06-28 11:42:38 +03:00
Artem Tarasov
ff5a165638
Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader
2021-06-28 11:25:23 +03:00
a1dec7cd2d
Web: Common: disabled sort by button
2021-06-28 08:14:40 +03:00
Artem Tarasov
547e4a1a26
Web: Common: Filter: fixed select view
2021-06-25 16:38:57 +03:00
Artem Tarasov
52cd157d8d
Web: Common: FilterInpt: deleted unnecessary code
2021-06-25 15:56:44 +03:00
Artem Tarasov
50556cb428
Web: Thumbnails: deleted unnecessary code, refactoring
2021-06-25 14:30:14 +03:00
Artem Tarasov
b65c717fd5
Web: Common: Loaders: fixed TilesLoader for Chrome
2021-06-24 19:34:47 +03:00
c8184e9dc0
Web: Files: fixed privacy bugs
2021-06-23 15:39:43 +03:00
Artem Tarasov
01fb0a6621
Web: Files: Thumbnails: deleted unnecessary code
2021-06-23 15:34:30 +03:00
Artem Tarasov
f894d4593f
Web: Common: Loaders: fixed TilesLoader
2021-06-23 15:00:49 +03:00
Artem Tarasov
1430dace28
Web: fix after merdge
2021-06-23 00:00:42 +03:00
Artem Tarasov
2d9c33a8c6
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
2021-06-22 23:46:35 +03:00
282738cb13
Merge branch 'develop' into feature/personal
2021-06-22 18:44:12 +03:00
8963df11c3
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
2021-06-22 13:41:22 +03:00
b1662e7ac6
Web: Init maintenance displaying
2021-06-22 13:41:11 +03:00
e27cee4535
Web: Common: fixed selection
2021-06-22 09:56:48 +03:00
a55544454a
Web: Common: added support scroll to selectbox, fixed styles
2021-06-18 17:17:59 +03:00
0005169b2b
Web: Common: fixed dragCondition
2021-06-18 14:10:20 +03:00
7905b07c0c
Web: Files: added dragCondition to Selecto
2021-06-18 13:53:32 +03:00
Artem Tarasov
83549b62cd
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
249af955d1
Web: Files: added onSelect function for selectbox
2021-06-17 18:46:22 +03:00
df70473ce5
Merge branch 'develop' into feature/changing-selectbox-library
2021-06-17 17:19:17 +03:00
b088c925d6
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
Artem Tarasov
a8fe50142c
Web: Tree: fixed position of scrollbar on tablet
2021-06-17 15:01:35 +03:00
741de9f2f7
Web: Files: added react-selecto library
2021-06-17 14:36:45 +03:00
0aa2eb3e85
Web: Files: removed react-selectable-fast library
2021-06-17 14:27:41 +03:00
Artem Tarasov
f8e28e5952
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-15 14:06:29 +03:00
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
ee4760e899
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
5db2e8a868
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 17:50:28 +03:00
Artem Tarasov
d44f1bee0f
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
2021-06-11 16:57:17 +03:00
e074c0cf93
Web: Files: changed color of conversion
2021-06-11 16:56:43 +03:00
59bab6a085
Web: Files: fixed conversion progress
2021-06-09 13:28:22 +03:00
4d9c26545e
Web: Files: added conversion progress
2021-06-07 16:20:18 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
Vladislav Makhov
0af3acb46b
web: common: add redirect from root in personal
2021-06-03 16:30:56 +03:00
Artem Tarasov
d960ae6220
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
Artem Tarasov
fbab4041c9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
Artem Tarasov
e7a7aed6ec
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/index.js
2021-05-28 15:30:39 +03:00
25ac98e272
Merge branch 'develop' into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
1b940de5e2
Web: Common: removed I18nextProvider from PageLayout
2021-05-24 16:24:23 +03:00
389ee969a2
Web: Moved translationKeys "Pin" and "Unpin" to "/static/locales/{lng}/Common.json"
2021-05-21 17:19:00 +03:00
cda77e1234
Merge branch 'develop' into bugfix/context-actions
2021-05-20 13:24:18 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
Artem Tarasov
5996b3f74f
Merge branch 'develop' into bugfix/fixed-styles
2021-05-20 01:00:36 +03:00
d55c953805
Web: Files: fixed MediaViewer propTypes
2021-05-19 13:45:37 +03:00
07934f6cd9
Web: Common: fixed firefox header
2021-05-18 17:59:34 +03:00
Artem Tarasov
9eb3b2a375
Web: Components/Client: fix tree loader, fix version badge
2021-05-17 12:40:46 +03:00
Artem Tarasov
d43493e787
Merge branch 'develop' into bugfix/fixed-styles
2021-05-16 00:50:21 +03:00
Artem Tarasov
f7c880c56e
Web: Common: PageLayout: fixed position scrollbar in article
2021-05-16 00:49:10 +03:00
eb628d3703
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
2021-05-14 11:34:10 +03:00
1a58007fcd
Web: Common: removed custom selection frame
2021-05-14 11:21:59 +03:00
0d98b05210
Web: Files: fixed icons clickability
2021-05-13 16:57:10 +03:00
f05147eb29
Web: Common: fixed clickability for mobile devices
2021-05-12 16:53:40 +03:00
72ed5e031c
Web: Common: hide delete icon from MediaViewer for shared folder
2021-05-12 14:05:54 +03:00
9ea5a131e8
Web: Files: fixed MediaViewer crash
2021-05-12 11:55:34 +03:00
Artem Tarasov
58a41faa4a
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# yarn.lock
2021-05-11 10:30:19 +03:00
71e1468835
Web: Common: fixed MediaViewer styles
2021-05-06 12:52:19 +03:00
605f7d749e
Web: Components: FloatingButton: Added rotation on percent === 0
2021-05-04 22:14:42 +03:00
d55b39a653
Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog
2021-04-30 14:02:58 +03:00
Artem Tarasov
5d2264d483
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/FileItem.js
# products/ASC.Files/Client/src/components/FilesContainer.js
# products/ASC.Files/Client/src/components/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/components/sub-components/Badges.js
# products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
# products/ASC.Files/Client/src/components/sub-components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-04-27 13:40:38 +03:00
1658e0d60a
Web: Common: removed custom SelectedFrame, fixed frame styles
2021-04-21 11:48:50 +03:00
Artem Tarasov
7f4888d2a2
Web: Files: fix drag
2021-04-21 02:23:31 +03:00
3734027f4f
Web: Files: fixed newItem styles
2021-04-19 14:16:42 +03:00
9b6e4ace8b
Web: Files: fixed badge for tree menu
2021-04-19 14:08:40 +03:00
Vladislav Makhov
c60d653bc1
web: fix hiding unpinned article when menu item clicked
2021-04-16 13:41:36 +03:00
Artem Tarasov
54b96e8aa0
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
2021-04-15 15:05:15 +03:00
Artem Tarasov
f8c69fd939
Web: Common: Loaders: added loaders for tiles
2021-04-15 11:47:02 +03:00
Artem Tarasov
74a5bf33dc
Web: Files: fix drag, deleted console.log
2021-04-14 12:41:08 +03:00
Artem Tarasov
4be1db4c9a
Web: Files: added calling the context menu when right-clicking on a tile
2021-04-14 00:09:51 +03:00
c324404767
Web: fixed firefox frame
2021-04-13 14:07:44 +03:00
c7017920e8
Web: fixed selection for mobile devices
2021-04-13 12:56:03 +03:00
5daf690ffb
Web: fixed selection
2021-04-13 12:49:37 +03:00
5936640ce2
Web: fixed selection
2021-04-13 12:43:17 +03:00
8cfd5eb644
Web: Added SelectedFrame
2021-04-13 09:35:07 +03:00
Artem Tarasov
f8b36757ae
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/store/index.js
2021-04-09 11:51:39 +03:00
TatianaLopaeva
cdef097fdd
Web: Fixed hiding header when switching group.
2021-04-07 13:35:32 +03:00
TatianaLopaeva
6b7bc650da
Web: components: Added margin-bottom for fixed height of article.
2021-04-06 17:23:32 +03:00
Artem Tarasov
43b9301e90
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
2021-04-01 18:19:09 +03:00
Artem Tarasov
6fdf49742d
Web: Common: FilterInput: propTypes fix
2021-03-29 22:22:43 +03:00
845105e2f8
Web: Common: removed LayoutContextConsumer wrapper
2021-03-29 10:24:56 +03:00
14dcfb90c1
Web: Common: removed frame for mobile devices
2021-03-29 10:08:50 +03:00
Artem Tarasov
155b3e224f
Web: Common: FilterInput: added SwitchButton to ViewSelector
2021-03-25 12:55:27 +03:00
f9f560f351
Web: Common: fixed files selection
2021-03-25 11:27:03 +03:00
TatianaLopaeva
cc707204d9
Web: Removed jumps of article when the page is loading.
2021-03-23 10:39:37 +03:00
12af2890dc
Web: Files: fixed markAsRead
2021-03-22 19:21:36 +03:00
TatianaLopaeva
9baae539d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904
Web: Fixed displaying of shared files at aside & Deleted useless code.
2021-03-22 18:11:39 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
Alexey Kostenko
3524f3b6c6
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
2021-03-22 15:27:36 +03:00
Viktor Fomin
4fe20bdca9
Web: Common: fixed article width
2021-03-20 16:20:51 +03:00
Viktor Fomin
ab84569dcf
Web: Common: fixed article width
2021-03-19 18:46:05 +03:00
e1a477bc64
Web: Common: Restored Selectors in Filter
2021-03-19 10:50:28 +03:00
f9a062fd67
Web: Fix direct move to /wizard
2021-03-18 22:16:09 +03:00
f3f4037282
Web: Fixed Wizard
2021-03-18 21:54:03 +03:00
TatianaLopaeva
5fc9376021
Web: Deleted useless exports.
2021-03-17 16:45:36 +03:00
Artem Tarasov
c9e4df5f1b
Web: moved PeopleSelector to People
2021-03-17 13:37:22 +03:00
2074cbb0d0
Web: Common: fixed StyledSectionFilter
2021-03-15 16:02:26 +03:00
8279174355
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
2021-03-15 14:57:44 +03:00
9ba58855d4
Web: Files: fixed EmptyContainer
2021-03-15 14:51:23 +03:00
b7a7be3d1f
Web: Refactoring
2021-03-13 18:33:43 +03:00
372c06f911
Web: Fix Module not found: Error: Can't resolve 'people/GroupSelector'
2021-03-13 16:02:22 +03:00
Ilya Oleshko
ba92cfa107
Web: Components: PageLayout: Fixed SelectedFrame value level
2021-03-12 12:58:28 +03:00
Viktor Fomin
4c28a12398
Web: Common: fixed icon position
2021-03-10 20:10:09 +03:00
82a6dafb0f
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 19:09:58 +03:00
28a798c542
Web: Fixed work with translations + refactoring:
...
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
Alexey Kostenko
b0f3a4e426
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-04 17:32:09 +03:00
Alexey Kostenko
7cb59e3189
Web: Files/People: fixed direct link transition
2021-03-04 17:31:37 +03:00
Alexey Kostenko
9e80a2010c
Web: Common/Files/People: Refactoring routing (fixed transition between people module and files module)
2021-03-04 13:13:26 +03:00
68930abdcb
Web: Move toastr function to Web Client (mf: "studio/toastr")
2021-03-03 16:46:04 +03:00
fe39c60633
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 16:19:09 +03:00
TatianaLopaeva
ada47512f1
Web: Moved PeopleSelector to the Web Client.
2021-03-03 15:41:28 +03:00
efaeaff894
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 14:46:45 +03:00
684c0e777f
Web: Refactoring
2021-03-03 14:46:37 +03:00
TatianaLopaeva
7b0faa4747
Web: Moved Main into the Web Client.
2021-03-03 13:02:56 +03:00
TatianaLopaeva
1e643edd16
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 12:48:07 +03:00
TatianaLopaeva
d6cf286cd0
Web: Moved Layout to the Web Client.
2021-03-03 12:47:28 +03:00
Vladislav Makhov
1dbfd7f105
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-03 12:33:25 +03:00
TatianaLopaeva
90831adc31
Web: Moved GroupSelector to the People module.
2021-03-03 12:09:12 +03:00
Vladislav Makhov
c2a5eea4be
web: people: refactoring
2021-03-03 12:05:08 +03:00
TatianaLopaeva
988afe48fd
Web: Moved profile menu to the NavMenu.
2021-03-03 11:25:28 +03:00
TatianaLopaeva
5212633a8d
Web: Moved errors from Common to the Web Client.
2021-03-03 11:15:11 +03:00
bf7f680d08
Web: Moved NavMenu to Web Client
2021-03-02 18:25:20 +03:00
ab139d373a
Web: Changed opening @self profile without page refresh
2021-03-01 22:53:42 +03:00
Vladislav Makhov
f452b09ecd
web: fix icons
2021-03-01 16:11:45 +03:00
Vladislav Makhov
ea7697d461
web: common: fix import
2021-03-01 12:30:21 +03:00
Vladislav Makhov
4f8ad66cc3
web: common: fix svg import
2021-03-01 11:56:44 +03:00
TatianaLopaeva
6d70daa26a
Web: Headline: Fix headline color.
2021-02-26 15:46:02 +03:00
TatianaLopaeva
ca0c86f2d4
Web/Common: Fix active title of menu, fix transition without redirect.
2021-02-26 13:50:20 +03:00
Artem Tarasov
487fd2affc
Web: Components/Common: fix imports
2021-02-26 00:19:45 +03:00
Artem Tarasov
c35d0612f0
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/store/InitFilesStore.js
2021-02-25 18:42:10 +03:00
Artem Tarasov
15602c3a8f
Web: Files: fix after merge
2021-02-25 18:41:06 +03:00
Artem Tarasov
9b27d51ac5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
2021-02-25 17:57:32 +03:00
Artem Tarasov
48b3c6b445
Web: Common: fix after merge, fix imports and hierarchy
2021-02-25 17:20:11 +03:00
