Commit Graph

1444 Commits

Author SHA1 Message Date
Timofey Boyko
c5eaba40e9 Web:Common:Article: remove pause before show or hide text of article when window size changed 2022-04-01 15:38:23 +03:00
Timofey Boyko
b5850c804e Web:Common:Loaders: fix article loader for tablet devices 2022-04-01 13:56:37 +03:00
Timofey Boyko
c23ded379c Web:Common:Loaders: fix section loader for mobile and tablet devices 2022-04-01 13:56:13 +03:00
Timofey Boyko
732790f262 Web:Common:Section: delete useless code 2022-04-01 13:39:57 +03:00
Timofey Boyko
e74622dc90 Web:Common:Navigation: fix drop-box width when navigation is open 2022-04-01 12:42:57 +03:00
Timofey Boyko
e949238303 Web:Common:Article: add min width for article-container for all device types 2022-04-01 12:42:16 +03:00
Timofey Boyko
efbe7224a5 Web:Common:Section: fix section paddings and margins; add min width for section-container; fix main-bar width 2022-04-01 12:41:48 +03:00
mushka
40cb0fd01f Merge branch 'feature/info-panel' of github.com:ONLYOFFICE/AppServer into feature/info-panel 2022-04-01 12:18:29 +03:00
006c9c684f Web: Common: API: add skipLogout option 2022-03-31 22:34:32 +03:00
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +03:00
90a3513630 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-31 15:47:47 +03:00
Timofey Boyko
7c5791b342 Web:Common:Section: fix section-container width for mobile devices 2022-03-31 14:04:03 +03:00
Timofey Boyko
9097e77433 Web:Common:Section: fix section-header width 2022-03-31 14:02:37 +03:00
Timofey Boyko
6897102ae9 Web:Common:Navigation: fix width after merge feature/virtual-rooms-1.2 into hotfix/campaigns-banner 2022-03-31 14:01:35 +03:00
Timofey Boyko
4fa115efd9 Web:Common:Section: add section width depend article width 2022-03-31 13:31:38 +03:00
mushka
e4ab022fb9 dark theme redesign 2022-03-30 21:59:00 +03:00
mushka
85663d7e5b removed title from InfoPanelWrapper & coded exception for files with undefined extension 2022-03-30 20:48:54 +03:00
Timofey Boyko
3b2ead5568 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-30 18:17:50 +03:00
15acf52ee1 Web: Common: ErrorContainer: delete scroll 2022-03-30 12:17:41 +03:00
Timofey Boyko
d426971aee Web:Common:Article: change height for article to 100% 2022-03-30 11:20:36 +03:00
Timofey Boyko
e5f3d27eb9 Web:Common:Section: add support dark-theme for section-header with scroll 2022-03-30 11:17:43 +03:00
f41c65623b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	config/kafka.json
2022-03-30 11:14:47 +03:00
Timofey Boyko
ab3f95f5ff Web:Common:Article: add scroll to article-body 2022-03-30 10:40:44 +03:00
Timofey Boyko
c7d71117fa Web:Common:Article: disable scroll for article 2022-03-30 10:34:15 +03:00
047a2f18a0 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/confirm-redesign 2022-03-29 20:31:17 +03:00
Timofey Boyko
866b75eef6 Web:Common:AdvancedSelector: add check if group index didn found 2022-03-29 17:53:52 +03:00
Timofey Boyko
72519549d7 Web:Common:Navigation: fix width on mobile and tablet devices when navigation open 2022-03-29 14:36:57 +03:00
Timofey Boyko
7d23fd5c55 Web:Common:Section: fix section header after moved scroll into section for mobile and tablet devices 2022-03-29 14:35:55 +03:00
mushka
463a1f54a9 fix kafka conflict 2022-03-29 14:32:50 +03:00
mushka
4e4ecec78f added dark theme support & moved context options "view details" button 2022-03-29 13:59:56 +03:00
Timofey Boyko
194a2060d9 Web:Common:Section: fix padding-right of paging 2022-03-29 11:58:24 +03:00
Timofey Boyko
a38283c33f Web:Client: remove page scrolling for tablet devices and move it to section 2022-03-29 10:34:43 +03:00
Timofey Boyko
51c094d340 Web:Common:Article: disable resize width of article for desktop 2022-03-29 10:13:23 +03:00
mushka
5accb9ba8e fixed SectionHeader and CheckboxMenu differenciation 2022-03-28 16:45:17 +03:00
2ac9b4b785 Web: Common: rewrote section header for functional style 2022-03-28 17:28:57 +05:00
59becc4207 Web: Common: delete should component update 2022-03-28 17:26:12 +05:00
mushka
8e76326f08 minor tweaks 2022-03-28 12:49:01 +03:00
mushka
290e65288e tweaked getting selection, removed unused code 2022-03-28 12:44:35 +03:00
mushka
5bec92e190 fixed read-only section header button positioning 2022-03-28 12:33:57 +03:00
7abe990d96 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-28 12:36:11 +05:00
bf1d2b3126 Web: Common: fixed section height, dark theme and indent 2022-03-28 12:25:03 +05:00
be51cdf796 Web: Common: fixed iPad indent 2022-03-28 12:20:56 +05:00
ec9fa063f8 Web: Common: fix unlink two-factor app 2022-03-26 13:03:13 +03:00
mushka
b0dd8d1077 fixed content gaps and deleted loaders 2022-03-25 18:58:07 +03:00
mushka
fcff7d4354 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-25 16:20:48 +03:00
mushka
9de69a3ff6 some tweaks 2022-03-25 12:10:23 +03:00
Timofey Boyko
fe3f9b59e8 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-25 10:11:00 +03:00
Timofey Boyko
e8ee2c1fa4 Web:Common:AdvancedSelector: add auto-select group header for group selector 2022-03-25 10:06:39 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
Timofey Boyko
bb5c1f2cf9 Web:Common:AdvancedSelector: fix display 2022-03-24 18:00:18 +03:00
mushka
1d80eb1a9d refactored open/close behaviour + redesigned checkbox header 2022-03-24 17:57:36 +03:00
Timofey Boyko
6a9806117b Web:Common:AdvancedSelector: fix bugs with re-render list, add onSelectAll function, move to functional components renders option and group list, create group header component, change props isChecked and isIndeterminate for groups, fix default styles for advanced selector with aside view 2022-03-24 17:52:21 +03:00
9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/api/portal/index.js
#	packages/asc-web-common/components/Loaders/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/save-cancel-buttons/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/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/src/store/ContextOptionsStore.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
#	web/ASC.Web.Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2022-03-24 14:39:52 +03:00
7724a0bda7 Web: Common: fixed navigation width for tablet 2022-03-24 12:30:19 +05:00
eb4d34fc20 Web: Common: fixed section header positioning 2022-03-24 12:06:04 +05:00
eee75d2f73 Web: Common: fixed icon display and padding 2022-03-24 12:01:44 +05:00
Timofey Boyko
b67fedc538 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-23 14:32:35 +03:00
643bf726b3 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-23 16:10:11 +05:00
3fb053d0b0 Web: Common: fixed section header for banner 2022-03-23 16:09:31 +05:00
Timofey Boyko
60cee8e7c9 Web:Common:AdvancedSelector: fix padding right and show scroll for big options list 2022-03-23 11:44:29 +03:00
Timofey Boyko
57ec3f4e34 Web:Common:AdvancedSelector: refactoring and remove useless code 2022-03-23 11:18:59 +03:00
Timofey Boyko
f410b195dc Web:Common: move renderOption and renderGroup function to functional component 2022-03-23 10:35:57 +03:00
Timofey Boyko
4396906827 Web:Common: remove useless code from AdvancedSelector 2022-03-22 18:22:31 +03:00
Timofey Boyko
9ea4e02914 Web:Common: create header component of advanced selector 2022-03-22 18:21:43 +03:00
Timofey Boyko
84d137730c Web:Common: remove useless code 2022-03-22 18:18:09 +03:00
Timofey Boyko
d23ef4baaa Web:Common: create Search component and move SearchInput from selector 2022-03-22 18:17:50 +03:00
mushka
bd20587a2b fixed context menu and added first-close-disable interaction 2022-03-22 14:59:34 +03:00
f9f3eedf7d Web:Components:Added className "settings-mobile" StyledSpacer. 2022-03-22 13:50:52 +03:00
62afb4800a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-22 13:46:03 +03:00
e4253bc3ce Web:Common:Added className "settings-mobile" to StyledSpacer. 2022-03-22 13:26:35 +03:00
476cec2607 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:50:23 +05:00
d13ef622f8 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:16:20 +05:00
mushka
c4b470f98a bugfixes 2022-03-21 18:42:23 +03:00
1219f9de38 Web: Common: FloatingButton: fix style 2022-03-21 18:34:09 +03:00
Timofey Boyko
8355fa388d Web:Common: remove old filter component, update import and change themes 2022-03-21 13:56:42 +03:00
Timofey Boyko
a73a6b8bc7 Web:Common: fix padding of section-wrapper-content for row/table view 2022-03-21 13:39:05 +03:00
mushka
f659632108 fixed exception warning 2022-03-21 13:12:45 +03:00
26272fc2a5 Web: Separated BackupTypes constant. 2022-03-21 12:06:10 +03:00
Timofey Boyko
133dfa3426 Web: fix article main button view (now correct display mobile main button when view port is increased/decreased) 2022-03-21 11:40:40 +03:00
mushka
61aac91d07 fix arrow keys not working with showCurrentFolder === true 2022-03-21 11:28:40 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
mushka
3e951462d8 fixes with unexpcted info loading 2022-03-21 10:24:43 +03:00
3f957337b8 WEb: Common: Deleted useless code. 2022-03-21 10:14:26 +03:00
40cc63fb46 Web: Common: added banner utils for section header 2022-03-18 15:45:26 +05:00
4928c6f077 Web: Common: added section animation 2022-03-18 15:43:16 +05:00
Timofey Boyko
a72ca37013 Web:Common: fix article header margin-left 2022-03-18 13:00:38 +03:00
Timofey Boyko
cc7bba5635 Web:Common: fix article header margin-left 2022-03-18 12:58:34 +03:00
Timofey Boyko
d7ec8b7540 Web:Common: fix article main button padding and margin 2022-03-18 12:39:30 +03:00
Timofey Boyko
27fab6de23 Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout 2022-03-18 11:05:58 +03:00
7f019492b4 Web: Common: Fixed color of border-bottom of people selector. 2022-03-18 10:33:58 +03:00
Timofey Boyko
24c20b3e5f Web:Common: fix article header component padding bottom 2022-03-17 18:00:03 +03:00
Timofey Boyko
01f5f85966 Web:Common: fix article header loader padding 2022-03-17 17:59:36 +03:00
mushka
2d452e18da fixed after-merge room-info button deletion and configured new showCurrentFolderInfo feature 2022-03-17 17:16:21 +03:00
Timofey Boyko
42e68a65b3 Web:Common: fix width article header for mobile devices 2022-03-17 16:18:47 +03:00
fd8567fd17 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-17 15:31:26 +03:00
Timofey Boyko
6b0978b4ad Web:Common:Store: remove useless code 2022-03-17 15:24:35 +03:00
5e5b7c3d3e Web: Common: FilterInput: fix button size 2022-03-17 15:04:27 +03:00
Timofey Boyko
5df365a59a Web:Common: rename page layout component to section component and update stories, readme and sub-components 2022-03-16 15:22:48 +03:00
064bc634ca Web: Common: Fixed overlay of the section header on the banner. 2022-03-16 15:01:26 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
72390a09da Web: Common: Fixed help url. 2022-03-15 18:04:00 +03:00
Timofey Boyko
b4709b87a2 Web:Common:Loaders: update article loaders 2022-03-15 17:41:37 +03:00
Timofey Boyko
bd85e558dc Web:Common: rename 'catalog' to 'article' and update exports 2022-03-15 17:18:07 +03:00
76b9b03952 Web: Common: add skipLogout option 2022-03-15 14:33:21 +03:00
Timofey Boyko
87bd5b9c29 Web:Common:Loaders: fix width for catalog loaders for people 2022-03-15 14:20:43 +03:00
cc293f60c2 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-15 14:11:00 +03:00
a61ba5697c Web: Common: Added constants. 2022-03-15 12:14:41 +03:00
1d6281b4dd Web: Common: Deleted useless code. 2022-03-15 11:26:37 +03:00
8cbc15a15d Web: Backup: Fixed language for weekdays and for help url. 2022-03-15 09:09:22 +03:00
bce9e824c8 Web: Deleted useless code. 2022-03-15 08:13:23 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
35f3111bcb Web: Common: fixed transition 2022-03-14 15:43:42 +05:00
c35bb972c3 Web: Common: added orientation handler 2022-03-14 15:43:05 +05:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
Timofey Boyko
3ae4b92ad7 Web:Common: moved out catalog from page layout and refactoring page layout 2022-03-11 11:04:09 +03:00
mushka
c3c59ceaff changed size names in app buttons 2022-03-10 15:59:04 +03:00
Timofey Boyko
eb11e51576 Web:Common: enable add button when navigation is open 2022-03-10 14:00:15 +03:00
Timofey Boyko
cdda6f3d73 Web:Common:NewFilterInput: add support i18next for 'AddFilter' button 2022-03-05 19:12:48 +03:00
Timofey Boyko
32a7a41f87 Web:Files: add support i18next for 'view' 2022-03-05 19:04:53 +03:00
Timofey Boyko
7d747b9a7b Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 16:59:14 +03:00
Timofey Boyko
8c95b9bd92 Web:Common:PageLayout: fix catalog position on mobile devices 2022-03-05 16:56:24 +03:00
77be460447 Web: Common: custom redirect path on logout 2022-03-05 13:43:37 +03:00
264637510d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-05 09:15:15 +03:00
1fce535cfb WEb: Backup: Added constants. 2022-03-04 17:00:04 +03:00
d6fe627217 Web: AutoBackup: Refactoring. 2022-03-04 16:12:06 +03:00
mushka
384a92c30f finished merging 2022-03-04 12:52:34 +03:00
Timofey Boyko
35302c22a2 Web:Common:Components: fix key error for sort button 2022-03-03 16:46:45 +03:00
Timofey Boyko
61a1a7fbd3 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:25:34 +03:00
mushka
bb69417dbf fix kafka code formatting and ContextMenu - InfoPanel layering interaction 2022-03-03 16:23:45 +03:00
Timofey Boyko
0743c5bf83 Web:Files:Filter: disable sort in recent and favorites folder 2022-03-03 16:10:03 +03:00
8a4ab2171d Web:Common:Changed the setMailDomainSettings, setLifetimeAuditSettings requests. Added requests setDNSSettings, getAuditTrailReport to api settings. 2022-03-03 16:04:26 +03:00
mushka
a11a40e61b fix import mixins 2022-03-03 14:38:28 +03:00
mushka
807fe75b72 change code formatting 3 2022-03-03 14:25:10 +03:00
mushka
6b88a2dd43 change code formatting 2 2022-03-03 13:59:20 +03:00
mushka
424a7a7e3c change code formatting 2022-03-03 13:43:43 +03:00
Timofey Boyko
5bc09fb59e Web:Common:Components: fix sort menu for mobile devices 2022-03-03 12:37:36 +03:00
Timofey Boyko
c83c09c1f1 Web:Files:Pages: fix double header when table group is active 2022-03-03 12:37:10 +03:00
Timofey Boyko
fe3bcca4a1 Web:Common:Components: fix margins into section 2022-03-03 12:36:18 +03:00
Timofey Boyko
f4b8625fd7 Web:Common:Components: add import 'css' 2022-03-03 10:06:47 +03:00
Timofey Boyko
d1f3260d88 Web:Common:Components: fix padding and margin for section and section header 2022-03-03 10:04:54 +03:00
Timofey Boyko
eb094069ba Web:Common:Components: refactoring navigation component 2022-03-03 10:04:27 +03:00
mushka
e77a97e105 added checkbox menu interaction and new opening mechanics 2022-03-02 17:19:19 +03:00
Timofey Boyko
f828257859 Web:Files: fix dropdown render in sort button 2022-03-02 15:16:41 +03:00
2309bc060f Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-02 11:25:08 +03:00
f57cff1dcc Merge branch 'develop' into feature/backup 2022-03-02 11:21:57 +03:00
2b97c30707 Web:Common:Added a setPortalPasswordSettings request to the SettingsStore. 2022-03-02 11:10:30 +03:00
f695684b78 Web:Common:Added requests setPortalPasswordSettings, setMailDomainSettings, setIpRestrictions,setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings, setWhiteLabelSettings, restoreWhiteLabelSettings to api settings. 2022-03-02 11:08:48 +03:00
f1dd337c24 Web:Common:Added setPortalRename request to api portal. 2022-03-02 11:06:08 +03:00
Timofey
19937f50dd Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-01 22:05:41 +08:00
f3afd79a3f Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/components/AdvancedSelector/AdvancedSelector.js
#	packages/asc-web-common/components/AdvancedSelector/sub-components/Selector.js
#	packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
#	packages/asc-web-common/components/PageLayout/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/context-menu/styled-context-menu.js
#	packages/asc-web-components/drop-down/index.js
#	packages/asc-web-components/link-with-dropdown/index.js
#	packages/asc-web-components/row/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/themes/dark.js
#	products/ASC.Files/Client/public/images/files.menu.svg
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/QuickButtons.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/ModalView.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/sub-components/FileNameCell.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.People/Client/public/images/people.menu.svg
#	products/ASC.People/Client/src/components/GroupSelector/index.js
#	products/ASC.People/Client/src/components/PeopleSelector/index.js
#	products/ASC.People/Client/src/pages/Home/Section/Body/RowView/userContent.js
#	products/ASC.People/Client/src/pages/Home/index.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-nav.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/nav-item.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/profile-menu.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
2022-03-01 13:50:26 +03:00
Timofey
916709fbd9 Web:Common:PageLayout: fix catalog z-index for mobile 2022-03-01 18:11:56 +08:00
Timofey
6f934ac0f0 Web:Common:PageLayout: add special name for catalog burger for tablet view 2022-03-01 17:53:10 +08:00
bbe35750f5 Merge branch 'develop' into hotfix/campaigns-banner 2022-02-28 19:08:13 +05:00
9aff975cd4 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-28 16:17:48 +03:00
507334e438 Web: Common: added snackbar exist prop 2022-02-28 18:17:09 +05:00
e6ef7b5e37 Web: Common: changed positioning section header 2022-02-28 18:16:35 +05:00
785e72ae20 Web: Common: added unmount method 2022-02-28 18:14:55 +05:00
cec50e1230 Web: Common: added snackbar props 2022-02-28 18:13:33 +05:00
mushka
518abb7a2f added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization 2022-02-28 15:53:46 +03:00
Timofey
1f5ad1c3f3 Web:Common:NewFilterInput: add special name for row-option for e2e tests 2022-02-28 15:25:01 +08:00
Timofey
b2ca717a6a Web:Common:AdvancedSelector: add special name for row-option for e2e tests 2022-02-28 15:24:35 +08:00
eae8b7c0bb Web: Socket: Added "restore-backup" event listeners 2022-02-25 19:08:02 +03:00
496b55c5a6 Web: Common: FilterInput: Added fixedDirection property 2022-02-25 17:11:36 +03:00
f07aa0a183 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	config/nginx/onlyoffice.conf
#	packages/asc-web-common/constants/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2022-02-25 16:05:43 +03:00
Timofey
01ca97761c Web:Common: add loader for groups in advanced selector 2022-02-24 16:59:07 +08:00
Timofey
337497c5d5 Web:Common: add circle indicator if filter is active 2022-02-24 16:36:59 +08:00
b5bcfa03b9 Web: common: Added list loader to the Loaders file. 2022-02-22 15:36:52 +03:00
877783cf71 Web: Common: Added list loader. 2022-02-22 15:35:58 +03:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
Timofey
aa91c011d8 Web:Common: refactoring new filter input and add support group selector 2022-02-22 17:10:13 +08:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
43ad5c1747 Web: Common: add children props for ErrorContainer 2022-02-21 18:42:57 +03:00
a5163d9445 Web: Common: fixed main bar adaptability 2022-02-21 19:56:42 +05:00
mushka
80603b2343 added panel close on background click in tablet- view 2022-02-21 15:45:47 +03:00
Timofey
1a386a8adf Web:Common:Components: add support dark-theme for new filter input 2022-02-21 19:55:06 +08:00
mushka
524ac82b9e added Show Info option to file context menu 2022-02-21 14:39:47 +03:00
Timofey
42c92a436d Web:Common:Components: fix display navigation for root folder 2022-02-21 16:09:21 +08:00
Timofey
e796f7fcc6 Web:Files:Filter: add sort on tablet and mobile view 2022-02-18 22:10:20 +08:00
Timofey
ba0edec498 Web:Common:Navigation: delete useless code 2022-02-18 21:44:01 +08:00
Timofey
89129fac32 Web:Common:FilterInput: add tablet and mobile view 2022-02-18 21:43:21 +08:00
Timofey
8c73f93eed Web:Files:Catalog: fix section rerender when catalog opening on mobile 2022-02-18 20:46:49 +08:00
Timofey
ec7cea3205 Web:Common:Components: fix section header margin and padding, refactoring 2022-02-18 17:56:42 +08:00
4b06ae5f0e Web: Files: Common: Added redirect to preparation portal. 2022-02-18 10:01:55 +03:00
c2c802b732 Web: Common: PageLayout: Fixed default PageLayout header styles after merge 2022-02-17 13:06:42 +03:00
mushka
4039499a1f added loader and shared-to users 2022-02-17 11:46:20 +03:00
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
02a9c6f973 Web: Common: FilterInput: Fixed displaying sort icon if sort items hidden 2022-02-16 13:54:11 +03:00
5a876ff5ab Web: Common: FilterInput: Added property for hiding sort items inside SortComboBox 2022-02-16 13:53:09 +03:00
Timofey
fef4a218ff Web:Common:AdvancedSelector: add auto changed group header if groups.length === 1 2022-02-16 16:52:39 +08:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00
mushka
125796a112 body content 2022-02-15 14:57:36 +03:00
Timofey
4877ff6956 Web:Common:NewFilterInput: fix display selected autor 2022-02-15 19:36:15 +08:00
Timofey
b5a4e7a717 Web:Common:PageLayout: change filter margin button depend on current view 2022-02-15 19:03:26 +08:00
Timofey
5714f2b774 Web:Common:NewFilterInput: add sort combobox 2022-02-15 19:01:30 +08:00
Timofey
bf1ba5b407 Web:Common:AdvancedSelector: disable groups list for groupSelector 2022-02-15 19:00:55 +08:00
0850e20d63 Web: Common: move firebase config from hotfix/campaigns banner 2022-02-15 11:34:15 +03:00
Timofey
df3b2db059 Web:Common:AdvancedSelector: change separator margin left and right, replace '()' from header 2022-02-15 15:22:05 +08:00
0ef8f00fb3 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 10:14:19 +03:00
cfa53b3450 Web:Common:Fix display images in media viewer. 2022-02-15 10:13:35 +03:00
Timofey
02377b0e67 Web:Common:NewFilterInput: add clear function for search input and add changing value after change folder or reset filter 2022-02-14 21:53:39 +08:00
b7d6454dbe Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-14 14:39:31 +03:00
Timofey
94cc2b044a Web:Common:NewFilterInput: add people selector 2022-02-14 18:50:26 +08:00
Timofey
be4d248050 Web:Common:AdvancedSelector: remove modal view and change aside view with 1.2.1 layouts 2022-02-14 18:49:27 +08:00
mushka
9c815a76af added items-panel header divider 2022-02-11 18:19:15 +03:00
mushka
6c22190b28 rename to info-panel 2022-02-11 17:35:18 +03:00
mushka
46fd2f0f75 added isVisible toogle to GroupMenu 2022-02-11 17:30:07 +03:00
fecb7d5e37 Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited. 2022-02-10 19:49:44 +03:00
mushka
b2fb153042 fixed child rendering; styled header 2022-02-10 18:52:27 +03:00
mushka
830d560077 added responsiveness 2022-02-10 16:18:16 +03:00
mushka
82c1c47be6 working RoomInfoStore 2022-02-09 21:08:22 +03:00
ddd2e7182f Web: Files: Backup: Added method to check if automatic backup is available, refactoring. 2022-02-09 18:16:07 +03:00
Timofey
092d870f69 Merge branch 'feature/virtual-rooms-1.2' into feature/new-filter-input 2022-02-09 19:54:45 +08:00
Timofey
f6e4cc4d71 Merge branch 'develop' into feature/new-filter-input 2022-02-09 19:54:11 +08:00
16562b1787 Web: Common: get user data from confirm 2022-02-09 14:51:01 +03:00
ba9cbf811b Web: SW: Fix unregister on undefined 2022-02-09 12:33:09 +03:00
mushka
ff3c55e892 add header 2022-02-09 12:13:16 +03:00
mushka
b5aba234d9 for review 2022-02-08 17:04:27 +03:00
mushka
be1277d8b4 addoed structure 2022-02-08 15:11:31 +03:00
5480752ec2 Web: Components: deleted extra styles 2022-02-08 15:07:23 +05:00
Timofey
6d88c4c90a Web:Common:Components: fix navigation crash in common folder 2022-02-08 15:25:36 +08:00
Timofey
2e72853ead Web:Common:Navigation: add support dark-theme 2022-02-07 23:35:09 +08:00
Timofey
0bf9116f91 Web:Common:PageLayout: set catalog height on mobile devices 2022-02-07 22:27:05 +08:00
Timofey
2b23aae93f Web:Common:PageLayout: fix margin-top on mobile devices for catalog 2022-02-07 21:30:31 +08:00
Timofey
951002ca07 Web:Common:Components: fix floating button background color for both themes and add center align for svg 2022-02-07 17:56:31 +08:00
40d56075f1 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/public/locales/en/Settings.json
#	products/ASC.Files/Client/public/locales/ru/Settings.json
#	products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.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.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/webpack.config.js
2022-02-07 12:40:50 +03:00
b03a466591 Web: Common: add set roomsMode 2022-02-06 22:55:15 +03:00
Timofey
e0ba6ebcb1 Web:Common:Components: delete top css property for catalog 2022-02-04 23:24:39 +08:00
Timofey
1c80398617 Web:Common:Catalog: refactoring catalog components and add support dark-theme 2022-02-04 21:21:30 +08:00
3a16fdccfd Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-03 21:05:07 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
Timofey
bd8d8180f9 Web: fixed code format 2022-02-03 23:34:19 +08:00
Timofey
223c04a3c7 Merge branch 'feature/dark-theme' into feature/virtual-rooms-1.2 2022-02-03 20:59:26 +08:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
Timofey
20b4a691dd Web:Common:Components: enable floating buttons with secondary and primary progress on desktop 2022-02-03 16:34:47 +08:00
Timofey
918b138f92 Web:Common:Components: add clear trash button 2022-02-03 16:06:36 +08:00
867d3f4ec7 Web: Common: add roomsMode flag 2022-02-03 01:38:35 +03:00
646473f4f7 Web: Common: get sso translate 2022-02-03 01:10:12 +03:00
Timofey
7086d0cc50 Web:Common:Navigation: change drop box width on tablet devices 2022-02-02 23:04:41 +08:00
Artem Tarasov
6562e36a13
Merge pull request #502 from ONLYOFFICE/bugfix/fix-display-images-in-media-viewer
Bugfix/fix display images in media viewer
2022-02-02 14:55:38 +03:00
Timofey
512885373d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-02-02 19:35:42 +08:00
Timofey
cfe493839b Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-02 19:34:33 +08:00
Timofey
7c61e54a7b Web:Common:Components: refactoring navigation component 2022-02-02 19:24:35 +08:00
bf07a141d8 Web:Common:Fix. 2022-02-02 14:22:41 +03:00
Timofey
427b10142c Merge branch 'develop' into feature/navigation 2022-02-02 17:31:53 +08:00
c8f1fc9f03 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-02-01 16:53:56 +03:00
Timofey
f6090b4f58 Merge branch 'feature/navigation' into feature/virtual-rooms-1.2 2022-02-01 18:44:49 +08:00
Timofey
2870da6271 Web:Common:Components: fixed top and left position for navigation drop-box 2022-02-01 18:37:44 +08:00
Timofey
46afa9b16c Merge branch 'develop' into feature/navigation 2022-02-01 16:45:30 +08:00
94b364efcb Merge branch 'hotfix/v1.1.1' into hotfix/campaigns-banner 2022-02-01 13:33:27 +05:00
f6a1d10a98 Web: Common: added maintenance exist param 2022-02-01 13:22:39 +05:00
d05234bf6c Web: Common: added main-bar styles 2022-02-01 13:17:37 +05:00
088e078c1c Web: Common: added top, margin top params, fixed styles 2022-02-01 13:17:10 +05:00
dfaa34ac39 Web: Common: added main bar 2022-02-01 12:59:42 +05:00
Timofey
cf3d4c71e3 Merge branch 'devlop' into branch feature/catalog 2022-01-31 23:52:52 +08:00
Timofey
91f0213c51 Web:Common:Components: disable floating button on mobile and tablet devices 2022-01-31 23:46:41 +08:00
Timofey
95353b1b4e Web:Common:Components: disable floating button on mobile devices 2022-01-31 21:40:43 +08:00
4d5ada8381 Web: Common: add get capabilities 2022-01-31 12:32:59 +03:00
b91348695e Web:Common:Changed props previewFile to isPreviewFile. Changed propTypes to boolean for isPreviewFile. Web:Files:Added onButtonBackHandler function. 2022-01-30 21:46:39 +03:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
8add87820c Web:Files:Added isFirstUrl data to localStorage. Changed the condition for changing the url. 2022-01-28 16:34:15 +03:00
218990c4fa b:Common: Added props onChangeUrl to the MediaViewer component. 2022-01-27 18:48:14 +03:00
Timofey
18ed20569d Web:Editor: wrap editor in theme provider and delete theme as props in components 2022-01-27 21:54:58 +08:00
Timofey
4b45eaa243 Merge branch 'develop' into feature/dark-theme 2022-01-27 18:10:13 +08:00
Timofey
f3a8ecc1ab Web:Common:FloatingButton: added 2px padding from the edge for the loading bar 2022-01-27 17:16:19 +08:00
Timofey
293de829bd Web:Files:Catalog: add main button mobile on mobile and tablet devices 2022-01-27 17:13:49 +08:00
4c6d130ea9 Web:Files:Added MediaViewer closing handling when the Close button is clicked. 2022-01-26 20:56:01 +03:00
4fd451f5a7 Web: Common: added checkedMaintenance for banner 2022-01-25 20:31:48 +05:00
34dbcab3c4 Web: Common: removed div parent 2022-01-25 20:30:53 +05:00
e200898978 Added isMediaViewerOpen key to localStorage. 2022-01-25 18:29:18 +03:00
889e0e31de Web: Common: moved main-bar over section header 2022-01-25 20:29:13 +05:00
ef6682ab32 Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer. 2022-01-25 18:20:59 +03:00
e810605a4d Web: Socket: Fix proxy ws by web:hub:url (appsettings.json) 2022-01-25 12:54:21 +03:00
Timofey
f955bea115 Web:Client:Components: fixed product name color for dark and base theme 2022-01-25 16:32:35 +08:00
Timofey
55fe7bd155 Web:Common:PageLayout: fixed background and fill color for section toggler in dark theme 2022-01-25 16:17:12 +08:00
Timofey
72c5c93737 Web: add theme support from props 2022-01-24 23:27:24 +08:00
00a4851ebf Web: Common: deleted getBarHtml function
(cherry picked from commit 990eaaf8a32dca24ef51c39f67458136a689d51a)
2022-01-24 18:50:06 +05:00
f1dccd9708 Web: Common: created checkBar and getBar function
(cherry picked from commit 954ad6c950f6b1428d5a5f6c0b75cd3e699f4326)
2022-01-24 18:46:21 +05:00
88a5b319cd Web: Common: added section bar component 2022-01-24 18:44:20 +05:00
b25f339c3e Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-24 15:43:04 +03:00
Timofey
4dd1237974 Web:Common:ErrorContainer: add change theme in index.js and fixed height to 100vh 2022-01-24 20:03:19 +08:00
Timofey
57f5caba85 Web:Common:ErrorContainer: add support dark-theme 2022-01-24 18:48:24 +08:00
57c1084b87 Web: Common: refactoring 2022-01-22 01:47:37 +03:00
ee2fd6bb0f Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer. 2022-01-21 19:21:29 +03:00
a66964e0b8 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner 2022-01-21 18:46:20 +03:00
f838f5c6da Web: Common: fix methods in firebase config 2022-01-21 18:26:34 +03:00
ff5667fe07 Web: Common/People: delete useless 2022-01-21 18:25:31 +03:00
Timofey
d83808142a Web:Common:Loaders: add support dark-theme for tile loader 2022-01-21 22:40:29 +08:00
Dmitry Kulak
b740a4d00a Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Server/DocStore
2022-01-21 16:47:39 +03:00
Timofey
f5ae02dfc9 Merge branch 'develop' into feature/catalog 2022-01-21 21:06:40 +08:00
efe799d712 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/helpers/utils.js
2022-01-21 14:44:06 +03:00
Timofey
47974e378f Merge branch 'develop' into feature/dark-theme 2022-01-21 19:31:48 +08:00
Timofey
cfb4818b1e Web:Common:FloationgButton: add props variable 2022-01-20 23:46:46 +08:00
Timofey
84aabef8e7 Web:Common: update dark theme after merge branch 'develop' 2022-01-20 23:45:33 +08:00
Timofey
4598d238e5 Web:Components: update dark theme after merge branch 'develop' 2022-01-20 23:29:09 +08:00
Timofey
e5f06b932d Merge branch 'develop' into feature/dark-theme 2022-01-20 21:18:30 +08:00
99105f5d73 Merge branch 'develop' into component-tooltips
# Conflicts:
#	packages/asc-web-components/icon-button/index.js
#	products/ASC.Files/Client/public/locales/de/Article.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/en/Article.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/fr/Article.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/Article.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/pt-BR/Article.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Article.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/sk/Article.json
#	products/ASC.Files/Client/public/locales/sk/Translations.json
2022-01-20 15:45:24 +03:00
Timofey
c6c651974d Web:Common:PageLayout: update margin for section filter components 2022-01-20 20:05:53 +08:00
Timofey
61222c04fe Web:Common:NewFilterInput: init new filter input 2022-01-20 20:05:07 +08:00
6c72436a03
Merge branch 'develop' into feature/mobile-main-button 2022-01-20 14:25:05 +03:00
0555b73c5d Web: Common: fix firebase error 2022-01-19 16:16:01 +03:00
5dbe35f4d1 Web:Common:Сhanged history.pushState method to history.push. 2022-01-19 12:27:41 +03:00
2e0d72719e Web: Files: moved db config 2022-01-19 12:15:23 +03:00
Dmitry Kulak
5098ea1079 Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones 2022-01-19 11:34:32 +03:00
5222666d2e Web:Common:Added history.pushState method to display images in MediaViewer. 2022-01-18 10:47:00 +03:00
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
2022-01-17 19:02:40 +03:00
aa8903b0ef Web: Files: Added copy method to save in 'oform' format. 2022-01-17 15:54:14 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
6f90864ed8 Merge branch 'hotfix/v1.1.1' into feature/socket-io 2022-01-13 10:49:43 +03:00
8b327ceb66 Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage 2022-01-12 20:13:30 +03:00
0c341f0709 Merge branch 'hotfix/v1.1.1' into feature/convert-password 2022-01-11 16:14:46 +03:00
c7bb1a51d5 Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card 2022-01-10 16:24:21 +03:00
3c23f4d892 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-12-30 14:34:49 +03:00
Dmitry Kulak
e014ff614e Web: Files: Tiles: Loaders aligned with content, fixes 2021-12-30 10:55:16 +03:00
441d8875ba Web:Common:Store: change default theme 2021-12-29 23:14:21 +08:00
Dmitry Kulak
b5bcf38456 Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles 2021-12-29 15:48:41 +03:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
f129a98d93 Web:Common:Store: add array for available themes 2021-12-28 21:35:47 +08:00
2140ccff0b Web:Client: add the ability to get default theme from browser theme and save it in local storage 2021-12-28 19:01:03 +08:00
febf172875 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/avatar-editor/index.js
#	packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
#	packages/asc-web-components/main-button/index.js
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
25ee05f38a Web:Common:FilterInput: fix fill and stroke color for filter button in dark and base themes 2021-12-28 17:58:56 +08:00
ee839e8169 Web:Common:PageLayout: change background-color and fill for section toggler button in dark-theme 2021-12-28 16:52:37 +08:00
Dmitry Kulak
57c2460c3e Web: Files: Tiles: Redesign, refactoring 2021-12-27 18:46:26 +03:00
d46679e9bb Web:Common:PageLayout: add support dark-theme for section 2021-12-25 00:50:45 +08:00
b45e7a26ae Web:Common:MediaViewer: add support dark-theme 2021-12-25 00:43:52 +08:00
d7b98e875b Web:Common:Header: add support dark-theme for loader 2021-12-24 19:44:37 +08:00
6f6ea8eca8 Web:Common:FloatingButton: add support dark-theme 2021-12-24 19:36:24 +08:00
f3821d18f6 Web:Common:AdvancedSelector:add support dark-theme 2021-12-24 19:25:35 +08:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
gectokot
4f334432e5 Web: Files: Tiles: Different number of loaders on different screens 2021-12-23 12:32:49 +03:00
Dmitry Kulak
1f4ce11734 Web: Files: Tiles: Loaders redesign 2021-12-23 12:32:46 +03:00
6fde793f14 Web:add opportunity change theme in profile menu 2021-12-22 22:22:35 +08:00
b047ae3c0b Web: Common: Added password field to api method. 2021-12-22 12:15:56 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
gectokot
e9449b5a72 Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode 2021-12-14 14:45:40 +03:00
00865480dd Web:Common:FilterInput: add support dark-theme 2021-12-14 17:45:09 +08:00
e7854ed5d8 Web:Common:PageLayout:Article: add support dark-theme 2021-12-14 16:14:36 +08:00
04ff7308b8 Web:Common:Store: add theme support 2021-12-14 15:52:49 +08:00
39f172bd22 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-13 17:58:34 +03:00
530d1a18a8 Web: Api: Added property for setEncryptionKeys 2021-12-13 17:58:25 +03:00
e967b38aa3 Fix bug 51320: firebase error 2021-12-13 17:03:59 +03:00
9269594b8a Web: DesktopEditors mode: Added more logs 2021-12-13 01:32:47 +03:00
2afce477b1 Web: Common: Removed useless code. 2021-12-10 09:30:11 +03:00
51b7921ed4 Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3 Web: Editor: Added api method for restore document version. 2021-12-08 16:28:30 +03:00
317750f909 Web: Added api methods.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:28:25 +03:00
c44f580681 Fix issues of UselessModuleTranslationKeysTest 2021-12-07 13:04:06 +03:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
907877b08a Web: Common: delete filter button title 2021-12-02 13:08:33 +05:00
a012038f3b Merge branch 'develop' into feature/catalog 2021-12-02 14:59:31 +08:00
7a00dba491 Merge branch 'develop' into feature/navigation 2021-12-02 14:53:42 +08:00
27e732e9a3 Web: Login: Added usage of new API /authentication.json parameter "session" 2021-12-01 10:56:50 +03:00
626ad87077
Merge pull request #469 from ONLYOFFICE/feature/make-form
Feature/make form
2021-11-30 11:36:23 +03:00
7f39ebd499 Web: Files: SelectFileDialog: Fixed loaders according layouts. 2021-11-30 10:11:49 +03:00
5bb3602964 Web: Common: Api: Fixed copyAs api call params 2021-11-30 08:20:55 +03:00
0b9a9b633d Web: Common: Api: Added fileCopyAs action 2021-11-29 16:31:40 +03:00
bce51d74b6 Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error 2021-11-25 16:37:36 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
73d3b00c07 Web: added missing classNames for autotests 2021-11-25 12:11:22 +03:00
465c57b8f6 Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page. 2021-11-24 11:09:52 +03:00
2f21f2246a
Merge branch 'develop' into feature/mobile-main-button 2021-11-22 16:39:22 +03:00
54a58916ed Web: Common: Filter: fixed multiple api request 2021-11-22 16:29:32 +03:00
52626a548e Web: fixed Snackbar styles 2021-11-22 15:01:33 +03:00
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:40:24 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
2eb6843e46 Web: Editor: Added conditions for creating a file in my documents folder when filling out a form. 2021-11-19 10:28:57 +03:00
a4e21a2319 Web: Component: Added modal dialog height property. 2021-11-18 15:24:28 +03:00
612c953ddc Fixed Bug 52931 - Client. Files. Media. Fixed console error 2021-11-18 15:15:39 +03:00
9e4b29a136 Web: Common: Api: Added new data parameters 2021-11-17 16:36:50 +03:00
b28acbe943 Web: Common: added color prop for floating button 2021-11-17 17:37:01 +05:00
Artem Tarasov
f33d99c9c0 Web: People/Common: added sorting of groups in the tree 2021-11-16 19:27:27 +03:00
39c3d57781 Web: Common: AuthStore: Added reset auth-store after login with app code 2021-11-15 14:29:02 +03:00
f06283bb1a Fix displayName of current user after creation/update if user's display name with diacritics 2021-11-13 20:18:58 +03:00
0bd634dd16 Web: Files: added className for tree root folders 2021-11-12 15:36:56 +03:00
17e3e5cb98 bump version to 1.1.1 2021-11-12 15:21:25 +03:00
3809273075 bump version to 1.1.0 2021-11-12 15:19:40 +03:00
2b5e4bad38 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-11 15:37:31 +03:00
2ea63910a2 Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string ids 2021-11-11 15:37:23 +03:00
3a03d65ed9 Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-11 13:49:08 +03:00
53cb6827b4 Fix Bug 53360: Client.Files.Image - Removed the render when opening and closing the file delete dialog. 2021-11-11 13:48:47 +03:00
04d3d5253f Fix displayName of current user after changing culture of Profile 2021-11-10 21:31:39 +03:00
11769e8c9e Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language. 2021-11-10 19:59:03 +03:00
e917b4bb56 Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json 2021-11-10 15:52:36 +03:00
f5da85049c Fix Bug 53524 - Client.Profile|List: User's display name with diacritics invalid 2021-11-09 19:32:15 +03:00
677f7d73e3 Web: Common: Api: Added encoding for string folderId 2021-11-09 17:55:27 +03:00
56d16ac2f4
Merge pull request #437 from ONLYOFFICE/feature/files-upload
Web: Files: fixed files upload
2021-11-08 15:38:45 +03:00
5c5db26dc4 Web: Files: removed unused code 2021-11-08 14:04:52 +03:00
a876ce8b67 Web:Common:PageLayout: add catalog in readme and storybook 2021-11-08 17:23:56 +08:00
5d953407ad Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-03 16:55:44 +03:00
f1f42a88ae Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-03 15:44:23 +03:00
bf4126cc0e Web: Deleted console.log. 2021-11-03 15:25:04 +03:00
773419f3ef Web: Common: AuthStore: Added added url at response parameters 2021-11-03 12:18:28 +03:00
da8e34930f Web: Added prop. 2021-11-03 11:59:54 +03:00
2d60dbee1b Merge branch 'hotfix/v1.0.1' into bugfix/Bug53416
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
2021-11-03 11:58:56 +03:00
71febf0a3e Web:Common:Navigation: fix drop-box position on tablet 2021-11-03 16:52:35 +08:00
a99111b6f6 Web:Common:Navigation: remove x-scrollbar on tablet and mobile 2021-11-03 15:52:10 +08:00
3d9bda87b0 Web:Common:Navigation: remove x-scrollbar on tablet and mobile 2021-11-03 15:49:15 +08:00
72adefec39 Web: Deleted useless code after Cherry Pick. 2021-11-03 10:35:03 +03:00