|
|
5954c20c37
|
Web: Translations: Moved all toasts title translations to Common.json
|
2022-09-08 12:10:33 +03:00 |
|
|
|
ced1ef8c8f
|
Web: Translations: Renamed key Culture_en to Culture_en-GB
|
2022-09-06 12:52:19 +03:00 |
|
|
|
0e0fe15e1d
|
Web: Translations: Renamed some Culture_ keys
|
2022-09-06 11:28:25 +03:00 |
|
|
|
46f0ed08f1
|
Web: Renamed locale folders
|
2022-09-06 11:23:00 +03:00 |
|
|
|
7ec5bb131b
|
Web: Renamed flags
|
2022-09-06 11:19:38 +03:00 |
|
|
|
e84ba1ff80
|
Merge branch 'develop' into feature/dns-settings
|
2022-09-02 13:05:58 +03:00 |
|
|
|
3d5447bfa2
|
Web:Added translations for dns.
|
2022-09-02 12:37:00 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
69ecaa8df4
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-29 16:37:58 +03:00 |
|
TimofeyBoyko
|
18466251e8
|
Web: add img for change owner option
|
2022-08-29 12:24:18 +03:00 |
|
TimofeyBoyko
|
937d99249e
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 09:47:42 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
|
|
17e2d0f063
|
Web:Client: Added new icons for settings menu sections.
|
2022-08-26 16:39:24 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
|
|
4ff9b9c74f
|
Web:Added a menu category picture with a notification on the tablet.
|
2022-08-24 17:32:08 +03:00 |
|
|
|
152efe40b9
|
Web:Added a picture of the main button on mobile for previewю
|
2022-08-24 17:31:25 +03:00 |
|
TimofeyBoyko
|
7042dca053
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-23 14:38:45 +03:00 |
|
TimofeyBoyko
|
5dc51e2c32
|
Web:Client:PortalPlugins: add translation keys
|
2022-08-23 14:35:51 +03:00 |
|
|
|
719c213041
|
Web:Added a triangle for the main button.
|
2022-08-23 13:41:34 +03:00 |
|
TimofeyBoyko
|
124a955ef2
|
Web:Client:Accounts: add info-panel for user
|
2022-08-22 10:05:44 +03:00 |
|
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
|
|
76e9125e86
|
Web:Client:Added translations "Color","Preview","Standard".
|
2022-08-18 12:01:44 +03:00 |
|
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
TimofeyBoyko
|
d371d865a8
|
Web: add new translation key 'Room'
|
2022-08-17 11:06:44 +03:00 |
|
TimofeyBoyko
|
17ffdff16f
|
Web:Public: add new translation key 'Invite' for en locale
|
2022-08-16 18:45:11 +03:00 |
|
TimofeyBoyko
|
f5e6f97f52
|
Web:Public: add new translation key 'Paid' for en locale
|
2022-08-16 18:34:27 +03:00 |
|
TimofeyBoyko
|
74c2180584
|
Web:Client:Accounts: update empty screen
|
2022-08-15 18:07:50 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
TimofeyBoyko
|
13c36ac4f3
|
Web:Client:MainButton: add invite actions to main button for accounts page
|
2022-08-15 15:56:52 +03:00 |
|
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
|
2aed8eb3a0
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# packages/asc-web-components/index.js
# packages/client/src/DocspaceLogo/index.js
# packages/client/src/pages/Confirm/ConfirmWrapper.js
# packages/components/form-wrapper/index.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/StyledLogin.js
|
2022-08-10 16:16:43 +03:00 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
|
|
28e0d02b28
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-06 23:12:39 +03:00 |
|
|
|
8c234ee0aa
|
SSO: fix forbidden image
|
2022-08-05 18:04:30 +03:00 |
|
|
|
6725d7c203
|
Web: Integration: Fixed parsing property from script url
|
2022-08-05 17:03:04 +03:00 |
|
|
|
be3fc664ca
|
Web: Integration: Fixed methods names: getItems -> getList, setItemsView -> setListView. Changed openCrateFileModal, openCrateFolderModal, openCrateRoomModal to openModal(type, options)
|
2022-08-05 15:02:49 +03:00 |
|
|
|
bbfcbd6955
|
Web: Integration: Fixed getting default config from url. Fixed access at private property on destroyFrame method
|
2022-08-05 13:49:37 +03:00 |
|
|
|
0e489f8113
|
Web: Integration: Fixed var
|
2022-08-05 12:51:40 +03:00 |
|
|
|
1ca4e85c0a
|
Web: Integration: Added "mode" option to frame config
|
2022-08-05 12:50:53 +03:00 |
|
|
|
3981f6e5e9
|
Web: Integration: Rewritten API for integrating DocSpace into ES6 class. Change script name from "ds-api" to "api"
|
2022-08-04 13:28:07 +03:00 |
|
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
|
|
f0d949339f
|
Web: Integration: Fixed method name
|
2022-08-02 14:22:04 +03:00 |
|
|
|
a2ab770725
|
Web: Integration: Added setItemsView method
|
2022-08-01 16:29:30 +03:00 |
|
|
|
78436e9f27
|
Web: Integration: Added reloading on change iframe options with setConfig
|
2022-08-01 16:19:26 +03:00 |
|
|
|
0afd521b43
|
Web: Files: Added IntegrationStore. Added method handleMessage. Added openCrateFileModal, openCrateFolderModal, openCrateRoomModal, createFile, createFolder, createRoom message events
|
2022-08-01 14:49:46 +03:00 |
|
mushka
|
f2112365b8
|
Merge branch 'develop' into feature/create-room
|
2022-08-01 09:59:21 +03:00 |
|
