Commit Graph

37700 Commits

Author SHA1 Message Date
09b012d4e9 Web:Client: fix blinking trash navigation 2023-09-13 15:52:04 +03:00
6e0618fd0e Merge branch 'develop' into bugfix/trash-navigation 2023-09-13 11:50:55 +03:00
410f5f6257 Web:Common:Navigation: delete useless 2023-09-13 11:50:52 +03:00
a9e93ef2f9 fixed merge conflicts 2023-09-13 09:28:08 +03:00
9ca2280e83 fixed merge conflicts 2023-09-13 09:22:59 +03:00
c3495ce668
Merge pull request #1737 from ONLYOFFICE/feature/short-links
Feature/short links
2023-09-13 09:21:59 +03:00
0c2c9511f4
Merge pull request #1733 from ONLYOFFICE/feature/back-ar
Feature/back ar
2023-09-12 19:43:24 +04:00
d8fc4babc7 Web: Removed full duplicate 2023-09-12 19:41:40 +04:00
bba582bde4 Create run.backend.translations.tests.sh 2023-09-12 19:41:06 +04:00
5be921b540 Merge branch 'develop' into feature/back-ar 2023-09-12 18:01:15 +04:00
d66954b45f
Merge pull request #1738 from ONLYOFFICE/feature/delete-dialog-translations
Web: Files: added new translations for delete dialog
2023-09-12 17:58:03 +04:00
b3470375cb Web: Fix translations to other languages 2023-09-12 17:57:27 +04:00
9c173f3d20 Web: Files: added new translations for delete dialog 2023-09-12 16:06:43 +03:00
e419f8ab40 added default link shortening 2023-09-12 14:54:59 +03:00
8283538b52
Merge pull request #1578 from ONLYOFFICE/feature/new-files-dialog
feature/new-files-dialog
2023-09-12 14:09:20 +04:00
gazizova-vlada
d0ce4eb38e Web:Client:Change MarkAsRead to Viewed. 2023-09-12 13:00:15 +03:00
gazizova-vlada
247c3d3dca Web:Client:Fix styles. 2023-09-12 12:58:34 +03:00
6cf75e74f8 Api: sso. HideAuthPage for anonymous 2023-09-11 17:55:57 +03:00
166208565f
Merge pull request #1724 from ONLYOFFICE/feature/remove-ser-attr
removed Serializable attribute
2023-09-11 07:33:57 -07:00
5977a9f986
Merge pull request #1719 from ONLYOFFICE/feature/json-7
Feature/json 7
2023-09-11 07:33:28 -07:00
gazizova-vlada
5ad5417a3f Web:Delete inProgressElement. 2023-09-11 17:00:22 +03:00
f9f2b38ed8
Merge pull request #1653 from ONLYOFFICE/feature/branding-mobile-layout
Feature/branding mobile layout
2023-09-11 17:55:00 +04:00
Viktor Fomin
3d8005fb2f Client: PortalSettings: fix style 2023-09-11 16:35:57 +03:00
c5ba70846c added ar 2023-09-11 16:10:48 +03:00
gazizova-vlada
1b53207df0 Web:Add inProgressElement. 2023-09-11 15:17:38 +03:00
Viktor Fomin
97a2cd9851 Client: PortalSettings: fix styles 2023-09-11 15:12:11 +03:00
Viktor Fomin
f8fc3afdfc Components: Submenu: fix height 2023-09-11 15:09:38 +03:00
Viktor Fomin
7d4020262e Merge branch 'develop' into feature/branding-mobile-layout 2023-09-11 14:36:57 +03:00
Viktor Fomin
698305fe5d Client: PortalSettings: fix style 2023-09-11 14:36:46 +03:00
Viktor Fomin
88584496e0 Client: PortalSettings: Customization: use MobileCategoryWrapper 2023-09-11 14:36:30 +03:00
00a9b332df
Merge pull request #1727 from ONLYOFFICE/feature/accounts-optimization
Feature/accounts optimization
2023-09-11 04:36:07 -07:00
Viktor Fomin
ccb9579a12 Client: PortalSettings: MobileCategoryWrapper: add paid badge 2023-09-11 14:35:28 +03:00
Viktor Fomin
c8b75c10ea Client: PortalSettings: Customization: delete useless 2023-09-11 14:02:00 +03:00
Viktor Fomin
35f5ae7c0b Client: PortalSettings: Customization: fix show badge 2023-09-11 13:37:08 +03:00
Viktor Fomin
1c95499dc8 Client: PortalSettings: Common: fix blink 2023-09-11 13:31:05 +03:00
eb9e71d978 Merge branch 'develop' into feature/branding-mobile-layout 2023-09-11 14:21:53 +04:00
0510210a7b
Merge pull request #1728 from ONLYOFFICE/bugfix/folder-restore
Bugfix/folder restore
2023-09-11 02:11:24 -07:00
09867f8e4c
Merge pull request #1729 from ONLYOFFICE/bugfix/room-filter
Bugfix/room filter
2023-09-11 02:10:33 -07:00
gazizova-vlada
8ecc18f927 Web:When clicking on a file, a loader appears. 2023-09-11 11:23:42 +03:00
d3097f9cd9 Merge branch 'develop' into bugfix/room-filter
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2023-09-11 11:19:40 +03:00
bf9eae140f fixed folder restore from trash 2023-09-11 11:16:24 +03:00
gazizova-vlada
fcf4a16de1 Web:Client:Fixed display of the FloatingButton on mobile in the NewFilesPanel. 2023-09-11 08:52:28 +03:00
dec1a0d2e5 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-09-10 18:11:26 +03:00
8d2a2526de Merge branch 'develop' into bugfix/trash-navigation 2023-09-08 18:18:50 +02:00
c8d12bc787 Web: Client: fix trash isEmptyPage 2023-09-08 18:18:35 +02:00
a75a69222d
Merge pull request #1725 from ONLYOFFICE/feature/copy-paste-hotkeys
Feature/copy paste hotkeys
2023-09-08 20:02:16 +04:00
Viktor Fomin
2ad811c363 Merge branch 'develop' into feature/branding-mobile-layout 2023-09-08 18:56:18 +03:00
60e7c125ad Merge branch 'develop' into feature/copy-paste-hotkeys 2023-09-08 19:55:35 +04:00
d87434d426
Merge pull request #1639 from ONLYOFFICE/feature/sso-mobile-layout
Feature/sso mobile layout
2023-09-08 19:54:14 +04:00
3329a5bf0b Merge branch 'feature/copy-paste-hotkeys' of github.com:ONLYOFFICE/AppServer into feature/copy-paste-hotkeys 2023-09-08 18:33:08 +03:00