Commit Graph

16783 Commits

Author SHA1 Message Date
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
0a716b181e Web: Client: fix styles 2022-02-08 13:36:50 +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
857f068afd Web: Client: delete useless 2022-02-07 22:08:33 +03:00
bcae8bb718 Web: Client: fix submit/oAuth 2022-02-07 22:08:02 +03:00
8f0f529b1e Web: Client: add new block for create user 2022-02-07 21:53:51 +03:00
213c8c5756 Web: Client: fix create user style 2022-02-07 21:07:45 +03:00
e39fa3edaf Web: Login: expose more-login 2022-02-07 21:07:00 +03:00
f9c6cdf038 Web: Client: refactoring and redesign create user 2022-02-07 20:55:06 +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
db0f49708a Web: Login/Client: redirect to enter code page 2022-02-07 08:10:20 +03:00
ea65388497 Web: Login: disable input when enter code 2022-02-07 08:03:13 +03:00
162edd36f8 Web: Components: fix style 2022-02-07 08:00:20 +03:00
27ecf41480 Web: Components: fix warning 2022-02-07 07:57:49 +03:00
73a0dc5588 Web: Login: add manually log in 2022-02-06 22:55:59 +03:00
b03a466591 Web: Common: add set roomsMode 2022-02-06 22:55:15 +03:00
246720c4fa Web: Login: fix dialog style 2022-02-06 22:53:48 +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
acc102fa8d Web: Login: delete useless 2022-02-04 18:34:17 +03:00
e8feb6af1c Web: Login: delete useless 2022-02-04 18:33:09 +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