|
|
f4f5edec05
|
Merge branch 'develop' into feature/webhooks-page
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
|
2023-06-06 01:49:14 +03:00 |
|
Timofey Boyko
|
a4f8687af9
|
Web:Client: add flag to enable or disable image thumbnails
|
2023-06-01 15:05:49 +03:00 |
|
Timofey Boyko
|
6cb8a714b2
|
Merge branch 'develop' into branch feature/image-thumbnail
|
2023-06-01 14:30:06 +03:00 |
|
Vladimir Khvan
|
7619fe03e8
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-31 16:05:47 +05:00 |
|
Vladimir Khvan
|
0dde9188d3
|
existing svg was deleted
|
2023-05-31 16:00:51 +05:00 |
|
Vladimir Khvan
|
67a775cd00
|
empty filter dark image was added
|
2023-05-31 16:00:39 +05:00 |
|
|
|
4214470b2c
|
Merge branch 'develop' into feature/filling-status-line
|
2023-05-30 13:16:26 +04:00 |
|
|
|
fdcac6f4da
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-30 11:56:18 +04:00 |
|
|
|
19e8b2210a
|
Merge branch 'master' into develop
# Conflicts:
# packages/client/src/helpers/constants.js
# packages/client/src/pages/AccountsHome/Section/Filter/index.js
# packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
# packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
# packages/client/src/pages/Home/Section/Header/index.js
# packages/client/src/pages/Home/index.js
# packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
# packages/client/src/store/FilesActionsStore.js
# packages/common/components/Article/sub-components/article-payment-alert.js
# packages/common/components/Section/index.js
# packages/components/floating-button/styled-floating-button.js
# packages/login/src/client/App.tsx
# packages/login/src/client/components/Invalid/index.tsx
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# yarn.lock
|
2023-05-29 14:36:12 +03:00 |
|
|
|
e08f381074
|
Merge branch 'develop' into feature/trash-filter-by-room
|
2023-05-25 15:29:21 +04:00 |
|
Elyor Djalilov
|
b5f0b25515
|
Web: Components: filling-status-line
|
2023-05-25 14:44:37 +05:00 |
|
Mushka Nikita
|
191de3e991
|
added filter by room to trash
|
2023-05-22 12:27:09 +03:00 |
|
|
|
0e047b71b6
|
Merge pull request #1421 from ONLYOFFICE/feature/pdf-viewer
Feature/pdf viewer
|
2023-05-19 18:42:35 +04:00 |
|
|
|
8f1e35b818
|
added translations
|
2023-05-19 17:23:00 +03:00 |
|
Akmal Isomadinov
|
23c409dfaf
|
Web: Added the ability to disable pdf viewer
|
2023-05-19 16:19:06 +05:00 |
|
Akmal Isomadinov
|
95aa19ff03
|
Web: Updated PDF viewer URL
|
2023-05-19 13:01:27 +05:00 |
|
|
|
b1d48db4a5
|
Web:Add locales DescriptionOfTheEveryoneRole, DescriptionOfTheRoleQueue.
|
2023-05-17 16:47:13 +03:00 |
|
Vladimir Khvan
|
d869ef9b0c
|
Merge branch 'develop' into feature/webhooks-page
|
2023-05-17 14:11:26 +05:00 |
|
|
|
0b4439d1cf
|
Web:Add example avatar.
|
2023-05-17 12:09:49 +03:00 |
|
|
|
8700a64afc
|
Web:Add everyone role button image.
|
2023-05-15 22:20:11 +03:00 |
|
|
|
85205659ec
|
Fix UselessModuleTranslationKeysTest issue (key: Copy)
|
2023-05-15 16:34:09 +04:00 |
|
|
|
3d40fdd1e5
|
Fix UselessModuleTranslationKeysTest issue (key: Rename)
|
2023-05-15 16:22:34 +04:00 |
|
|
|
7638c25dc0
|
Fix UselessModuleTranslationKeysTest issue (key: MoveTo)
|
2023-05-15 16:16:15 +04:00 |
|
|
|
db1bcf5fc3
|
Fix UselessModuleTranslationKeysTest issue (key: Authorization)
|
2023-05-15 15:35:09 +04:00 |
|
|
|
3e5b90dcc1
|
added lo
|
2023-05-15 11:54:51 +03:00 |
|
|
|
9a3503b3ef
|
Web:Add AddRoleButton image.
|
2023-05-15 10:43:07 +03:00 |
|
|
|
dbe48a260d
|
added translations
|
2023-05-12 18:18:10 +03:00 |
|
|
|
7e560e8826
|
Web: Deleted unused translation.
|
2023-05-12 09:22:23 +03:00 |
|
|
|
e96252937d
|
Web: Payment alert description changed.
|
2023-05-11 18:30:39 +03:00 |
|
Akmal Isomadinov
|
d2c705e53e
|
Web Updated config
|
2023-05-11 18:27:42 +05:00 |
|
|
|
4817ccbfb3
|
Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/DocSpace into hotfix/v1.0.1
|
2023-05-10 18:43:17 +03:00 |
|
|
|
a0293fee03
|
added translations
|
2023-05-10 18:42:42 +03:00 |
|
Viktor Fomin
|
248743f614
|
Web: add translates
|
2023-05-10 17:39:23 +03:00 |
|
Elyor Djalilov
|
9d52d935b8
|
Web: Components: filling-status-line
|
2023-05-10 14:21:04 +05:00 |
|
|
|
7bed1e829c
|
edited Chinese
|
2023-05-02 15:14:05 +03:00 |
|
Vladimir Khvan
|
b671b4f1fb
|
empty filter stub was added
|
2023-05-02 15:33:09 +05:00 |
|
|
|
25fed493da
|
Merge branch 'develop' into feature/action-buttons-hints
|
2023-04-28 17:10:46 +04:00 |
|
Akmal Isomadinov
|
266b3c73b5
|
Web:Added URL of the viewer script
|
2023-04-28 16:50:45 +05:00 |
|
|
|
9de8d7eb9c
|
edited translation cs
|
2023-04-27 17:44:46 +03:00 |
|
Vladimir Khvan
|
d9418d7fef
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-25 12:26:46 +05:00 |
|
NikitaVashchuk
|
9712466c98
|
png images for notifications
|
2023-04-22 16:21:35 +05:00 |
|
|
|
1d15a0345f
|
added translations
|
2023-04-20 18:21:37 +03:00 |
|
|
|
bccb3c86e3
|
Web: Files: added titles to info-panel icon, table-settings icon
|
2023-04-20 15:35:56 +03:00 |
|
|
|
97cd9824e1
|
Add translations (vi)
|
2023-04-19 16:32:38 +03:00 |
|
Viktor Fomin
|
d1956bc0ef
|
Fix Bug 62136: applied social buttons disabled style
|
2023-04-18 21:07:31 +03:00 |
|
Vladimir Khvan
|
64f5f60de2
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-18 15:20:43 +05:00 |
|
|
|
854881e27c
|
added translations
|
2023-04-17 12:14:14 +03:00 |
|
Vladimir Khvan
|
a1e5e3b7ed
|
Merge branch 'develop' into feature/webhooks-page
|
2023-04-16 15:24:17 +05:00 |
|
|
|
fe21ae5277
|
added translations
|
2023-04-14 19:15:52 +03:00 |
|
|
|
a16c6b2d66
|
added translations
|
2023-04-14 16:20:48 +03:00 |
|
