Commit Graph

1127 Commits

Author SHA1 Message Date
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