Commit Graph

31962 Commits

Author SHA1 Message Date
5c477e8a36 Web:Fix. 2023-03-10 16:18:29 +03:00
f60658deb7 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-10 16:17:45 +03:00
093a6fa577 Web:Component:Fixed incorrect itemCount definition for list with showDisabledItems prop set to false. 2023-03-10 16:17:21 +03:00
234bb31ab9 Web: Fixed dates. 2023-03-10 16:16:12 +03:00
722df36493 async: fixed 2023-03-10 16:09:32 +03:00
bd61c2c322 Web: Payments: Splitting a file into several. 2023-03-10 15:41:33 +03: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
7f729cdf1b Web: Refactoring. 2023-03-10 15:14:40 +03:00
bd54c11a81 Merge branch 'develop' into feature/notifications 2023-03-10 14:27:34 +03:00
10d5ebcbca Web: Notifications: Deleted useless code. 2023-03-10 14:25:03 +03:00
9f390b7837 Web: Refactoring. added error handler. 2023-03-10 14:23:16 +03:00
a8350825bc Web: Refactoring, added mute status update immediately. 2023-03-10 14:22:10 +03:00
Vashchuk Nikita
473cecc4db cleaning up resources, refactoring 2023-03-10 16:16:58 +05:00
nasrullonurullaev
ce0feb497e
Update dotnet runtime version to 7.0.3 (#1296) 2023-03-10 14:11:43 +05:00
5dc1d703e2 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-10 11:42:26 +03:00
e5f733c771 fix Bug 61076 2023-03-10 11:39:54 +03:00
340e1d51d2 fix bug 61527 and bug 61526
now when move/copy folder markAsNew only files in this folders
2023-03-10 11:37:16 +03:00
61351f089f thubmnail: change resize alg 2023-03-10 00:54:17 +03:00
1b08c21617 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-09 22:16:31 +03:00
f1bfefe9c1 thubmnail: change resize alg 2023-03-09 22:16:15 +03:00
d2d67f5060 fix 2023-03-09 20:18:18 +03:00
e6b1cf82bd Web: Notifications: Renaming. 2023-03-09 19:15:57 +03:00
ec3d8eb44b Web: Deleted useless translations. 2023-03-09 19:13:22 +03:00
70f89faa78 Web:Client:Add sortByTitle for FilterInput. 2023-03-09 19:12:13 +03:00
e138399ab2 Web:Common:Add title for SortButton. 2023-03-09 19:11:55 +03:00
4ddbfdb814 Web:Add translation "SortBy". 2023-03-09 19:10:52 +03:00
d9a0977650 Merge branch 'feature/notifications' of https://github.com/ONLYOFFICE/DocSpace into feature/notifications 2023-03-09 19:06:33 +03:00
66e26f076b Web: Added error handler. 2023-03-09 19:05:27 +03:00
Vashchuk Nikita
f3f1cd1adc fix userName, added collaborator as portals Role resource 2023-03-09 20:57:21 +05:00
2d83a0df66 Web: Deleted useless translations. 2023-03-09 18:36:15 +03:00
8790582db2 Web: Deleted useless translation after merge. 2023-03-09 18:24:59 +03:00
0947e1d67a Web: Deleted useless translation after merge. 2023-03-09 18:22:23 +03:00
7f3c2c5bb2 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-09 18:13:05 +03:00
de834ffa27 Web:Client:Change translations. 2023-03-09 18:12:58 +03:00
b53bf3f58a Web:Add "LastModifiedDate" translation. 2023-03-09 18:12:20 +03:00
Viktor Fomin
9499aa6306 Client: PortalSettings: Whitelabel: fix reset, disabled 2023-03-09 18:11:02 +03:00
666a5775ea Web:Client:Renamed actions in the main button. 2023-03-09 17:42:53 +03:00
a6ce7bcfa9 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-09 17:00:08 +03:00
8b643df15e Web:Components:Fixed missing icon cross after page reload due to missing url dynamic update in ReactSvg. 2023-03-09 16:59:21 +03:00
e078b1e8d6 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-03-09 15:40:44 +03:00
386dc43708 Web: Files: changed ClearFilter translation 2023-03-09 15:40:37 +03:00
Vashchuk Nikita
492d8765cb added collaborator resources 2023-03-09 17:39:38 +05:00
1eef5b3861
Merge pull request #1285 from ONLYOFFICE/feature/nginx-location-to-filehandler
nginx location to filehandler.ashx
2023-03-09 15:37:09 +03:00
4d0ed3d7db
Merge pull request #1284 from ONLYOFFICE/bugfix/61465
Bugfix/61465
2023-03-09 15:36:31 +03:00
92539449c4 backup chunk-size 2023-03-09 15:34:47 +03:00
9e6205a949 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-09 16:08:19 +04:00
1107209611 Fix dev docker build 2023-03-09 16:08:08 +04:00
7220d0227c thumbnailBuilder: removed replace background color 2023-03-09 14:58:05 +03:00
05571943dc backend: refactoring. replace sync methods to async within ExecutionStrategy block 2023-03-09 14:42:18 +03:00
Vashchuk Nikita
8bbdeffa46 changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName 2023-03-09 16:40:36 +05:00