Commit Graph

16671 Commits

Author SHA1 Message Date
f4d6cdde59
Bugfix/change a spec file (#514)
* Add a necessary sources

* Visual code changes

* Update appserver.spec
2022-02-09 10:25:10 +03:00
84c4b6b273 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-08 19:42:00 +03:00
d54d3a938e Web: e2e-tests: Update tests screenshots 2022-02-08 19:41:50 +03:00
78fb372dcd Web: e2e-tests: Fix create user test 2022-02-08 18:05:45 +03:00
Sergey Kirichenko
3b3f4566b4 Merge branch 'hotfix/v1.1.1' into hotfix/v1.1.1-docker-build 2022-02-08 17:26:26 +03:00
830bfac3d7 Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-08 17:20:20 +03:00
5d0bcdbbfb Config: Added redisHost, redisPort 2022-02-08 17:20:13 +03:00
5528159f13 SocketIO: Added axios 2022-02-08 17:19:06 +03:00
74d6b4bfd6 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-08 16:06:34 +03:00
8d6818c6cd Web: Client: fixed header-logo-wrapper styles 2022-02-08 16:06:25 +03:00
Sergey Kirichenko
340fac7626 Add install to image sudo 2022-02-08 12:00:23 +03:00
Sergey Kirichenko
493a189bf3 Add install to image curl, vim 2022-02-08 11:23:50 +03:00
Sergey Kirichenko
6307f558ad Add node install to images 2022-02-08 10:04:53 +03:00
dc4ea0c6f8 Files: fixed put sharedlink method 2022-02-07 22:57:23 +03:00
b1be9953ad fixed solution build 2022-02-07 22:15:32 +03:00
08c6040787
Merge pull request #503 from ONLYOFFICE/feature/analizators
Feature/analizators
2022-02-07 20:27:17 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
33c0e49705 add new file (Home) (de, es, fr, it, zh-CN, ro), update ja UploadPanel 2022-02-07 16:44:59 +03:00
7b33fab99f Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-07 16:24:08 +03:00
8250b774cd add new lines (UploadPanel), add new file (Home) (de, es, fr, it, zh-CN, ro) 2022-02-07 16:23:43 +03:00
mushka
604882fbb2 Merge branch 'feature/submenu' of github.com:ONLYOFFICE/AppServer into feature/submenu 2022-02-07 14:55:47 +03:00
mushka
cb5b25ede1 fixed media 2022-02-07 14:50:08 +03:00
mushka
1908c170d4 fixed media 2022-02-07 14:47:21 +03:00
0103dd1a3e Web: Files: fixed socketHelper connection after marge 2022-02-07 16:41:24 +05:00
mushka
f40fd581b7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/submenu 2022-02-07 14:16:13 +03:00
mushka
468a24857e last review based changes 2022-02-07 12:39:57 +03:00
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03:00
689723b6f2 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-04 21:02:31 +05:00
3e1a620f80 Web: Files: section optimization 2022-02-04 20:57:21 +05:00
a2cc00b521 fix test config (dotnet issue) 2022-02-04 18:40:55 +03:00
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
mushka
626289110c rm tabs-container.test.js 2022-02-04 14:07:12 +03:00
mushka
43afc6a133 small fixes 2022-02-04 13:55:12 +03:00
mushka
74becd6437 completed submenu 2022-02-04 13:21:10 +03:00
731cbc649b
Merge pull request #500 from ONLYOFFICE/feature/socket-io
Feature/socket io
2022-02-03 20:58:18 +03:00
014e344bb6 Socket.svc: Restored kill process on node died 2022-02-03 19:12:29 +03:00
00bb2821bc Socket.svc: Restored logPath Environment 2022-02-03 18:57:26 +03:00
0f76ba3613 Fixed Bug 55236 - Editor: File from third-party storage is can added to favorites. 2022-02-03 17:49:00 +03:00
ce07a2f800 Merge branch 'feature/socket-io' of https://github.com/ONLYOFFICE/AppServer into feature/socket-io
# Conflicts:
#	products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
2022-02-03 15:10:40 +03:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
Vashchuk Nikita
f4f7a406b1 fix 2022-02-03 14:52:14 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
668df4f5fe Files: fix 2022-02-03 12:44:27 +03:00
0dcdaf7f0e Files: fix 2022-02-03 12:41:30 +03:00
567e8495cb Files: fix 2022-02-03 12:32:37 +03:00
14a06f6150 Files: fix 2022-02-03 12:30:30 +03:00