|
|
3de884d0f9
|
Merge branch 'develop' into feature/integration-system
|
2022-08-05 11:12:32 +03:00 |
|
|
|
3ac5550727
|
SSO: fix style
|
2022-08-05 10:30:27 +03:00 |
|
|
|
0cdbaa4a83
|
SSO: fix style
|
2022-08-05 03:26:50 +03:00 |
|
|
|
077daa7d1d
|
Components: Themes: fix
|
2022-08-05 03:26:28 +03:00 |
|
|
|
e47e8ed4c1
|
SSO: fix padding
|
2022-08-05 03:07:41 +03:00 |
|
|
|
c7b0b4addd
|
Components: HelpButton: fix size
|
2022-08-05 03:07:29 +03:00 |
|
|
|
bf90c710be
|
Components: Submenu: fix style
|
2022-08-05 02:54:39 +03:00 |
|
|
|
9101f90f18
|
SSO: fix modal style
|
2022-08-05 02:44:05 +03:00 |
|
|
|
a254ced4c3
|
SSO: fix table style
|
2022-08-05 01:43:23 +03:00 |
|
|
|
db75f31e28
|
SSO: add help btn
|
2022-08-05 01:43:07 +03:00 |
|
|
|
c09751c8a0
|
SSO: fix icon
|
2022-08-05 00:59:28 +03:00 |
|
|
|
746d5f3795
|
SSO: add copy link
|
2022-08-05 00:59:16 +03:00 |
|
|
|
acbcd337f6
|
Components: InputBlock: fix icon
|
2022-08-05 00:58:50 +03:00 |
|
|
|
fa9f50d1b7
|
Web: Fix many keys translation issues (prefix Home -> Files)
|
2022-08-04 18:35:32 +03:00 |
|
|
|
1230674026
|
Web: Fix 'ContainsSpecCharacter' key translation
|
2022-08-04 18:31:27 +03:00 |
|
|
|
33220f701b
|
Web: Fix 'NewRoom' key translation
|
2022-08-04 18:29:45 +03:00 |
|
|
|
9215ec53fc
|
Web: Fix 'EmptyFolderHeader' key translation
|
2022-08-04 18:27:41 +03:00 |
|
|
|
1b5ae746ac
|
Web: Fix 'FileRemoved' key translation
|
2022-08-04 18:26:17 +03:00 |
|
|
|
b28915462b
|
Web: Fix login and logout
|
2022-08-04 18:23:19 +03:00 |
|
|
|
7741d235f7
|
Web: Optimization of store
|
2022-08-04 17:34:53 +03:00 |
|
mushka
|
65e9cd6cac
|
separated createRoom and createRoomInThirdparty
|
2022-08-04 15:10:33 +03:00 |
|
|
|
b0039e6c4f
|
SSO: fix styles
|
2022-08-04 14:43:12 +03:00 |
|
|
|
cf0e9e05a1
|
SSO: fix translate
|
2022-08-04 14:42:59 +03:00 |
|
|
|
1926a9c4b3
|
Client: PortalSettings: Fixed integration api script path
|
2022-08-04 13:32:19 +03:00 |
|
|
|
ffd01f52c2
|
Common: SettingsStore: Removed base integration frame config
|
2022-08-04 13:31:35 +03:00 |
|
|
|
87909ca9ed
|
Client: Home: Added base integration frame init after load client inside frame
|
2022-08-04 13:30:42 +03:00 |
|
|
|
11098da084
|
Common: Utils: Added methods for interacting with integration frame: frameCallbackData, frameCallCommand
|
2022-08-04 13:29:42 +03:00 |
|
mushka
|
d0182d7aad
|
created new IconEditorComponent
|
2022-08-04 13:28:54 +03:00 |
|
|
|
c879c78dd5
|
SSO: fix set action
|
2022-08-04 12:52:00 +03:00 |
|
|
|
f7b24248da
|
Section: fix settings style
|
2022-08-04 01:36:19 +03:00 |
|
|
|
8767e532b7
|
SSO: fix style
|
2022-08-04 01:36:02 +03:00 |
|
mushka
|
24f26491d8
|
commented out help button in roomType
|
2022-08-03 16:41:00 +03:00 |
|
mushka
|
8fddde9d7c
|
fixed translation import
|
2022-08-03 16:37:45 +03:00 |
|
mushka
|
8c289c66ec
|
deleted unused console.log
|
2022-08-03 16:37:30 +03:00 |
|
mushka
|
28a95c269f
|
removed default tags interation from editRoom
|
2022-08-03 16:37:10 +03:00 |
|
mushka
|
050cd9fc84
|
fixed default tags names
|
2022-08-03 16:36:31 +03:00 |
|
mushka
|
4272c1f661
|
small stranslation fix
|
2022-08-03 16:34:14 +03:00 |
|
mushka
|
57e76d78e1
|
secondaryInfoButton fix position
|
2022-08-03 14:56:43 +03:00 |
|
mushka
|
b1b5b87871
|
implemented new translation keys
|
2022-08-03 14:56:26 +03:00 |
|
mushka
|
507979d9cc
|
added translation keys for storageLocation and MakePrivate secondary infos
|
2022-08-03 14:55:59 +03:00 |
|
|
|
ed67603126
|
Web: SSO: Fix setFields by api response config
|
2022-08-03 14:52:13 +03:00 |
|
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
mushka
|
50c6a82c8c
|
added translation keys for room types
|
2022-08-03 14:47:30 +03:00 |
|
mushka
|
766082b505
|
removed unused styles
|
2022-08-03 14:47:06 +03:00 |
|
mushka
|
29160a6cbc
|
impemented new SecondaryInfoButtonComponent
|
2022-08-03 14:46:55 +03:00 |
|
mushka
|
a373d0dcc8
|
created own component for help button
|
2022-08-03 14:42:49 +03:00 |
|
mushka
|
1e10e329d9
|
added ability to pass props directly to tooltip through help-button
|
2022-08-03 14:28:00 +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 |
|
mushka
|
1d8d7e9a6e
|
appserver to docspace import fix
|
2022-08-02 14:55:51 +03:00 |
|
mushka
|
03f1f0c8cc
|
fix dialog exporting after merge
|
2022-08-02 14:54:59 +03:00 |
|
mushka
|
449c848445
|
fixes after develop merge
|
2022-08-02 14:12:16 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +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 |
|
mushka
|
a418d7d42d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-02 12:18:06 +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 |
|
mushka
|
f2112365b8
|
Merge branch 'develop' into feature/create-room
|
2022-08-01 09:59:21 +03:00 |
|
mushka
|
6823957d47
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-01 09:57:22 +03:00 |
|
mushka
|
8ae3d46e24
|
modal dialog tweaks and fixes
|
2022-08-01 09:52:48 +03:00 |
|
mushka
|
97c83a1d30
|
added api calls for room editing
|
2022-08-01 09:51:55 +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 |
|
|
|
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 |
|
|
|
c23df6273e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-confirm-redesign
|
2022-07-26 17:48:35 +03:00 |
|
|
|
53a4e15b52
|
Web: Components: FormWrapper: fix style
|
2022-07-26 13:22:01 +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 |
|
|
|
0ebd28f299
|
Web: Merged 'People' module with 'Client' and fixed paths
|
2022-07-25 22:19:47 +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 |
|
|
|
94cb5b0a18
|
Web: Components: init form wrapper
|
2022-07-25 19:27:34 +03:00 |
|
|
|
82a58efebd
|
Web: Common: add class with-background-pattern
|
2022-07-25 18:28:23 +03:00 |
|
mushka
|
30d2b47fb0
|
added createTag and addTagsToRoom api calls
|
2022-07-25 18:14:16 +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 |
|
|
|
f9640a400c
|
Web: Moved 'People' images and translations to 'Client'
|
2022-07-25 10:29:16 +03:00 |
|
mushka
|
f0c30dbc5c
|
fixes on drop-down component
|
2022-07-24 23:42:10 +03:00 |
|
mushka
|
4866fb8070
|
added interaction with height and heightTablet props for DropDown
|
2022-07-24 21:06:18 +03:00 |
|
mushka
|
5575789062
|
new props for DropdownItem: hight and heightTablet
|
2022-07-24 21:05:14 +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 |
|
mushka
|
42a2ce2292
|
Merge branch 'develop' into feature/create-room
|
2022-07-24 19:03:23 +03:00 |
|
mushka
|
2b119c35b7
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-07-24 19:00:28 +03:00 |
|
mushka
|
93390a86ef
|
fixes on dropdown component
|
2022-07-24 18:55:07 +03:00 |
|
mushka
|
11713f5b82
|
added ability to lock scroll on modal
|
2022-07-23 02:05:17 +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 |
|
mushka
|
003dc33ba8
|
Merge branch 'develop' into feature/create-room
|
2022-07-22 14:35:47 +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 |
|
mushka
|
dba0fa32c7
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-07-22 13:40:56 +03:00 |
|
|
|
23d6cb773e
|
Web: Common: Article: fix styles
|
2022-07-22 13:29:22 +03:00 |
|
|
|
20d83a0059
|
Web: Common: Article: fix username
|
2022-07-22 12:53:02 +03:00 |
|
mushka
|
07e6ccbcf7
|
overall fixes and Image editor tryouts
|
2022-07-22 12:31:26 +03:00 |
|
mushka
|
bf4f2d5bad
|
add ThirpartyComboBox
|
2022-07-22 12:30:53 +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 |
|
