Commit Graph

3258 Commits

Author SHA1 Message Date
4af1247136 Web: Integration: Restored after merge develop 2022-08-03 14:48:54 +03:00
bf99da04bf SSO: fix style 2022-08-02 18:22:34 +03:00
28698beeee SSO: fix placeholders 2022-08-02 18:04:10 +03:00
928ee509ad Components: Headline: fix size 2022-08-02 18:03:25 +03:00
bb49d50560 SSO: fix style 2022-08-02 17:46:50 +03:00
2ee692d007 SSO: fix validate error 2022-08-02 17:41:02 +03:00
c8c4395d4c SSO: fix modal style 2022-08-02 17:35:19 +03:00
18bb507835 SSO: fix style 2022-08-02 16:51:25 +03:00
8fff10bb1a SSO: add disable 2022-08-02 16:20:19 +03:00
dcd559d560 SSO: fix 2022-08-02 16:16:59 +03:00
5d057906b3 SSO: fix styles 2022-08-02 16:14:07 +03:00
ad75ae40d3 SSO: show metadata if enable 2022-08-02 12:36:05 +03:00
3514d1a60f SSO: fix modal 2022-08-02 12:33:41 +03:00
03b03ed910 Merge branch 'develop' into feature/sso
# Conflicts:
#	packages/client/public/images/actions.upload.react.svg
#	packages/client/public/images/empty_screen_privacy.png
#	packages/client/public/locales/en/SingleSignOn.json
#	packages/client/public/locales/ru/SingleSignOn.json
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
#	packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
#	packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
#	packages/client/src/store/SsoFormStore.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
2022-08-02 12:05:15 +03:00
27fa822017 Web: Commented useless code 2022-08-01 19:47:29 +03:00
72878d5ca8 Web: Fix open NavMenu on Mobile 2022-08-01 18:47:11 +03:00
ac3683d7ab Web: Fix i18n ns name for Files.json 2022-08-01 18:12:15 +03:00
af5cfe6553 Web: Rename translation file on 'en' 2022-08-01 18:03:27 +03:00
ebc6ce1d67 Web: Commented console logs 2022-08-01 17:53:26 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
fd21ad788c Web: Portal-Settings: Hide security/admins 2022-08-01 14:53:26 +03:00
3ed5ca8706 Web: Fix old url to /filter 2022-08-01 14:52:18 +03:00
fa04e92286 Web: Added TODO: Change url by category 2022-08-01 13:30:26 +03:00
ec70758d79 Web: Fix some old urls to /filter 2022-08-01 13:29:27 +03:00
d0289756ec Web: Changed routing by new categoryType 2022-07-31 20:14:28 +03:00
359c160ac1 Web: Refactoring routes urls 2022-07-31 13:52:35 +03:00
d0637936cb Web: Fix translation getDefaultFileName() 2022-07-31 13:13:16 +03:00
e0856c1503 Web: bootstrap: Commented registerSW 2022-07-31 12:53:20 +03:00
9890724990 Web: Accounts: Fix loaders 2022-07-31 12:52:53 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
4c097607f9 Web: Fix position of MainButton with logo and display logo 2022-07-29 10:17:41 +03:00
211ac2666f Web: Fix error on user equals null 2022-07-28 19:11:48 +03:00
027b23ba92 Web: Added toast 2022-07-28 19:10:58 +03:00
98645969b6 Web: Moved some files from past locations 2022-07-28 19:10:36 +03:00
c1ab8edaaf Merge branch 'develop' into refactoring/client 2022-07-28 18:32:32 +03:00
a87497a385 Web: Moved src/components/pages/* to src/pages + Added new aliases SRD_DIR, PACKAGE and fix paths + Renamed /settings to /portal-settings 2022-07-28 17:34:27 +03:00
256c2de843 Web: Removed modules dependencies and People and Files mobx providers 2022-07-28 16:11:55 +03:00
53737a06e8 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/editor/src/client/components/DynamicComponent.js
#	packages/editor/src/client/components/Editor.js
#	packages/editor/src/client/components/SelectFileDialog.js
#	packages/editor/src/client/components/SelectFolderDialog.js
#	packages/editor/src/client/components/SharingDialog.js
#	packages/editor/src/client/helpers/utils.js
#	packages/editor/src/client/helpers/withDialogs.js
#	packages/editor/src/server/lib/helpers/index.js
2022-07-28 10:38:29 +03:00
09c19fdcb9 Web:Components:Added CalendarTheme. 2022-07-27 19:19:04 +03:00
af10ec18d2 Web:Common:Added IconWrapperTheme, CalendarTheme. 2022-07-27 19:18:21 +03:00
0f2564afbc Web:Common:Added FilterBlockItemTagTheme. 2022-07-27 16:45:18 +03:00
cd85409a1f Web:Components:Added MainButtonMobileTheme. 2022-07-27 15:07:04 +03:00
d77b0fde43 Web:Common:Added IndicatorFilterButtonTheme. 2022-07-27 15:06:42 +03:00
5141e39d7b Web:Common:Added MainButtonMobileTheme, IndicatorFilterButtonTheme. 2022-07-27 15:06:01 +03:00
0e0cc87aba Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2022-07-26 19:02:17 +03:00
c5baa8834d Web: Fix 'Accounts' imports, routes and includes 2022-07-26 12:51:52 +03:00
Artem Tarasov
045c00b4ff Web: Common/Doceditor: fixed name of init state of editor 2022-07-26 10:56:25 +03:00
e41c2f9333 Web:Common:Added theme changer for Badges. 2022-07-26 10:39:23 +03:00
59a4b07ff3 Web:Common:Fix. 2022-07-26 10:38:09 +03:00
0ebd28f299 Web: Merged 'People' module with 'Client' and fixed paths 2022-07-25 22:19:47 +03:00
a588f4aacc Web:Common:Added theme changer for QuickButtons. 2022-07-25 22:15:33 +03:00
280f702cf9 Merge branch 'develop' into refactoring/client
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	yarn.lock
2022-07-25 21:29:04 +03:00
9da2f25991 Web:Components:Added theme changer for TabContainer. 2022-07-25 20:29:59 +03:00
1af0fa4d51 Web:Common:Added theme changer for TabContainer. 2022-07-25 20:29:20 +03:00
c35a5b50b9 Web:Components:Added theme changer for SubmenuTextTheme, SubmenuItemLabelTheme, ToggleButtonTheme. 2022-07-25 18:49:26 +03:00
a476bbe9f8 Web:Common:Added theme changer for SubmenuTextTheme, SubmenuItemLabelTheme, ToggleButtonTheme. 2022-07-25 18:48:32 +03:00
Artem Tarasov
42c42f19eb Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 18:05:08 +03:00
Artem Tarasov
64305a3c2c Web: Common/Doceditor: fixed request of build version and custom scheme 2022-07-25 17:10:38 +03:00
9062431197 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 17:02:18 +03:00
0b706db9ff Web: Common: Article: add margin 2022-07-25 16:47:04 +03:00
Artem Tarasov
e701def2d7 Web: Common/Doceditor: fixed portal settings request 2022-07-25 16:24:10 +03:00
Artem Tarasov
ba40abd43e Web: Common/Doceditor: fixed user request when initializing auth state 2022-07-25 16:14:24 +03:00
ee5a326bc8 Web: Common: Article: fix scroll position 2022-07-25 15:53:04 +03:00
ea79763079 Web: Common: Article: fix style 2022-07-25 11:42:40 +03:00
0425c79018 Web:Common:Delete className. 2022-07-25 10:41:55 +03:00
2eaa0940d9 Web:Components:Delete className. 2022-07-25 10:41:44 +03:00
3958ef0173 Web:Components:Added theme changer for CatalogItem. 2022-07-25 10:40:03 +03:00
f9640a400c Web: Moved 'People' images and translations to 'Client' 2022-07-25 10:29:16 +03:00
66e2f28c8c Web:Components:Added theme changer for buttons, badges, main-button. 2022-07-24 21:11:11 +03:00
dd4dc6cb55 Web:Common:Added component ColorTheme. 2022-07-24 21:10:56 +03:00
7684fe7632 Web: Added 'Accounts' routing 2022-07-24 20:38:41 +03:00
c83811576c Web: Fix files-settings routing 2022-07-24 20:17:45 +03:00
7db4dcd407 Web: Client: Added missing code 2022-07-24 20:03:48 +03:00
c956d8b696 Web: Merged 'Files' module with 'Client' and fixed paths 2022-07-24 19:57:03 +03:00
2e5f2cb7a6 Web: Components: Themes: fix padding 2022-07-23 01:39:54 +03:00
a0f3e18b91 Web: Common: Article: fix style 2022-07-23 01:27:22 +03:00
79296c742f Web: Common: Article: fix header jump 2022-07-23 01:23:25 +03:00
6786fd40b0 Web: Common: Article: fix desktop width 2022-07-23 01:20:19 +03:00
3735ca16b3 Web: Common: Article: fix jumping 2022-07-23 00:53:40 +03:00
e7252c4bc4 Web: Moved all clients app to packages directory 2022-07-22 22:01:25 +03:00
44c65ee52c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
#	web/ASC.Web.Client/src/store/index.js
2022-07-22 19:04:35 +03:00
1d10263162
Merge branch 'develop' into feature/remove-header 2022-07-22 18:59:13 +03:00
58626a8b4f Web: Components: HelpButton: fix icon 2022-07-22 18:13:17 +03:00
6dcac0eb0d Web: Components: Themes: fix color 2022-07-22 18:04:54 +03:00
4ce9acce3d Merge branch 'develop' into feature/sso
# Conflicts:
#	products/ASC.Files/Server/DocStore
2022-07-22 17:23:36 +03:00
bf1ce10736 Web: Common: Article: fix styles 2022-07-22 16:20:01 +03:00
5479b3452b Web: Common: Article: fix style 2022-07-22 13:50:57 +03:00
b8e7eb9752 Web: Common: Article: fix area click 2022-07-22 13:43:27 +03:00
93d7221388 Web: Components: IconButton: add height 2022-07-22 13:43:11 +03:00
23d6cb773e Web: Common: Article: fix styles 2022-07-22 13:29:22 +03:00
12e7d4edbf Merge branch 'develop' into feature/settings-common 2022-07-22 13:22:59 +03:00
20d83a0059 Web: Common: Article: fix username 2022-07-22 12:53:02 +03:00
9eec30a707 Web:Common:Added methods getAppearanceTheme, sendAppearanceTheme. 2022-07-22 11:11:27 +03:00
af85268ff1 Web: Common: Article: fix styles 2022-07-22 10:55:26 +03:00
180aa03d95 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-22 10:22:52 +03:00
TimofeyBoyko
9e3eb3c008 Web:Common:FilterInput: fix multy line of selected items 2022-07-22 05:37:17 +03:00
c15ca79dcb Web: Common: Article: fix styles 2022-07-21 18:40:45 +03:00
Artem Tarasov
284f0ef58d Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo 2022-07-21 18:05:23 +03:00
a288d72db2 Web: Common: Article: increase area click 2022-07-21 17:45:46 +03:00
afdd1b7908 Web: Components: ContextMenuButton: add iconClassName prop 2022-07-21 17:44:13 +03:00
459cc8d92e Web: Common: Article: truncate long text 2022-07-21 17:10:30 +03:00
bdb3860b54 Web: Common: Article: add redirect to home page 2022-07-21 16:51:19 +03:00
07d8339b6a Web: Common: Article: fix styles 2022-07-21 16:41:12 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
ff04dcf1f4 Web: Common: Article: hide header on mobile 2022-07-21 14:45:28 +03:00
2fe786769f Web: Common: SettingsStore: fix logo url 2022-07-21 14:43:22 +03:00
831bdc578f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
#	products/ASC.Files/Client/src/Files.jsx
2022-07-21 14:22:28 +03:00
7045bd8540
Merge branch 'develop' into feature/sso 2022-07-21 13:07:36 +03:00
TimofeyBoyko
d742e5529c Web:Components:ContextMenu: delete useless code 2022-07-21 13:00:43 +03:00
TimofeyBoyko
77f8eecf78 Web:Files: fix header of context menu for rooms 2022-07-21 12:01:38 +03:00
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
TimofeyBoyko
1633d0782a Web:Files:TableView: fix view at room folder when info panel is open 2022-07-21 11:24:24 +03:00
TimofeyBoyko
59fb67d3d2 Web:Files:Filter: fix clear filter 2022-07-20 19:10:27 +03:00
TimofeyBoyko
9ca843c26e Web:Common:FilterInput: fix spread operator for changeFilterValue method 2022-07-20 18:51:24 +03:00
TimofeyBoyko
5f7fd97f46 Web:Common:Loaders: remove search block from filter block loader 2022-07-20 18:44:18 +03:00
TimofeyBoyko
1f918c7ee8 Web:Components:MainButtonMobile: fix display for rooms 2022-07-20 17:03:14 +03:00
TimofeyBoyko
66e4f2b12d Web:Api: add withoutTags for rooms filter 2022-07-20 15:20:56 +03:00
TimofeyBoyko
f95d01dc7d Web:Api:Rooms: add withoutMe to rooms filter 2022-07-20 15:11:14 +03:00
366c50bfc4 Web: Common: Article: add logo 2022-07-20 14:58:50 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
68bfe739ca Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header 2022-07-20 14:15:42 +03:00
5b762545a4 Merge branch 'develop' into feature/settings-common 2022-07-20 14:00:11 +03:00
75042eedf0 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
#	packages/asc-web-common/components/Article/styled-article.js
2022-07-20 10:00:32 +03:00
TimofeyBoyko
684e28d188 Web:Components:TableContainer: fix color of icon for group menu items 2022-07-20 08:40:11 +03:00
TimofeyBoyko
0782af817f Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 08:36:31 +03:00
Artem Tarasov
bd4eb87ae8 Web: Common: added export of fonts from the library 2022-07-19 23:11:29 +03:00
9e68c29d4f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
2022-07-19 21:22:18 +03:00
Artem Tarasov
4ddffad7b2 Merge branch 'develop' into feature/doceditor-ssr 2022-07-19 18:22:16 +03:00
66b0e8c303
Merge branch 'develop' into bugfix/tfa 2022-07-19 18:17:22 +03:00
TimofeyBoyko
709b40f338 Web:Components:MainButtonMobile: add withoutButton prop 2022-07-19 16:30:19 +03:00
c6179665a3 Web: Common: Article: open context menu by avatar click on tablet 2022-07-19 16:12:46 +03:00
93418bcac0 Web: Components: ContextMenu: fix 2022-07-19 16:11:54 +03:00
TimofeyBoyko
fd818d148e Web:Common:Api: disable search withSubfolders and searchInContent for rooms 2022-07-19 15:57:14 +03:00
TimofeyBoyko
4614d3fb32 Web:Components:CatalogItem: fix position of badge icon 2022-07-19 15:52:49 +03:00
839d6870f5 Web: Common: Article: fix align avatar 2022-07-19 14:46:31 +03:00
Artem Tarasov
2e52b228fe Web: Common: AdvancedSelector: fixed user selection without existing groups on the portal 2022-07-19 12:06:01 +03:00
TimofeyBoyko
4084d3a250 Web:Common:FilterInput: add loader for filter block 2022-07-19 11:44:34 +03:00
TimofeyBoyko
e84c9e1f79 Web:Common:Loaders: add filter block loader 2022-07-19 11:37:51 +03:00
6e00220796 Web: Common: Article: use profile actions store 2022-07-18 21:47:05 +03:00
TimofeyBoyko
6e67c915db Web:Common:FilterInput: add new filter items for work with options and checkbox 2022-07-18 20:26:15 +03:00
TimofeyBoyko
f15894a7e9 Web:Common:Api: fix searchInContent 2022-07-18 19:34:04 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	.gitignore
2022-07-18 17:05:53 +03:00
81aa52e074 Web: Components: Themes: fix menu header colors 2022-07-18 16:31:40 +03:00
TimofeyBoyko
c3179249ef Web:Common:Api: fix rooms withSubfolder 2022-07-18 16:11:10 +03:00
e645fb8828 Web: Common: Article: fix profile style 2022-07-18 16:00:44 +03:00
afd5bc40f1 Web: Components: add theme 2022-07-18 16:00:14 +03:00
7cc4e482ea Web: Common: Article: add about action 2022-07-18 14:09:29 +03:00
TimofeyBoyko
4319c29da2 Web:Common:FilterInput: add display selected items under the filter row 2022-07-18 13:33:25 +03:00
TimofeyBoyko
8832aece23 Web:Files: move logic from virtual room page to home page 2022-07-16 09:50:32 +03:00