|
7716e32573
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-03 18:10:00 +03:00 |
|
|
65cd469c4a
|
added translations
|
2023-04-03 18:09:00 +03:00 |
|
|
5744f7e67c
|
Web: Added team training alert.
|
2023-04-03 15:42:51 +03:00 |
|
|
a9355c4ea6
|
Web: Added new LiveChat and BookTraining menu to Profile
|
2023-04-03 14:43:01 +04:00 |
|
|
3af54531eb
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-29 10:44:09 +03:00 |
|
|
1ef1998541
|
Web: PortalSettings: Payments: Changed translation.
|
2023-03-29 10:41:03 +03:00 |
|
|
d44706498d
|
added translations
|
2023-03-28 18:43:17 +03:00 |
|
Vladimir Khvan
|
3914bcd3f0
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-28 14:40:39 +05:00 |
|
Vladimir Khvan
|
91d1826f63
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-27 14:12:15 +05:00 |
|
|
a717db3118
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-24 22:02:27 +03:00 |
|
|
c9617c5ff6
|
added translations
|
2023-03-24 22:02:04 +03:00 |
|
|
cab3582bcf
|
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
Bugfix/notification image format
|
2023-03-24 12:39:32 +03:00 |
|
Vashchuk Nikita
|
a9284faf1d
|
added logo.png as embedded resource
|
2023-03-23 21:33:33 +05:00 |
|
|
53311f0e36
|
added translations
|
2023-03-23 19:05:25 +03:00 |
|
Viktor Fomin
|
333437bd24
|
Web: change compact logo
|
2023-03-23 09:20:05 +03:00 |
|
Vashchuk Nikita
|
ca6e1d1553
|
returned old images
|
2023-03-23 02:26:07 +05:00 |
|
Vashchuk Nikita
|
2b94d5dfa5
|
changed notification image format to png,
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
|
2023-03-23 00:25:15 +05:00 |
|
Timofey Boyko
|
de9b08614f
|
Web:Client:Translations: change Collaborator to PowerUser
|
2023-03-22 08:56:16 +03:00 |
|
|
bff1e99bcb
|
Web: Added thumbnails1280x720 to config.json and turned off by default
|
2023-03-20 22:51:40 +04:00 |
|
Vladimir Khvan
|
7d44a06e14
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-20 17:52:29 +02:00 |
|
|
41c966db1c
|
Web: Applied changes to Audit (renamed "room" to "context")
|
2023-03-20 16:07:20 +04:00 |
|
|
95734445e3
|
added new translations
|
2023-03-15 18:43:28 +03:00 |
|
|
9a45dea8bd
|
Web: Added opportunity to change wrongPortalNameUrl in config.json
|
2023-03-14 22:31:43 +04:00 |
|
|
d4ea5f4ccb
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-14 14:14:20 +03:00 |
|
|
0044ea935b
|
Web: Removed 'Video guides'.
|
2023-03-14 14:14:14 +03:00 |
|
|
1ebc887717
|
Web: Fix Payments translation issues (moved some keys to Common)
|
2023-03-14 15:00:19 +04:00 |
|
|
0b911b0d36
|
Web: Moved SizeImageLarge translation key to Common
|
2023-03-14 14:44:57 +04:00 |
|
|
eb86665d70
|
Web: Fix some translations issues
|
2023-03-14 14:30:58 +04:00 |
|
|
1df9a39a13
|
Web: Fix some translations issues
|
2023-03-14 14:15:43 +04:00 |
|
|
ef532e565e
|
Fix UselessTranslationKeysTest issue (Remove PasswordLimitLength key)
|
2023-03-13 14:47:13 +04:00 |
|
|
670125fe32
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-03-13 12:34:46 +03:00 |
|
|
d8281d940e
|
Web: Added translation for unexpected error.
|
2023-03-13 12:33:29 +03:00 |
|
|
d1c766c6fc
|
Fix FullEnDublicatesTest issues (Archive/to archive)
|
2023-03-13 12:56:29 +04:00 |
|
Vashchuk Nikita
|
2d92da7c0c
|
Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
# web/ASC.Web.Api/GlobalUsings.cs
|
2023-03-10 17:39:47 +05:00 |
|
|
4ddbfdb814
|
Web:Add translation "SortBy".
|
2023-03-09 19:10:52 +03:00 |
|
|
b53bf3f58a
|
Web:Add "LastModifiedDate" translation.
|
2023-03-09 18:12:20 +03:00 |
|
|
386dc43708
|
Web: Files: changed ClearFilter translation
|
2023-03-09 15:40:37 +03:00 |
|
Vladimir Khvan
|
b2546b1c96
|
Merge branch 'develop' into feature/webhooks-page
|
2023-03-07 00:41:32 +05:00 |
|
|
29abce027d
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
|
2023-03-06 15:37:45 +03:00 |
|
|
d66a8cb4ac
|
Update Common.json
|
2023-03-06 15:21:22 +04:00 |
|
|
c872fc0162
|
Web: Client: browserDetector: Fixed bug for detecting mobile app
|
2023-03-03 15:13:07 +03:00 |
|
|
7279920c29
|
Web: Client: browserDetector: Fixed wrong detection for Chrome DevTools
|
2023-03-01 17:05:37 +03:00 |
|
Timofey Boyko
|
d850cc02ff
|
Web: add new translation key 'HasFullAccess' for RU
|
2023-03-01 15:50:29 +03:00 |
|
Timofey Boyko
|
dff799f804
|
Web: add new translation key 'DocSpace owner' for RU
|
2023-03-01 15:36:52 +03:00 |
|
Timofey Boyko
|
eb6456a990
|
Web: add new translation key 'DocSpace owner'
|
2023-03-01 15:16:20 +03:00 |
|
|
8114f8a710
|
Merge branch 'develop' into feature/browserlist
|
2023-02-28 18:11:49 +04:00 |
|
|
c1a89733c4
|
Web: Added new translations
|
2023-02-28 14:22:29 +04:00 |
|
Timofey Boyko
|
41096976a3
|
Web: add new translation key 'HasFullAccess'
|
2023-02-28 11:38:30 +03:00 |
|
Vladimir Khvan
|
6b0c1d163c
|
Merge branch 'develop' into feature/webhooks-page
|
2023-02-23 23:01:14 +05:00 |
|
|
216a6480c8
|
Merge branch 'develop' into feature/notifications
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
|
2023-02-22 15:50:55 +03:00 |
|
Timofey Boyko
|
6ea82302eb
|
Web: add new translation key 'Collaborator'
|
2023-02-22 10:01:31 +03:00 |
|
|
449d0c64c5
|
Merge branch 'develop' into feature/browserlist
|
2023-02-21 13:55:50 +03:00 |
|
|
4e18e0dcbc
|
Web: Client: Scripts: Added SamsungBrowser and AscDesktopEditor detecting at browserDetector
|
2023-02-21 13:43:24 +03:00 |
|
Vladimir Khvan
|
a1a6647fcf
|
settings icon was added
|
2023-02-21 13:31:51 +05:00 |
|
Viktor Fomin
|
84533d7ca0
|
Web: delete useless images
|
2023-02-21 10:52:24 +03:00 |
|
|
ff3e302ff7
|
Web: Client: Scripts: Added browserDetector.js
|
2023-02-20 17:40:32 +03:00 |
|
|
9d88b1caba
|
Web: Client: Images: Added browsers icons
|
2023-02-20 17:39:47 +03:00 |
|
Viktor Fomin
|
4710429524
|
Web: add images
|
2023-02-18 23:55:57 +03:00 |
|
Elyor Djalilov
|
20e1d49171
|
fix translate
|
2023-02-10 15:51:43 +05:00 |
|
Elyor Djalilov
|
f3c6b14817
|
Fix Bug 61099 - Mobile. The location of the download copy button in the backup menu
|
2023-02-09 13:47:20 +05:00 |
|
|
68adfe1138
|
Web: Added enable/disable notifications to the context menu.
|
2023-02-06 16:55:19 +03:00 |
|
Elyor Djalilov
|
baf75b0c42
|
Web:PortalSettings: Changed portal settings navigation
|
2023-02-01 16:49:02 +05:00 |
|
Timofey Boyko
|
1b36167b44
|
Web: change path for favicon.ico
|
2023-01-23 13:21:51 +03:00 |
|
Timofey Boyko
|
ae94a3d016
|
Web:Components:InputPhone: fix flags import
|
2023-01-20 12:44:10 +03:00 |
|
Timofey Boyko
|
a42c916b81
|
Web: delete useless images
|
2023-01-19 12:15:26 +03:00 |
|
Timofey Boyko
|
f4cb8acf1d
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-18 18:06:22 +03:00 |
|
|
fe48edf500
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2023-01-18 16:00:23 +03:00 |
|
|
b7bad31a55
|
Fix Bug 60621 - Rooms.Settings.ThirdParty. Hide the ability for admins to connect third-party storage when creating a room, if the setting is disabled.
|
2023-01-18 11:36:06 +03:00 |
|
|
7b66772439
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2023-01-17 20:18:16 +03:00 |
|
|
dc78694a0b
|
Fix translations of settings
|
2023-01-17 18:14:00 +03:00 |
|
|
3f1a21161f
|
Update Common.json
|
2023-01-17 17:51:53 +03:00 |
|
Timofey Boyko
|
270382a0a5
|
Web: restore default user photo
|
2023-01-16 17:58:05 +03:00 |
|
|
2548ac5aed
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2023-01-16 12:53:42 +03:00 |
|
Timofey Boyko
|
0cb238e5d3
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-16 10:36:22 +03:00 |
|
Timofey Boyko
|
b62ad17935
|
Web: delete useless images
|
2023-01-13 16:27:07 +03:00 |
|
DmitrySychugov
|
b8f1c9f1e2
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2023-01-13 18:16:38 +05:00 |
|
Timofey Boyko
|
5730a5e8ac
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-12 18:10:15 +03:00 |
|
Elyor Djalilov
|
6a686e5224
|
Merge branch 'release/rc-v1.2.0' into feature/dialog-create-file
# Conflicts:
# public/locales/en/Common.json
|
2023-01-12 18:40:04 +05:00 |
|
|
46b99d1f25
|
Removed old resources (Team titles - custom names)
|
2023-01-12 16:20:35 +03:00 |
|
Timofey Boyko
|
2a3176f820
|
Web: fix after merge
|
2023-01-11 19:04:31 +03:00 |
|
Timofey Boyko
|
b46d21c258
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-11 18:47:06 +03:00 |
|
Timofey Boyko
|
98e5ce3240
|
Web: move imgs from components to public
|
2023-01-11 18:38:08 +03:00 |
|
Timofey Boyko
|
dbb4d7aca0
|
Web: move all images from client to public
|
2023-01-11 12:56:54 +03:00 |
|
Timofey Boyko
|
c9ed3a42ef
|
Web: delete useless images
|
2023-01-11 12:32:15 +03:00 |
|
Timofey Boyko
|
c968dc21d9
|
Web: move logo from client to public
|
2023-01-11 11:35:11 +03:00 |
|
|
c2ceab129a
|
Merge branch 'release/rc-v1.2.0' into feature/edit-en
|
2023-01-11 10:57:10 +03:00 |
|
DmitrySychugov
|
37bae142bd
|
Web: Public: added new icons for viewer
|
2023-01-10 20:59:14 +05:00 |
|
Timofey Boyko
|
e34ef435f2
|
Web: delete different md5 equal name images
|
2023-01-10 18:43:12 +03:00 |
|
Timofey Boyko
|
25818e9ad0
|
Web: delete equal md5 equal name duplicates images
|
2023-01-10 17:29:12 +03:00 |
|
|
0b64d4223c
|
Web: Default document names have been moved to 'Common' file.
|
2023-01-10 15:26:57 +03:00 |
|
Timofey Boyko
|
38e8b2d75a
|
Web: delete duplicate img
|
2023-01-10 12:34:45 +03:00 |
|
Elyor Djalilov
|
cfe043502b
|
added toggle in common settings
|
2023-01-09 13:45:02 +05:00 |
|
Timofey Boyko
|
96d3458e2d
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-09 11:03:08 +03:00 |
|
Elyor Djalilov
|
5592a155c8
|
added toggle when creating a file
|
2023-01-09 13:00:04 +05:00 |
|
|
04bd1b6868
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2022-12-30 16:33:33 +03:00 |
|
|
6526b1463d
|
edited en
|
2022-12-30 14:56:53 +03:00 |
|
|
6252f85dbb
|
Translations: Fix paths + keys sorting
|
2022-12-28 21:43:25 +03:00 |
|
|
9aad0214a3
|
Translations: Added rus translations (by Google)
|
2022-12-28 21:42:28 +03:00 |
|
Timofey Boyko
|
9e92ba992b
|
Web: move thirdparties logo from client to public
|
2022-12-28 18:23:02 +03:00 |
|
Timofey Boyko
|
a2f029d906
|
Web: move icons from client to public
|
2022-12-28 16:58:42 +03:00 |
|
DmitrySychugov
|
a37f5914d7
|
Merge branch 'release/rc-v1.2.0' into feature/new-viewer
|
2022-12-27 16:47:10 +05:00 |
|
DmitrySychugov
|
89a6fb6283
|
Merge branch 'develop' into feature/new-viewer
|
2022-12-27 15:08:15 +05:00 |
|
Timofey Boyko
|
7262a5f3b2
|
Web: delete duplicate img by modules
|
2022-12-26 15:04:05 +03:00 |
|
|
1266d817f8
|
Translations: Removed auto-generated files
|
2022-12-23 19:39:15 +03:00 |
|
|
018288d50b
|
Update common.babel and applied sorting
|
2022-12-23 19:09:17 +03:00 |
|
|
fde5bdff1c
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2022-12-22 18:34:54 +03:00 |
|
|
a9d08f397e
|
Web: SDK: Fixed config initialization
|
2022-12-21 14:44:05 +03:00 |
|
|
e8141c6f22
|
Web: Changed load Docspace config for clients
|
2022-12-20 19:51:49 +03:00 |
|
|
b4963cecb9
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2022-12-15 14:43:32 +03:00 |
|
|
286bceaa68
|
Fix cycle import
|
2022-12-13 23:55:43 +03:00 |
|
|
e3acab3758
|
Web: Components: ComboBox: Corrected styles according to UI Kit
|
2022-12-12 11:00:50 +03:00 |
|
|
61f7765a4f
|
Merge branch 'develop' into feature/api-origin
|
2022-12-06 21:47:56 +03:00 |
|
DmitrySychugov
|
8625a701de
|
Web: Public: added new media icons, remove old
|
2022-12-05 20:27:58 +05:00 |
|
|
c3578d1661
|
Fix EnDublicatesByContentTest issues
|
2022-12-02 18:58:36 +03:00 |
|
|
d683aa65b3
|
Fix all UselessTranslationKeysTest issues
|
2022-12-02 18:33:25 +03:00 |
|
|
80273d8392
|
Fix NotFoundKeysTest issues
|
2022-12-01 18:55:05 +03:00 |
|
|
b0a8c93054
|
Merge branch 'develop' into feature/new-docspace-translations
|
2022-12-01 18:43:19 +03:00 |
|
DmitrySychugov
|
624428c262
|
Web: Components: added new icons for viewer, remove old icons
|
2022-12-01 19:02:23 +05:00 |
|
Timofey Boyko
|
04e0d9bf2b
|
Merge branch 'develop' into feature/accounts-room-list
|
2022-12-01 11:53:22 +03:00 |
|
Elyor Djalilov
|
7e06c67e00
|
Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
# packages/client/src/pages/Home/InfoPanel/Header/index.js
|
2022-11-30 23:07:13 +05:00 |
|
Elyor Djalilov
|
b69c737c9d
|
key was moved to the Common
|
2022-11-30 22:58:33 +05:00 |
|
Elyor Djalilov
|
a944200dac
|
key was moved to the Common
|
2022-11-30 22:46:35 +05:00 |
|
Elyor Djalilov
|
ad5fc420b4
|
unused key removed
|
2022-11-30 19:57:19 +05:00 |
|
Elyor Djalilov
|
668c65972a
|
unused key removed
|
2022-11-30 19:55:27 +05:00 |
|
Elyor Djalilov
|
b07d64bf50
|
unused key removed
|
2022-11-30 19:55:00 +05:00 |
|
Elyor Djalilov
|
6b08016970
|
unused key removed
|
2022-11-30 19:52:26 +05:00 |
|
Elyor Djalilov
|
ca437e87f1
|
unused key removed
|
2022-11-30 19:49:10 +05:00 |
|
Elyor Djalilov
|
96ffde2d3e
|
unused key removed
|
2022-11-30 19:47:27 +05:00 |
|
Elyor Djalilov
|
47eff7bd20
|
unused key removed
|
2022-11-30 19:42:50 +05:00 |
|
Elyor Djalilov
|
4fd7987274
|
unused key removed
|
2022-11-30 19:40:27 +05:00 |
|
Elyor Djalilov
|
9ee52588bd
|
unused key removed
|
2022-11-30 19:37:05 +05:00 |
|
Elyor Djalilov
|
84c70aa0e4
|
unused key removed
|
2022-11-30 19:34:58 +05:00 |
|
Elyor Djalilov
|
bc6a4b445f
|
unused key removed
|
2022-11-30 19:33:04 +05:00 |
|
Timofey Boyko
|
d2f62168b8
|
Add new translation key 'Member'
|
2022-11-30 17:32:29 +03:00 |
|
Mushka Nikita
|
c6b4a076b6
|
moved new translation keys to Common
|
2022-11-30 13:00:30 +03:00 |
|
Elyor Djalilov
|
26d210c8d7
|
not found keys fixed
|
2022-11-29 15:32:36 +05:00 |
|
Elyor Djalilov
|
e4b077f69b
|
key was moved to the Common
|
2022-11-29 00:39:03 +05:00 |
|
Elyor Djalilov
|
2e44a446af
|
not translated toasts fixed
|
2022-11-28 23:52:29 +05:00 |
|
Elyor Djalilov
|
89fe900387
|
deleted duplicate keys
|
2022-11-28 22:54:54 +05:00 |
|
Elyor Djalilov
|
04db0e8f0a
|
deleted duplicate key and was moved to the Common
|
2022-11-28 22:46:57 +05:00 |
|
Elyor Djalilov
|
23109e30c2
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 22:19:57 +05:00 |
|
Elyor Djalilov
|
b924f1582d
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 15:37:10 +05:00 |
|
Elyor Djalilov
|
3c637dbaa2
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 15:19:44 +05:00 |
|
Elyor Djalilov
|
6ac2aceb64
|
deleted duplicate keys and was moved to the Common
|
2022-11-28 14:55:18 +05:00 |
|
Elyor Djalilov
|
c628368e9b
|
deleted duplicate keys
|
2022-11-28 13:26:08 +05:00 |
|
Elyor Djalilov
|
fc59726fe1
|
empty value keys fixed and deleted duplicate keys
|
2022-11-28 11:46:04 +05:00 |
|
Elyor Djalilov
|
b3ce916889
|
empty value keys fixed
|
2022-11-26 15:01:16 +05:00 |
|
Elyor Djalilov
|
a54463de2a
|
empty value keys fixed
|
2022-11-26 14:28:36 +05:00 |
|
|
6034f789b3
|
Web: Public: added icons for speed settings
|
2022-11-25 19:12:33 +05:00 |
|
Elyor Djalilov
|
b8348af578
|
Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
# packages/client/public/locales/en/DeleteDialog.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/public/locales/en/InviteDialog.json
# packages/client/public/locales/en/Payments.json
# packages/client/public/locales/en/Profile.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/ru/Files.json
# packages/client/public/locales/ru/InfoPanel.json
# packages/client/public/locales/ru/Payments.json
# packages/client/src/components/GlobalEvents/RenameEvent.js
# packages/client/src/pages/Home/Section/Filter/index.js
|
2022-11-25 16:27:23 +05:00 |
|
|
bea44696d1
|
Merge branch 'develop' into feature/new-viewer
|
2022-11-14 20:05:25 +05:00 |
|
|
133c4459e5
|
Update manifest.json
|
2022-11-13 22:35:19 +03:00 |
|
TimofeyBoyko
|
67425e8001
|
Web:Client: rename SureWant to WantToContinue
|
2022-11-10 16:20:57 +03:00 |
|
TimofeyBoyko
|
7fa1fddf79
|
Web:Client: fix translation keys
|
2022-11-10 15:54:53 +03:00 |
|
|
85dae6bf4c
|
Fix warning of import TrashIcon (File not found)
|
2022-11-08 14:14:33 +03:00 |
|
|
bfadb09322
|
Fix some issues of NotFoundKeysTest
|
2022-10-27 18:27:21 +03:00 |
|
|
fac5873ff8
|
Merge branch 'develop' into feature/new-viewer
|
2022-10-27 16:07:50 +05:00 |
|
Elyor Djalilov
|
42471135ba
|
Merge branch 'develop' into feature/active-sessions
# Conflicts:
# packages/client/src/components/dialogs/index.js
# packages/components/themes/base.js
# packages/components/themes/dark.js
|
2022-10-25 13:41:42 +05:00 |
|
Viktor Fomin
|
494247fa02
|
Web: update big logo
|
2022-10-24 15:22:59 +05:00 |
|
Viktor Fomin
|
cb5836bed2
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 17:54:36 +05:00 |
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
Viktor Fomin
|
cefcd10ddc
|
Web: add new bg patterns
|
2022-10-17 20:53:15 +05:00 |
|
|
cb6fd57f76
|
Merge branch 'develop' into feature/new-viewer
|
2022-10-17 12:37:11 +05:00 |
|
TimofeyBoyko
|
b3395efe50
|
Merge branch 'develop' into feature/portal-access-rights
|
2022-10-17 11:45:25 +05:00 |
|
|
132d6ee7f3
|
Web: Public: added video player speed icon
|
2022-10-14 19:00:27 +05:00 |
|
TimofeyBoyko
|
e56b10d1e5
|
Web:Client: move 'Room admin' and 'DocSpace admin' translation keys to common
|
2022-10-13 15:35:58 +05:00 |
|
|
ee13dc5abd
|
Merge branch 'develop' into feature/new-viewer
|
2022-10-13 12:55:08 +05:00 |
|
|
c9b659448d
|
Web: Public: added new viewer icons
|
2022-10-12 22:57:52 +05:00 |
|
|
6d78f37729
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-11 16:05:49 +03:00 |
|
|
a47ce3d8c0
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-11 11:58:25 +03:00 |
|
|
f013c74475
|
Web: Added additional units for measuring the amount of information, added verification.
|
2022-10-11 10:58:10 +03:00 |
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
0d7f77a18a
|
Merge pull request #897 from ONLYOFFICE/bugfix/accounts-filter
Bugfix/accounts filter
|
2022-10-11 10:12:57 +03:00 |
|
|
60b9ed3dd1
|
Web:Add translation "ReconnectStorage".
|
2022-10-10 19:13:01 +03:00 |
|
TimofeyBoyko
|
09dbd9d088
|
Web: move translation key 'AdvancedFilter' from Files to Common
|
2022-10-10 13:53:24 +05:00 |
|
|
d37a6068fc
|
Merge branch 'develop' into feature/invite-panel
|
2022-10-05 15:04:24 +03:00 |
|
|
ca1cd06fad
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/public/images/plus.react.svg
# packages/client/src/pages/PortalSettings/categories/common/branding.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
# packages/client/src/pages/PortalSettings/index.js
# packages/common/components/PrivateRoute/index.js
|
2022-10-04 17:13:46 +03:00 |
|
mushka
|
1b2dae0890
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-02 03:45:40 +03:00 |
|
|
1f5384dc0c
|
Web: Common: added hide menu translation
|
2022-09-26 12:37:21 +03:00 |
|
|
0c8703a58c
|
Web: Common: added show/hide article button
|
2022-09-26 11:22:46 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
a642d42bcc
|
Client: fix translations
|
2022-09-21 16:16:19 +03:00 |
|
|
64fd6d387e
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-21 13:13:08 +03:00 |
|
|
f49d98d21d
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/Shell.jsx
|
2022-09-20 14:27:39 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
TimofeyBoyko
|
f1a8310ac3
|
Web: move svg from toast to public path
|
2022-09-20 12:56:14 +03:00 |
|
TimofeyBoyko
|
18ff4122a9
|
Web: delete alert.react.svg icon
|
2022-09-20 12:46:24 +03:00 |
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
TimofeyBoyko
|
a65517a9de
|
Web: add new alert icon
|
2022-09-19 17:09:06 +03:00 |
|
|
e8531daac8
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-19 09:46:21 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
|
de122f813e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 21:17:28 +03:00 |
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
TimofeyBoyko
|
0dba384037
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-15 14:29:57 +03:00 |
|
|
20fe2a3763
|
Web:Added values for the downgrade plan dialog from the stores.
|
2022-09-15 12:54:00 +03:00 |
|
TimofeyBoyko
|
11ba9f379c
|
Merge branch 'develop' into feature/redesign-personal-filter
|
2022-09-14 16:35:18 +03:00 |
|
|
28a3096a25
|
Web: Files: Settings: styling + new translations
|
2022-09-14 12:37:33 +03:00 |
|
|
f3412fa2f8
|
Merge branch 'develop' into feature/redisign-files-settings
|
2022-09-14 11:20:37 +03:00 |
|
|
b546a367e1
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-14 10:18:41 +03:00 |
|
|
033259116f
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/settingsAppearance/preview.js
|
2022-09-14 01:15:03 +03:00 |
|
|
856e5b30d7
|
Images: Removed useless
|
2022-09-13 20:22:24 +03:00 |
|
|
8030f66036
|
Web: Fix translations
|
2022-09-13 17:23:52 +03:00 |
|
|
795e76f9d5
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-13 16:42:09 +03:00 |
|
TimofeyBoyko
|
42d6b3e7d3
|
Web: add new translation keys
|
2022-09-13 13:47:40 +03:00 |
|
|
bcf6fbb358
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-13 12:12:48 +03:00 |
|
|
d94918a1de
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-13 10:52:26 +03:00 |
|
|
16a9dc020d
|
Web: Files: fixed catalog-header translation, moved "Other" translation to Translations.json, added "Rooms" translation
|
2022-09-12 14:32:54 +03:00 |
|
|
377d3be960
|
Merge branch 'develop' into feature/additional-resources
|
2022-09-10 19:46:57 +03:00 |
|
mushka
|
ab7ace5af6
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-09 13:22:36 +03:00 |
|
|
ceef3b84be
|
Web:Change image.
|
2022-09-09 13:07:54 +03:00 |
|
|
d016efea48
|
Web: Moved translations to the common.
|
2022-09-09 11:12:02 +03:00 |
|
|
b23ac8e766
|
Web:Add DocSpace menu img.
|
2022-09-09 10:33:44 +03:00 |
|
|
e860c10333
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-09 09:02:56 +03:00 |
|
|
06803de440
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/components/dialogs/BackupCodesDialog/index.js
# packages/client/src/pages/My/index.js
# packages/client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# packages/client/src/pages/Profile/Section/Body/index.js
# packages/client/src/pages/ProfileAction/Section/Body/avatarEditorPage.js
# packages/client/src/pages/ProfileAction/Section/Body/createAvatarEditorPage.js
# packages/client/src/pages/ProfileAction/Section/Body/createUserForm.js
# packages/client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# packages/client/src/pages/ProfileAction/index.js
|
2022-09-08 17:31:12 +03:00 |
|
mushka
|
20f2fde176
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-08 15:28:38 +03:00 |
|
|
5954c20c37
|
Web: Translations: Moved all toasts title translations to Common.json
|
2022-09-08 12:10:33 +03:00 |
|
|
2abf7ef5d9
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-07 17:38:06 +03:00 |
|
|
b1305ce7bc
|
Web: add icon
|
2022-09-06 21:19:13 +03:00 |
|
|
5e6ad92dc2
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-06 13:31:32 +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 |
|
mushka
|
0a2318ea59
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 20:53:35 +03:00 |
|
|
bcdc2993c6
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/pages/My/i18n.js
# packages/client/src/pages/Profile/Section/Body/index.js
|
2022-09-05 16:47:09 +03:00 |
|
mushka
|
84a47113b0
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-05 13:44:33 +03:00 |
|
|
7b623c4e30
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
# packages/common/store/AuthStore.js
# packages/components/slider/index.js
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-05 10:19:52 +03:00 |
|
|
2d1a14bcff
|
Web: add icons
|
2022-09-04 17:52:35 +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 |
|
|
89f9e10f84
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-09-02 01:24:12 +03:00 |
|
|
2297a35fac
|
Merge branch 'develop' into feature/invite-panel
|
2022-09-01 11:17:54 +03:00 |
|
|
c50b1e5c66
|
Web: add icon
|
2022-08-31 23:22:32 +03:00 |
|
|
a9338edd81
|
Web: Transferring translations to a common file
|
2022-08-31 15:22:48 +03:00 |
|
TimofeyBoyko
|
8bda52c489
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-31 11:38:34 +03:00 |
|
|
66412730de
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-31 09:03:17 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
547c1782f1
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
|
2022-08-30 12:34:48 +03:00 |
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
|
60086b1a68
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-30 09:04:22 +03:00 |
|
|
38b217d65e
|
Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state
|
2022-08-30 08:55:19 +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 |
|
|
8ab27efaef
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-29 17:19:16 +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 |
|
|
17a557e96a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding
|
2022-08-28 00:12:05 +03:00 |
|