Commit Graph

16067 Commits

Author SHA1 Message Date
mushka
64afedc7f6 Merge branch 'develop' into feature/submenu 2022-02-18 02:01:00 +03:00
mushka
3bededc084 added auto offset 2022-02-18 01:59:46 +03:00
mushka
5f565382f7 added drag-scrolling, working on auto-offset 2022-02-17 17:01:04 +03:00
e3b894a21a ResManager: fix 2022-02-17 14:47:50 +03:00
mushka
21253cbca2 Merge branch 'develop' into feature/submenu 2022-02-17 11:50:10 +03:00
6b8304304f fixed starting services 2022-02-11 19:01:38 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
b6d98a8227
Merge pull request #516 from ONLYOFFICE/bugfix/U2U1100
Bugfix/u2u1100
2022-02-09 13:35:54 +03:00
147377ab65 bugfix: crash when string == null 2022-02-09 13:32:01 +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
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
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
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
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
17cb4a647b analizators: bugfix 2022-01-31 14:35:59 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
8428ef730c
Merge pull request #498 from ONLYOFFICE/feature/accessRightSelect
Feature/access right select
2022-01-28 13:00:47 +03:00
Yaroslavna Gaivoronyuk
fdec7246ec Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect 2022-01-27 17:29:56 +03:00
Yaroslavna Gaivoronyuk
e068a183d1 update README.md 2022-01-27 17:29:39 +03:00
0c2085a168
Merge branch 'develop' into feature/accessRightSelect 2022-01-27 16:52:54 +03:00
Yaroslavna Gaivoronyuk
73c6bcb4f8 upd 2022-01-27 16:45:02 +03:00
Yaroslavna Gaivoronyuk
bb6c826b74 Merge branch 'feature/accessRightSelect' of github.com:ONLYOFFICE/AppServer into feature/accessRightSelect 2022-01-27 15:59:32 +03:00
Yaroslavna Gaivoronyuk
ee375307fb change props, upd story 2022-01-27 15:58:56 +03:00
b7f0ffc9d2 cache: fixed memory cache notify 2022-01-27 15:35:11 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
4355430ccd
Merge branch 'develop' into feature/accessRightSelect 2022-01-27 12:09:53 +03:00
e010268e2a
Merge pull request #491 from ONLYOFFICE/feature/redesign-tiles
Feature/redesign tiles
2022-01-27 12:06:52 +03:00
Dmitry Kulak
23fc1a7b46 Web: Files: Badges: Renamed VersionBadgeWrapper to BadgeWrapper 2022-01-26 15:16:45 +03:00
Dmitry Kulak
b25e0c75b0 Web: Files: Tiles: Added border on hover for ok/cancel buttons while renaming 2022-01-26 14:42:01 +03:00
Dmitry Kulak
926f0c6a2e Web: Files: Changed "shared" icon 2022-01-26 14:09:43 +03:00
Dmitry Kulak
0e6c866ca6 Web: Files: Badges: Extracted common Badge props to object 2022-01-25 14:24:27 +03:00
b4334b8947 analizators/Add HttpClient service 2022-01-25 13:47:36 +03:00
Dmitry Kulak
a46ea93d32
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 13:37:04 +03:00
Yaroslavna Gaivoronyuk
6a7515eec6 upd access-right-select 2022-01-25 11:17:38 +03:00
7f31d3f19f
Merge pull request #494 from ONLYOFFICE/feature/refactoring-one-dbcontext-in-dao
used one dbcontext per service (per DAO). fixed error: System.Invalid…
2022-01-25 11:14:23 +03:00
Dmitry Kulak
67a749c7b3
Merge branch 'develop' into feature/redesign-tiles 2022-01-25 10:14:13 +03:00