Commit Graph

1124 Commits

Author SHA1 Message Date
Akmal Isomadinov
4bad9df7eb Web:FilesSelector Added restore action 2023-11-03 15:30:26 +05:00
248f0e80b2 Web: Added a mute icon in the room, added unmute when clicking on this icon. 2023-11-02 15:03:02 +03:00
mushka-n
da4c667afe major code cleanup 2023-11-01 12:29:49 +03:00
f9dfc3954b Merge branch 'release/v2.0.0' into feature/new-form-gallery 2023-10-31 18:18:20 +04:00
4262b23031
Merge pull request #57 from ONLYOFFICE/bugfix/icons
Bugfix/icons
2023-10-30 19:53:47 +04:00
febef31883 Merge branch 'release/v2.0.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.0.0 2023-10-30 17:56:55 +03:00
f5c62cbf87 Fixed oAuth redirect for opening inside thrid-party container 2023-10-30 17:56:44 +03:00
c3cd684a0d Merge branch 'release/v2.0.0' into bugfix/icons 2023-10-30 18:34:09 +04:00
15547dedbb Fix Bug 64908 - Accounts: Profile. The flag of Saudi Arabia is incorrectly specified when selecting the language. 2023-10-30 18:27:23 +04:00
a84cb1ca92 Fixed url for public room in manager mode, apply requestToken parameter 2023-10-30 15:46:22 +03:00
mushka-n
fed4bf3235 new empty info panel view + translation and styling fixes 2023-10-30 15:30:38 +03:00
mushka-n
bc9cbb44c2 Merge branch 'release/v2.0.0' into feature/new-form-gallery 2023-10-30 13:49:52 +03:00
5235b306e9 Fixed Bug 64897. Public room embedding not display if embedding via js-sdk 2023-10-30 11:59:46 +03:00
e0be82a102 Merge branch 'release/v2.0.0' into bugfix/icons 2023-10-30 12:05:09 +04:00
Akmal Isomadinov
561f7e6793 Web:settings: Fixed the icons of the settings 2023-10-27 18:39:46 +05:00
Vladimir Khvan
8abea90a92 fix Bug 63907 | first name and last name validation was added 2023-10-27 18:12:01 +05:00
mushka-n
6ac7700678 merge release + merge fix 2023-10-27 15:10:43 +03:00
Akmal Isomadinov
2726113dc0 Web:Floating-Button Fixed icons and optimization 2023-10-26 18:51:31 +05:00
Akmal Isomadinov
5bd428ce16 Web:Modal: Fixed close icon 2023-10-26 17:33:16 +05:00
Akmal Isomadinov
8beadcea0d Web:Badges Fixed convert icon 2023-10-26 16:58:40 +05:00
Akmal Isomadinov
472c15f629 Merge branch 'release/v2.0.0' into bugfix/icons 2023-10-26 16:04:44 +05:00
ef39f40c44 Fixed images for letters 2023-10-25 20:57:08 +03:00
Akmal Isomadinov
05ac738d55 Web:Article: Fixed the icon of the article menu button 2023-10-25 18:33:42 +05:00
Akmal Isomadinov
6743b6a2a5 Web:Client:Article: Fixed catalog icons 2023-10-25 18:01:39 +05:00
Akmal Isomadinov
9ca10c1fcb Web:Navigation: Fixed the add icon and fixed margin 2023-10-25 13:56:57 +05:00
mushka-n
5805f1b995 Merge branch 'release/v2.0.0' into feature/new-form-gallery 2023-10-20 11:09:31 +03:00
563e14d049 Web: Files: added copy icon for tablet view 2023-10-19 14:28:55 +03:00
mushka-n
65e809cd97 merge release + merge resolve 2023-10-18 14:26:12 +03:00
dfd68e1958
Merge pull request #23 from ONLYOFFICE/bugfix/pdf-viewer
Web:PDFViewer Fixed the script URL
2023-10-17 19:23:48 +04:00
Akmal Isomadinov
11d013f523 Web:PDFViewer Fixed the script URL 2023-10-17 20:16:17 +05:00
1f6e3aa3a3 Merge branch 'develop' into feature/room-primary-link
# Conflicts:
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/components/panels/EditLinkPanel/index.js
2023-10-13 18:27:53 +03:00
bfda98546c
Merge pull request #9 from ONLYOFFICE/bugfix/ui
Bugfix/UI
2023-10-13 19:24:03 +04:00
c0ffc3b40e Merge branch 'develop' into feature/redesign-letters 2023-10-12 16:17:00 +03:00
5eaa5b6108 Merge branch 'develop' into bugfix/ui
# Conflicts:
#	packages/client/src/components/FilesSelector/FilesSelector.types.ts
#	packages/client/src/components/FilesSelector/index.tsx
#	packages/client/src/pages/Home/Section/Header/index.js
2023-10-11 19:50:58 +04:00
482cb80f9d Fixed JS-SDK filter property 2023-10-11 17:07:41 +03:00
Akmal Isomadinov
ac13bb8303 Client: moved into common translation 2023-10-11 16:49:13 +05:00
0d4ec93dff Web: Files: fixed link.react icon 2023-10-10 12:51:37 +03:00
4d11fd7140 Added new letters images 2023-10-06 12:20:00 +03:00
7fd66d88ff Web: Files: added new icons 2023-10-05 15:41:19 +03:00
mushka-n
5ec8dec79e merge new develop + merge changes 2023-10-05 11:23:00 +03:00
bb43dc825c Clear wrongPortalNameUrl (docker issues) 2023-10-04 14:50:54 +04:00
1e8fac378c Web:Client:Plugin: apply new layouts, add delete dialog 2023-09-29 15:32:27 +03:00
f778106bc4 Merge branch 'develop' into feature/web-plugins 2023-09-29 10:36:07 +03:00
Viktor Fomin
8d606c78e7 Web: delete useless 2023-09-27 14:15:47 +03:00
796cbf3265 Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2023-09-25 15:58:53 +03:00
mushka-n
10f8b0e00a Merge branch 'develop' into feature/new-form-gallery 2023-09-25 14:25:46 +03:00
b14d6c8ef0 Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
#	config/appsettings.json
#	config/nlog.config
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
#	migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
#	packages/client/src/pages/Confirm/sub-components/createUser.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
#	packages/common/components/MoreLoginModal/index.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Core/CspSettingsHelper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	yarn.lock
2023-09-25 10:53:06 +03:00
fd383577a0 Merge branch 'develop' into feature/web-plugins 2023-09-25 08:53:04 +03:00
mushka-n
a843a45b09 merge develop + merge fix 2023-09-23 23:52:51 +03:00
mushka-n
6cbb1cce34 implemented new localization structure + after-merge fixes 2023-09-22 18:38:37 +03:00