|
|
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 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +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 |
|
|
|
30532d76ca
|
Merge branch 'develop' into feature/integration-system
|
2022-07-29 17:37:58 +03:00 |
|
|
|
583d445cc7
|
Web: Integration: Added post message bus. Fixed config. Added methods: getConfig, getFolderInfo, getUserInfo, getSelection, getFiles, getFolders, getItems, setConfig, createItem, createRoom.
|
2022-07-29 17:12:31 +03:00 |
|
mushka
|
d9fb015eb5
|
added Tags and NoTags keys to Common translation
|
2022-07-26 20:34:05 +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 |
|
|
|
721e442374
|
Web:Studio:Add BreakpointWarning component.
|
2022-07-26 18:08:00 +03:00 |
|
|
|
c23df6273e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-confirm-redesign
|
2022-07-26 17:48:35 +03:00 |
|
|
|
efce20d64f
|
Merge branch 'develop' into feature/integration-system
|
2022-07-26 12:13:21 +03:00 |
|
|
|
8e888b5191
|
Web: add background pattern image
|
2022-07-25 18:07:04 +03:00 |
|
Artem Tarasov
|
eb352fd860
|
Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json.
|
2022-07-25 17:54:51 +03:00 |
|
|
|
3fd8aa98fb
|
Web: fix merge
|
2022-07-22 19:19:03 +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 |
|
|
|
0275052613
|
Web: change icon
|
2022-07-22 18:12:58 +03:00 |
|
|
|
4ce9acce3d
|
Merge branch 'develop' into feature/sso
# Conflicts:
# products/ASC.Files/Server/DocStore
|
2022-07-22 17:23:36 +03:00 |
|
|
|
aa6b674721
|
Web: change icon
|
2022-07-22 13:42:49 +03:00 |
|
|
|
12e7d4edbf
|
Merge branch 'develop' into feature/settings-common
|
2022-07-22 13:22:59 +03:00 |
|
|
|
5e9a76a0fa
|
Web: add logo
|
2022-07-21 17:08:41 +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 |
|
TimofeyBoyko
|
5a4e9f5ad1
|
Web: fix OtherLabel translation key
|
2022-07-20 15:12:51 +03:00 |
|
|
|
6cfeb9299d
|
Web: add new logo
|
2022-07-20 14:58:20 +03:00 |
|
|
|
472ed56a05
|
Web: add locales
|
2022-07-20 12:27:04 +03:00 |
|
|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
TimofeyBoyko
|
3f8502ab8b
|
Web:Files: add new translation keys for rooms
|
2022-07-19 18:39:44 +03:00 |
|
TimofeyBoyko
|
757856ee9b
|
Web: update icons for catalog items
|
2022-07-19 15:47:52 +03:00 |
|
|
|
57c6389d07
|
Web: add icons
|
2022-07-19 14:04:04 +03:00 |
|
mushka
|
f77d424526
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-07-18 14:58:18 +03:00 |
|
|
|
c1f0af9fd7
|
Web: Integration: Added methods initFrame and getConfig. Fixed config merging when passing it directly to initFrame method. Remove post messages events
|
2022-07-14 11:34:50 +03:00 |
|
|
|
a65a557525
|
Web:Adding a plus image to add a theme.
|
2022-07-13 12:33:21 +03:00 |
|
|
|
ee761e6811
|
Web: add icons
|
2022-07-11 23:10:20 +03:00 |
|
|
|
81a62b4b2a
|
Merge branch 'develop' into feature/integration-system
|
2022-07-11 13:12:25 +03:00 |
|
TimofeyBoyko
|
c8feb7899b
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-08 12:32:26 +03:00 |
|
|
|
e5f56f6855
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-07-07 18:12:26 +03:00 |
|
|
|
ed45bb0118
|
Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect'
|
2022-07-05 16:58:05 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
5dbc9050b9
|
Merge branch 'develop' into feature/integration-system
|
2022-07-04 09:33:40 +03:00 |
|
|
|
9cf4dc70b7
|
Web: add arrow icon
|
2022-07-04 06:17:31 +03:00 |
|
|
|
b54e47a10e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-07-01 13:37:47 +03:00 |
|
TimofeyBoyko
|
ed8b06f88c
|
Web: fix conflicts after merge
|
2022-07-01 11:10:33 +03:00 |
|
TimofeyBoyko
|
3e07ef1efc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-07-01 10:09:47 +03:00 |
|
|
|
5a53d29388
|
Web: Script: Integration: Added filter property
|
2022-06-30 16:12:56 +03:00 |
|
|
|
f56a40435e
|
Web: add missed icons
|
2022-06-30 11:34:54 +03:00 |
|
|
|
6b2f643441
|
Fix Bug 57852: add flags for languages combo
|
2022-06-30 11:25:20 +03:00 |
|
|
|
33e2b2eccd
|
Web: move SelectFile translate to Common
|
2022-06-28 17:19:40 +03:00 |
|
|
|
08090ea3b4
|
Web: Icons: Fixed icon bundle for items menu and folders menu
|
2022-06-28 15:39:31 +03:00 |
|
TimofeyBoyko
|
247d64e0da
|
Web: add images for person, pin and info context menu items
|
2022-06-27 17:18:26 +03:00 |
|
|
|
33831e560b
|
Web: Integration: Small fixes for post message system
|
2022-06-24 13:12:10 +03:00 |
|
|
|
9408a5a296
|
Web: Files: Added and applied new "ErrorInternalServer" translation key to Common.json
|
2022-06-23 15:34:52 +03:00 |
|
|
|
b5eb6420b0
|
Revert "Web: moved Error404Text translation to common"
This reverts commit 687951c921.
|
2022-06-23 15:15:49 +03:00 |
|
TimofeyBoyko
|
54b3ce8c37
|
Web: fix catalog accounts icon name
|
2022-06-22 16:24:37 +03:00 |
|
TimofeyBoyko
|
97dca619a2
|
Web: update icons for article
|
2022-06-22 12:31:47 +03:00 |
|
|
|
7189a99583
|
Merge branch 'feature/download-dialog' of https://github.com/ONLYOFFICE/AppServer into feature/download-dialog
|
2022-06-22 11:36:35 +03:00 |
|
TimofeyBoyko
|
36835eea13
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-22 11:17:05 +03:00 |
|
|
|
fd66155bac
|
Web: Integration: Added setting integration frame options at local storage
|
2022-06-21 14:38:27 +03:00 |
|
|
|
d5c86203d2
|
Web:Added a checkmark image to select a theme.
|
2022-06-21 13:20:34 +03:00 |
|
|
|
687951c921
|
Web: moved Error404Text translation to common
|
2022-06-20 17:49:59 +03:00 |
|
|
|
b22e3da0dc
|
Merge branch 'develop' into feature/integration-system
|
2022-06-20 13:27:01 +03:00 |
|
|
|
47f2138571
|
Web:Added pin and plus icons for theme preview.
|
2022-06-17 16:10:55 +03:00 |
|
|
|
d6ebb514c8
|
Web: Setting: Integration: Added message check on creating frame
|
2022-06-16 17:00:32 +03:00 |
|
|
|
d9a18c2c87
|
Web: Setting: Integration: Fixed initialization, added binding message events
|
2022-06-16 16:31:27 +03:00 |
|
mushka
|
164b44da70
|
finished History tab, changed structure for Details
|
2022-06-16 15:59:58 +03:00 |
|
|
|
8d44310f58
|
Web: Setting: Integration: Added new parameters at frame configuration
|
2022-06-16 13:25:09 +03:00 |
|
|
|
2828c3bb58
|
Web: Integration: Script: Added filter block to default config
|
2022-06-15 17:49:49 +03:00 |
|
mushka
|
d207dfc73f
|
Merge branch 'release/v1.2' into feature/doc-space-info-panel
|
2022-06-15 15:32:49 +03:00 |
|
|
|
2b88f8ac71
|
Web: Integration: Added base api for creating integration iframe component
|
2022-06-15 12:52:46 +03:00 |
|
TimofeyBoyko
|
24a204b076
|
Web: add new tag and rooms images
|
2022-06-14 16:30:17 +03:00 |
|
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +03:00 |
|
mushka
|
d2f3fd0846
|
Merge branch 'release/v1.2' into feature/doc-space-info-panel
|
2022-06-09 12:48:35 +03:00 |
|
mushka
|
2463e3cfc3
|
updated Avatar component for it to also display provided SVGs and filled its Storybook
|
2022-06-08 17:37:58 +03:00 |
|
TimofeyBoyko
|
c0084cb7dc
|
Web:Files/Components: add new images for virtual rooms page
|
2022-06-08 16:17:46 +03:00 |
|
mushka
|
0b6f5deac2
|
added new icons: person+ and email+
|
2022-06-08 15:12:24 +03:00 |
|
|
|
28d6380022
|
update lo
|
2022-06-02 17:04:12 +03:00 |
|
|
|
b59f5de9a7
|
edit translations
|
2022-06-02 13:21:57 +03:00 |
|
|
|
caefff72c4
|
Web: Return translations.
|
2022-06-01 18:35:30 +03:00 |
|
|
|
6c04530f20
|
Web: Files: Delete useless translation.
|
2022-06-01 16:19:59 +03:00 |
|
|
|
219366b3f6
|
Web: Moved translations to Common.
|
2022-06-01 15:56:50 +03:00 |
|
|
|
78ae5b38d2
|
edit translations
|
2022-05-31 18:37:22 +03:00 |
|
|
|
9e1a2e3cb8
|
Edit culture names in Common.json
|
2022-05-30 15:20:08 +03:00 |
|
|
|
881a70a540
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:58:43 +03:00 |
|
|
|
45c01ca7d9
|
Web: Client: Fixed manifest.json for apply new icons
|
2022-05-27 14:56:16 +03:00 |
|
|
|
41ea4cd4af
|
Web: Client: Added new icons for browser shortcuts
|
2022-05-27 14:55:04 +03:00 |
|
|
|
6248fe1981
|
edit translations
|
2022-05-27 14:08:52 +03:00 |
|
|
|
b907c456bb
|
edit translations
|
2022-05-26 19:22:02 +03:00 |
|
|
|
1642deb34c
|
edit translations
|
2022-05-26 13:17:14 +03:00 |
|
|
|
b13fd240ad
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 18:11:50 +03:00 |
|
|
|
8612f14060
|
Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest
|
2022-05-25 18:01:38 +03:00 |
|
|
|
130a7d01d6
|
edit translations
|
2022-05-25 17:52:26 +03:00 |
|
|
|
3982d38a5b
|
edit translations
|
2022-05-24 16:01:46 +03:00 |
|
|
|
3e373c1e14
|
edit translations
|
2022-05-24 14:56:08 +03:00 |
|
|
|
8d3921eae9
|
Web: Translations: Removed keys: TitleDocuments, TitleSubfolders, More (UselessTranslationKeysTest issues fix)
|
2022-05-23 20:25:42 +03:00 |
|
|
|
8c5a4cc14c
|
edit ru
|
2022-05-23 18:21:55 +03:00 |
|
|
|
a2991c008c
|
edit translations (SpellCheck)
|
2022-05-23 18:06:43 +03:00 |
|
|
|
9903f4c439
|
update cs, edit translations (spellCheck)
|
2022-05-23 10:55:02 +03:00 |
|
|
|
9d1af6d3da
|
update translations
|
2022-05-22 00:38:14 +03:00 |
|
|
|
6bc4035313
|
update translations
|
2022-05-21 15:25:14 +03:00 |
|
|
|
197c09e4b3
|
Web: add Content translate
|
2022-05-20 16:39:41 +03:00 |
|
|
|
e3c441c7bd
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-20 15:57:43 +03:00 |
|
|
|
ab5f692dfc
|
Web: Client: Locales: En: Added "Editing" key
|
2022-05-20 15:56:31 +03:00 |
|
|
|
53dbf47c9d
|
Web: add Attention translate
|
2022-05-20 15:54:21 +03:00 |
|
|
|
cb0879da10
|
update, edit translations
|
2022-05-20 13:48:47 +03:00 |
|
|
|
811f8cdb8b
|
edit vi (common)
|
2022-05-19 23:41:44 +03:00 |
|
|
|
4541fa82d1
|
update translations (web, people)
|
2022-05-19 23:35:37 +03:00 |
|
|
|
9c6d1ae5df
|
update translations (Login, ConvertPasswordDialog)
|
2022-05-19 20:56:48 +03:00 |
|
|
|
0b4488d4b4
|
Web: change trash catalog icon
|
2022-05-19 19:00:56 +03:00 |
|
|
|
f5c09d94b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# i18next/files.babel
|
2022-05-19 18:56:47 +03:00 |
|
|
|
424c4bb082
|
Update translations (common, files)
|
2022-05-19 18:36:49 +03:00 |
|
|
|
15f4fb324e
|
update it, edit fr
|
2022-05-19 14:34:56 +03:00 |
|
|
|
128021653d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# products/ASC.Files/Client/public/locales/bg/ConnectDialog.json
# products/ASC.Files/Client/public/locales/ro/Article.json
# products/ASC.Files/Client/public/locales/ro/FormGallery.json
# products/ASC.Files/Client/public/locales/ro/Home.json
# products/ASC.Files/Client/public/locales/ro/InfoPanel.json
# products/ASC.Files/Client/public/locales/ro/SelectFolder.json
# products/ASC.Files/Client/public/locales/ro/Settings.json
# products/ASC.Files/Client/public/locales/ro/Translations.json
|
2022-05-18 20:18:32 +03:00 |
|
|
|
b2f6ce39f7
|
Update translations (common, files)
|
2022-05-18 19:54:25 +03:00 |
|
|
|
9fb495817d
|
update translations
|
2022-05-18 18:25:31 +03:00 |
|
|
|
5f4d8b3b4c
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-18 12:58:24 +03:00 |
|
|
|
9180fbe42e
|
update ko
|
2022-05-18 12:58:02 +03:00 |
|
|
|
90d4a68946
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/sl/Settings.json
|
2022-05-18 10:09:44 +03:00 |
|
|
|
9c824a0bfa
|
Update translation - sl
|
2022-05-18 09:59:02 +03:00 |
|
|
|
f6098aea20
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Settings.json
|
2022-05-17 19:57:22 +03:00 |
|
|
|
f1130c51d9
|
update ro
|
2022-05-17 19:54:47 +03:00 |
|
|
|
f466fd2fe4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 18:17:17 +03:00 |
|
|
|
dad9016695
|
Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix)
|
2022-05-17 18:17:11 +03:00 |
|
|
|
2b804d5ef8
|
edit es, fr, zh-CN, ja, de, ru
|
2022-05-17 17:20:59 +03:00 |
|
|
|
2ed7b96dd9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 16:43:15 +03:00 |
|
|
|
cc9d934b13
|
update de, edit en (Confirm)
|
2022-05-17 16:42:54 +03:00 |
|
|
|
43da9f3949
|
Update translation - fi
|
2022-05-17 15:35:03 +03:00 |
|
|
|
4c53f0d4db
|
Merge pull request #661 from ONLYOFFICE/feature/upload-logic-change
Web: Files: added alert badge to main-button, upload logic changed
|
2022-05-17 14:38:38 +03:00 |
|
|
|
be3362dbc3
|
update ja, edit fr, es, zh-CN (Settings)
|
2022-05-17 12:56:56 +03:00 |
|
|
|
606f0bca2a
|
update es (Home), add zh
|
2022-05-16 21:05:58 +03:00 |
|
|
|
41a0f07bfa
|
Web: Files: added alert badge to main-button, upload logic changed
|
2022-05-16 18:03:21 +03:00 |
|
|
|
4264a0da16
|
update fr
|
2022-05-16 17:04:04 +03:00 |
|
|
|
5915c6e23e
|
update es
|
2022-05-16 12:51:04 +03:00 |
|
|
|
93a53092d6
|
Web: Translations: Fix UselessTranslationKeysTest issues
|
2022-05-13 19:33:16 +03:00 |
|
|
|
b3e1014a71
|
Web: Translations: Fix ParseJsonTest issues
|
2022-05-13 14:29:56 +03:00 |
|
|
|
fc846860f9
|
Web: Translations: Moved "AddUsers" key from "Files,People" to "Common" (test issue fix)
|
2022-05-12 14:18:16 +03:00 |
|
|
|
b2474c409d
|
Web: Translations: Moved "Common" key from "Studio" to "Common" and removed useless "Documents" key (test issue fix)
|
2022-05-11 19:03:33 +03:00 |
|
|
|
ca0eb26067
|
Web: Removed already existing translation key from common (test issue fix)
|
2022-05-11 17:58:44 +03:00 |
|
|
|
58b7c5f678
|
Web: Translations: Moved "Location" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:40:23 +03:00 |
|
|
|
b0450cf55b
|
Web: Translations: Moved "Comments" key from "People" to "Common": (test issue fix)
|
2022-05-11 17:25:10 +03:00 |
|
|
|
781b0eb3e4
|
Web: Translations: Moved "Info" key from "studio" to "Common": (test issue fix)
|
2022-05-11 17:11:52 +03:00 |
|
|
|
4ae8a10f7f
|
Web: Translations: Moved "AccessRights" key from "studio" to "Common": (test issue fix)
|
2022-05-11 16:51:37 +03:00 |
|
|
|
e9e2e4e27f
|
Web: added new empty screen icons
|
2022-05-06 19:42:49 +05:00 |
|
|
|
d843c3ee68
|
Web: Added new icons for filter empty screen
|
2022-05-05 20:26:47 +05:00 |
|
|
|
7b391e1cef
|
Web: added filter translation
|
2022-05-05 20:26:09 +05:00 |
|
|
|
2e33c99230
|
Web: Client: Files: Badges: Added medium (16px) icon for form badge. Fixed displaying for form badge
|
2022-04-29 14:52:56 +03:00 |
|
|
|
f86afee2d5
|
Web: move t key from People to Common
|
2022-04-25 21:39:46 +03:00 |
|
|
|
563fd3c778
|
Web: Files: fix context menu icons
|
2022-04-22 13:45:57 +03:00 |
|
|
|
78944a490e
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-21 18:55:41 +03:00 |
|
|
|
2bf6dec41d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2022-04-21 10:53:58 +03:00 |
|
Timofey Boyko
|
216ae27b25
|
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
|
2022-04-20 18:04:57 +03:00 |
|
|
|
04fc13073f
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2022-04-20 15:11:00 +03:00 |
|
|
|
ee931b3098
|
Web: Files: fix share icon
|
2022-04-20 14:55:23 +03:00 |
|
|
|
e82a44d493
|
Merge pull request #617 from ONLYOFFICE/feature/redesign-sharing-panel
Feature/redesign sharing panel
|
2022-04-19 10:36:41 -04:00 |
|
|
|
e8c46ba42c
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2022-04-19 14:04:10 +03:00 |
|
|
|
ebff3a8f80
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-19 13:41:21 +03:00 |
|
|
|
d448691ae3
|
Web: fix view selector icons
|
2022-04-19 12:42:10 +03:00 |
|
Timofey Boyko
|
79a9b4175b
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-19 09:56:59 +03:00 |
|
|
|
1bfd6a959c
|
Web: Files: fixed ConnectedClouds settings
|
2022-04-18 17:05:36 +03:00 |
|
Timofey Boyko
|
1abd712f67
|
Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel
|
2022-04-18 15:21:48 +03:00 |
|
|
|
47ffc849a5
|
Merge branch 'feature/virtual-rooms-1.2' into feature/connected-clouds-redesign
|
2022-04-18 15:05:23 +03:00 |
|
Timofey Boyko
|
ca9e132a67
|
Web: remove key 'DarkMode' in EU and RU locales
|
2022-04-18 12:37:08 +03:00 |
|
|
|
6dbf77317d
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-18 10:32:31 +03:00 |
|
|
|
b9a6c618bc
|
Web: Moved Connect translation, added new translations
|
2022-04-15 16:39:57 +03:00 |
|
Timofey Boyko
|
3194f8810e
|
Web:update image for access operation
|
2022-04-14 11:34:18 +03:00 |
|
|
|
165a5979a3
|
Web: Files: Added new translations.
|
2022-04-13 16:02:27 +03:00 |
|
|
|
35950126cb
|
Web: Files: Added new translations.
|
2022-04-13 15:14:37 +03:00 |
|
|
|
7086c7ebb5
|
Web: Files: Changed empty files page.
|
2022-04-13 10:08:20 +03:00 |
|
Timofey Boyko
|
d2c5cbb0eb
|
Web: update copy.react.svg
|
2022-04-11 18:56:59 +03:00 |
|
|
|
90bf5a7dc2
|
Web: Files: added info panel for OFORMsGallery
|
2022-04-07 16:52:16 +03:00 |
|
Timofey Boyko
|
397ff0d90d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-07 12:10:11 +03:00 |
|
|
|
342c938415
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-07 11:17:57 +03:00 |
|
|
|
aa91c6389c
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
# packages/asc-web-common/components/Section/sub-components/section-container.js
|
2022-04-06 20:36:36 +03:00 |
|
Timofey Boyko
|
9aa24924ad
|
Web: add code.react.svg
|
2022-04-06 15:05:32 +03:00 |
|
|
|
c51741bf94
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-05 10:35:53 +03:00 |
|
|
|
45d2a31d03
|
Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
# public/locales/de/Common.json
|
2022-04-04 19:34:51 +03:00 |
|
|
|
f04d679df4
|
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
|
2022-04-04 18:25:32 +03:00 |
|
Timofey Boyko
|
d812df9332
|
Web: add new key 'DarkMode' for EU and RU locales
|
2022-04-04 13:31:55 +03:00 |
|
|
|
99cdaa0440
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-04-01 15:46:42 +03:00 |
|
|
|
8c782a7903
|
Web: Files: added OFORMs gallery
|
2022-03-31 16:10:16 +03:00 |
|
|
|
8e777afb09
|
Web: change info icon
|
2022-03-30 19:39:09 +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 |
|
|
|
080079c944
|
Web: add avatar images
|
2022-03-29 11:19:35 +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 |
|
|
|
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 |
|
mushka
|
c51d920092
|
vr-1.2 actualization
|
2022-03-21 11:13:56 +03:00 |
|
|
|
6b84d183b8
|
Web: add translates
|
2022-03-17 12:41:57 +03:00 |
|
|
|
b0e22fdac9
|
Web: change password input icons
|
2022-03-16 12:47:44 +03:00 |
|
|
|
89b2f94469
|
Web: add missed translate for de
|
2022-03-16 11:19:44 +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 |
|
|
|
cc293f60c2
|
Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
|
2022-03-15 14:11:00 +03:00 |
|
|
|
de81329df2
|
WEb: Backup: Added help button component.
|
2022-03-15 12:43:02 +03:00 |
|
|
|
a7199bd3d4
|
Web: sort locales by key
|
2022-03-10 23:50:43 +03:00 |
|
|
|
afb0510fd6
|
Web: Moved translations to Common file (az).
|
2022-03-10 17:30:30 +03:00 |
|
|
|
1cb0345483
|
Web: Moved translations to Common file (bg).
|
2022-03-10 17:26:47 +03:00 |
|
|
|
ca45ca77d7
|
Web: Moved translations to Common file (cs).
|
2022-03-10 17:25:20 +03:00 |
|
|
|
685e7e0193
|
Web: Moved translations to Common file (de).
|
2022-03-10 17:18:26 +03:00 |
|
|
|
9a4715fad7
|
Web: Moved translations to Common file (el).
|
2022-03-10 17:10:09 +03:00 |
|
|
|
5d4a54e1ce
|
Web: Moved translations to Common file (en).
|
2022-03-10 16:57:56 +03:00 |
|
|
|
a403bdbf03
|
Web: Moved translations to Common file (es).
|
2022-03-10 16:56:15 +03:00 |
|
|
|
7b5f653ead
|
Web: Moved translations to Common file (fi).
|
2022-03-10 16:54:21 +03:00 |
|
|
|
a94be67b16
|
Web: Moved translations to Common file (fr).
|
2022-03-10 16:52:35 +03:00 |
|
|
|
84f1a05ba3
|
Web: Moved translations to Common file (it).
|
2022-03-10 16:50:04 +03:00 |
|
|
|
9467226e09
|
Web: Moved translations to Common file (ja).
|
2022-03-10 16:48:45 +03:00 |
|
|
|
05da08892d
|
Web: Moved translations to Common file (ko).
|
2022-03-10 16:47:13 +03:00 |
|
|
|
e15108a62c
|
Web: Moved translations to Common file (lo).
|
2022-03-10 16:45:08 +03:00 |
|
|
|
0efd8d1126
|
Web: Moved translations to Common file (lv).
|
2022-03-10 16:43:34 +03:00 |
|
|
|
d2e1f04d8a
|
Web: Moved translations to Common file (nl).
|
2022-03-10 16:41:37 +03:00 |
|
|
|
56b4eece3d
|
Web: Moved translations to Common file (pl).
|
2022-03-10 16:39:54 +03:00 |
|
|
|
4eae2cdb3c
|
Web: Moved translations to Common file (pt).
|
2022-03-10 16:38:25 +03:00 |
|
|
|
34e1f835fe
|
Web: Moved translations to Common file (pt-BR).
|
2022-03-10 16:36:25 +03:00 |
|
|
|
8ba131d52d
|
Web: Moved translations to Common file (ro).
|
2022-03-10 16:33:31 +03:00 |
|
|
|
0c9713c65b
|
Web: Moved translations to Common file (sk).
|
2022-03-10 16:31:02 +03:00 |
|
|
|
bff2518bf9
|
Web: Moved translations to Common file (sl).
|
2022-03-10 16:28:38 +03:00 |
|
|
|
500945a6da
|
Web: Moved translations to Common file (tr).
|
2022-03-10 16:26:11 +03:00 |
|
|
|
e663d59aeb
|
Web: Moved translations to Common file (vi).
|
2022-03-10 16:25:27 +03:00 |
|
|
|
297394f359
|
Web: Moved translations to Common file (uk).
|
2022-03-10 16:24:18 +03:00 |
|
|
|
8080e416df
|
Web: Moved translations to Common file (zh-CN).
|
2022-03-10 16:23:06 +03:00 |
|
|
|
7bca87c34d
|
Web: Moved translations to the Common (ru).
|
2022-03-10 16:21:24 +03:00 |
|
|
|
3bbf82d918
|
add new lines
|
2022-03-09 19:07:24 +03:00 |
|
|
|
b71c2eabc5
|
Web:Added translation for "Title" for locales en, pt-BR, ru, de, fr, it.
|
2022-03-09 12:03:01 +03:00 |
|
|
|
ee446c8e67
|
Web: moved translates to Common
|
2022-03-09 11:04:12 +03:00 |
|
|
|
7ffaee6efc
|
Web: moved translates to Common
|
2022-03-05 14:27:59 +03:00 |
|
mushka
|
384a92c30f
|
finished merging
|
2022-03-04 12:52:34 +03:00 |
|
Timofey Boyko
|
65ccfb896f
|
Web:Files: add new key 'sorting'
|
2022-03-04 10:20:10 +03:00 |
|
mushka
|
424a7a7e3c
|
change code formatting
|
2022-03-03 13:43:43 +03:00 |
|
mushka
|
e77a97e105
|
added checkbox menu interaction and new opening mechanics
|
2022-03-02 17:19:19 +03: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 |
|
mushka
|
518abb7a2f
|
added sever files, fixed closeOnclick interaction, added alternative thumbnail and implemented destructorization
|
2022-02-28 15:53:46 +03:00 |
|
|
|
7907016bde
|
Web: fix after merge
|
2022-02-22 13:55:49 +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 |
|
|
|
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 |
|
|
|
743d0566a3
|
edit de (common)
|
2022-02-17 12:34:35 +03:00 |
|
|
|
3229019aad
|
Web: move LoginButton key to Common
|
2022-02-10 18:01:40 +03:00 |
|
|
|
ef87651b3a
|
Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm"
|
2022-02-10 11:25:00 +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 |
|
|
|
817a155642
|
Web: move ShowMore to Common translate
|
2022-02-08 22:34:21 +03:00 |
|
|
|
b866e5cccc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-02-08 18:17:41 +03:00 |
|
|
|
16f3adcb64
|
Web:Studio:Added the "Automatic time zone" method to the LanguageAndTimeZone component. Added HelpButton for StudioTimeLanguageSettings header.Added an image for the HelpButton component.
|
2022-02-08 17:43:56 +03:00 |
|
Timofey
|
97a23c8524
|
Web: change color to nav.logo.opened.react.svg for all themes
|
2022-02-03 23:47:44 +08:00 |
|
|
|
57ae1bdf00
|
Web: add danger alert icon
|
2022-02-03 16:05:54 +03:00 |
|
|
|
9068af695d
|
Web: add sso translate
|
2022-02-03 01:09:51 +03:00 |
|
|
|
c8f1fc9f03
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
|
2022-02-01 16:53:56 +03:00 |
|
|
|
2cd5e501f7
|
Web: add sso icon
|
2022-01-31 12:32:23 +03:00 |
|
Timofey
|
4b45eaa243
|
Merge branch 'develop' into feature/dark-theme
|
2022-01-27 18:10:13 +08:00 |
|
Dmitry Kulak
|
926f0c6a2e
|
Web: Files: Changed "shared" icon
|
2022-01-26 14:09:43 +03:00 |
|
Timofey
|
021f205c38
|
Web: update catalog.share.react.svg
|
2022-01-24 17:41:29 +08:00 |
|
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
|
34441d6335
|
Web: Moved some translations from Files to COMMON for asc-web-components
|
2022-01-21 11:49:16 +03:00 |
|
Timofey
|
48daf70cd5
|
Web: add new icons for new search
|
2022-01-20 20:04:28 +08:00 |
|
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03:00 |
|
Artem Tarasov
|
3b75038803
|
Merge branch 'develop' into feature/redesign-badges
# Conflicts:
# products/ASC.Files/Client/src/components/Badges.js
# products/ASC.Files/Client/src/components/Icons.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js
# public/images/access.edit.react.svg
|
2021-12-29 15:45:33 +03: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 |
|
|
|
ab931e40ef
|
edit bg, az
|
2021-12-23 11:23:25 +03:00 |
|
|
|
93cbab055c
|
edit lo
|
2021-12-16 15:59:02 +03:00 |
|
|
|
30860f041a
|
add new keys ro, lo, edit keys az
|
2021-12-15 13:56:30 +03:00 |
|
|
|
878df989d9
|
Web: Renamed folder zh_CN to zh-CN
|
2021-12-09 21:51:05 +03:00 |
|
|
|
8538b55dfc
|
Web: Turned on all languages
|
2021-12-09 21:45:10 +03:00 |
|
|
|
8eb1ea7c3b
|
Web:Files:Badges: Added edit icons to appserver /public /images. Changed the display of edit icons.
|
2021-12-07 20:13:57 +03:00 |
|
|
|
20a17fca96
|
rename pt
|
2021-12-07 16:50:09 +03:00 |
|
|
|
f0e1ba5716
|
edit pl
|
2021-12-07 16:36:09 +03:00 |
|
|
|
25472623c5
|
edit ja Common
|
2021-12-07 11:48:32 +03:00 |
|
|
|
e6fe4cd1c0
|
edit az
|
2021-12-07 11:15:37 +03:00 |
|
|
|
4565d32979
|
add vi
|
2021-12-07 10:38:31 +03:00 |
|
|
|
98fa906954
|
Web:Files:Badges: Added favorite icons to appserver /public /images. Сhanged the onClickFavorite method in HOC withBadges. Changed the display of favorite icons.
|
2021-12-06 22:00:50 +03:00 |
|
|
|
58bdddd486
|
add pt_PT
|
2021-12-06 18:23:10 +03:00 |
|
|
|
8378850d92
|
add uk
|
2021-12-06 17:30:16 +03:00 |
|
|
|
1d659a6841
|
add az
|
2021-12-06 17:09:53 +03:00 |
|
|
|
4ac6064578
|
add 'Save as oform'
|
2021-12-06 11:03:52 +03:00 |
|
|
|
d9afc8ff4f
|
Web:Files:Badges: Changed icons of the favorite, edit, lock. Changed the display of lock icons.
|
2021-12-05 16:37:33 +03:00 |
|
|
|
9ea13156cb
|
Web:Files:Badges:SharedButton icon change, resize
|
2021-12-03 12:20:45 +03:00 |
|
|
|
01b46993e3
|
Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0
|
2021-12-02 18:52:10 +03:00 |
|
|
|
857c8f91d3
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-02 18:51:52 +03:00 |
|
|
|
3f114a58d7
|
Web: Locales: Changed translation "Make form" to "Save as oform"
|
2021-12-02 18:51:04 +03:00 |
|
|
|
ed4aca1773
|
add pl
|
2021-12-02 15:56:04 +03:00 |
|
|
|
9ec247e59c
|
update pt-BR
|
2021-12-01 18:18:05 +03:00 |
|
|
|
571400092c
|
add el, bg
|
2021-12-01 17:41:40 +03:00 |
|
|
|
db20e966e2
|
update translations
|
2021-11-30 11:58:46 +03:00 |
|
|
|
b2c123d6f4
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-11-30 11:46:22 +03:00 |
|
|
|
850eb13b0d
|
Merge branch 'release/v1.1.0' into feature/make-form
|
2021-11-29 14:20:02 +03:00 |
|
|
|
4dac8e9ce6
|
Web: Components: changed expander-down.react.svg, fixed styles
|
2021-11-29 13:11:01 +03:00 |
|
|
|
50f985a374
|
update translations
|
2021-11-29 12:12:38 +03:00 |
|
|
|
aed178f0b1
|
Web: updated icons
|
2021-11-29 11:58:27 +03:00 |
|
|
|
22efc180de
|
Web: Added translation for make form action
|
2021-11-26 17:36:55 +03:00 |
|
|
|
45c5562262
|
Web: Added make form icon
|
2021-11-26 17:36:22 +03:00 |
|
|
|
2f21f2246a
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-22 16:39:22 +03:00 |
|
|
|
3bee202d41
|
Web: Files: Replaced translation on common.
|
2021-11-22 14:23:45 +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 |
|
|
|
180ca914ad
|
Web: Files: HOC: Fixed form icon inside context menu
|
2021-11-19 18:08:11 +03:00 |
|
|
|
839d81f356
|
Web: Files: Added "Fill in the form" context menu action from ".ofrom" files
|
2021-11-19 13:25:09 +03:00 |
|
|
|
8a0b29c12b
|
Web: Files: Added '.oform' files edit icon + update access.edit.react.svg
|
2021-11-19 12:57:56 +03:00 |
|
|
|
adbb316dd2
|
Web: moved "Owner" translation to Common
|
2021-11-15 18:33:32 +03:00 |
|
|
|
d6836cc3d3
|
Merge pull request #457 from ONLYOFFICE/feature/translate-1.0.1
Feature/translate 1.0.1
|
2021-11-13 20:04:11 +03:00 |
|
|
|
c7c7267a9a
|
Test: Added new WrongTranslationVariablesTest and fix it's issues
|
2021-11-13 19:03:10 +03:00 |
|
|
|
1c8f091dce
|
Web: Fix DublicatesByContentTest translation issues
|
2021-11-12 20:12:33 +03:00 |
|
|
|
1b6c02352b
|
Web: Fixed icons for docxf and oform file formats
|
2021-11-12 19:20:14 +03:00 |
|
|
|
1e1df5b5c9
|
Web: Fixed icons for docxf and oform file formats
|
2021-11-12 17:17:28 +03:00 |
|
|
|
eb1db9eea6
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 18:15:53 +03:00 |
|
|
|
20e59a7cbe
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-11-02 17:51:44 +03:00 |
|
|
|
aa79ef2c9d
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-02 14:03:26 +03:00 |
|
|
|
3f532f6765
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-02 13:36:34 +05:00 |
|
|
|
d6544c073c
|
Web: Public: added icons
|
2021-11-02 13:31:54 +05:00 |
|
|
|
8cc08045b7
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# 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
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
|
2021-11-01 13:54:40 +03:00 |
|
|
|
fe65632277
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-10-28 14:20:06 +03:00 |
|
|
|
93ab1e46ce
|
Web: Fixed docxf icon container width
|
2021-10-26 19:54:19 +03:00 |
|
|
|
743325984b
|
Web: Fixed docxf icon container width
|
2021-10-26 19:48:41 +03:00 |
|
|
|
f5d31dcff2
|
Web: Files: Fixed icons blur, added new icons
|
2021-10-26 16:55:52 +03:00 |
|
|
|
9128a3d0ff
|
Web: Files: Added docxf and oform format icons
|
2021-10-26 16:55:09 +03:00 |
|
|
|
5bd9c06c1a
|
Merge branch 'develop' into table-group-menu
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-10-22 12:20:20 +03:00 |
|
|
|
26183d14bf
|
Web: add new pencil icon
|
2021-10-20 00:41:05 +03:00 |
|
|
|
f04a1a5403
|
Web: People: fixed table group menu, added new icons
|
2021-10-19 17:36:47 +03:00 |
|
|
|
4bd4954ad4
|
Merge branch 'release/1.0.0' into feature/desktop-login
|
2021-10-19 13:10:47 +03:00 |
|
|
|
9dd28a144d
|
Web: Fixed callback pages, added login callback for desktop client
|
2021-10-19 10:31:34 +03:00 |
|
|
|
0c63c41ef7
|
Web: Files: changed folder icons, added new icons
|
2021-10-18 12:24:01 +03:00 |
|
|
|
fb7922f579
|
Thirdparty: login. Desktop
|
2021-10-15 11:34:34 +03:00 |
|
|
|
ff97e3134f
|
Web: Components: added new icons, created GroupMenuItem component
|
2021-10-14 18:18:08 +03:00 |
|
|
|
678fa4c119
|
Web: Added desktop parameter from url for oAuth login
|
2021-10-14 15:24:13 +03:00 |
|
|
|
e3718c3697
|
Merge branch 'release/1.0.0' into table-group-menu
# Conflicts:
# packages/asc-web-components/table-container/StyledTableContainer.js
|
2021-10-14 13:46:11 +03:00 |
|
|
|
5005e0a6c0
|
Web: Icons: Fixed old checkbox icons, change header plus icon
|
2021-10-14 13:09:54 +03:00 |
|
|
|
2ecf75434e
|
Web: Components: fixed TableGroupMenu styles
|
2021-10-13 17:44:40 +03:00 |
|
|
|
af31f2fb9b
|
Client: thirdparty. Fixed getObjectByLocation
|
2021-10-13 10:29:07 +03:00 |
|
