|
34bda20eb0
|
Merge branch 'develop' into feature/recalculate-user-quota
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
|
2022-11-02 13:40:53 +03:00 |
|
|
e16da4849e
|
Merge pull request #911 from ONLYOFFICE/feature/letters
Feature/letters
|
2022-11-02 13:27:22 +03:00 |
|
|
cec0473d1b
|
Merge branch 'develop' into feature/letters
# Conflicts:
# web/ASC.Web.Core/Notify/Actions.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
|
2022-11-02 13:25:49 +03:00 |
|
|
d6656b0aa9
|
Merge pull request #968 from ONLYOFFICE/feature/delete-cultureMiddleware-from-api-system
Feature/delete culture middleware from api system
|
2022-11-02 11:55:17 +03:00 |
|
|
61171d009c
|
Merge pull request #973 from ONLYOFFICE/bugfix/info-option-archive-header-menu
Bugfix/info option archive header menu
|
2022-11-02 11:35:08 +03:00 |
|
TimofeyBoyko
|
8d84bf7faf
|
Web:Client: fix showInfoPanel
|
2022-11-02 13:31:57 +05:00 |
|
TimofeyBoyko
|
0d5f37f316
|
Merge branch 'develop' into bugfix/info-option-archive-header-menu
|
2022-11-02 13:25:17 +05:00 |
|
TimofeyBoyko
|
475467a507
|
Web:Client: fix archive group menu
|
2022-11-02 13:21:26 +05:00 |
|
|
65acd5657e
|
Merge pull request #970 from ONLYOFFICE/bugfix/banner
Bugfix/banner
|
2022-11-02 11:19:44 +03:00 |
|
TimofeyBoyko
|
2c6239f7b9
|
Web:Client: add show-info option to archived rooms at header group menu for mobile devices
|
2022-11-02 13:18:53 +05:00 |
|
Viktor Fomin
|
de0aecddbd
|
Merge branch 'develop' into bugfix/banner
|
2022-11-02 13:16:52 +05:00 |
|
Viktor Fomin
|
7cb855c9d7
|
Client: SmartBanner: fix style
|
2022-11-02 13:15:54 +05:00 |
|
|
097ce33ea6
|
ASC.Socket.IO: added yarn.lock
|
2022-11-02 11:14:01 +03:00 |
|
Viktor Fomin
|
565e61c16c
|
Client: SmartBanner: delete console
|
2022-11-02 13:11:19 +05:00 |
|
Viktor Fomin
|
9701a642a3
|
Client: SmartBanner: fix location change effect
|
2022-11-02 08:40:14 +05:00 |
|
Viktor Fomin
|
9b96c8d6c3
|
Client: SmartBanner: fix
|
2022-11-02 08:24:26 +05:00 |
|
|
560b6ce10c
|
Merge pull request #969 from ONLYOFFICE/bugfix/fixed-hotkeys
Web: Files: fixed hotkeys error
|
2022-11-01 16:29:23 +03:00 |
|
|
5722d73360
|
Web: Files: fixed hotkeys error
|
2022-11-01 16:23:01 +03:00 |
|
|
e765272e7a
|
fixed appsettings.json
|
2022-11-01 15:24:17 +03:00 |
|
|
ac46060c96
|
Merge branch 'develop' into feature/delete-cultureMiddleware-from-api-system
|
2022-11-01 15:17:21 +03:00 |
|
|
43f72c624a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2022-11-01 12:54:31 +03:00 |
|
|
46fa46b9e3
|
ASC.Socket.IO: support CloudWatch transport for winston logger
|
2022-11-01 12:54:14 +03:00 |
|
|
b2444dbae0
|
Merge pull request #967 from ONLYOFFICE/feature/docker-build-check-version
Add check github version
|
2022-11-01 12:48:06 +03:00 |
|
sk81.biz@gmail.com
|
a255f7d1cd
|
Add check github
|
2022-11-01 10:17:29 +03:00 |
|
|
d320c1e9e8
|
Merge pull request #962 from ONLYOFFICE/bugfix/fixed-tags-jump
Web: Files: fixed tag jumping
|
2022-10-31 22:44:36 +03:00 |
|
|
bd59797d50
|
Merge pull request #945 from ONLYOFFICE/feature/active-sessions
Feature/active sessions
|
2022-10-31 22:43:52 +03:00 |
|
|
c2917a1423
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 22:30:24 +03:00 |
|
|
793daf52d3
|
delete cultureMiddleware from api system
|
2022-10-31 17:26:07 +03:00 |
|
Elyor Djalilov
|
7c8b2bf4b2
|
Web:Client:ActiveSessions: minor changes
|
2022-10-31 18:40:01 +05:00 |
|
Elyor Djalilov
|
a4a5a847cf
|
Merge branch 'feature/active-sessions' of github.com:ONLYOFFICE/DocSpace into feature/active-sessions
|
2022-10-31 18:27:13 +05:00 |
|
Elyor Djalilov
|
12824c1f03
|
Web:Client:ActiveSessions: bugfix
|
2022-10-31 18:27:07 +05:00 |
|
|
52b23cbf8b
|
healthcheck: added to ApiSystem/ClearEvents services. refactoring
|
2022-10-31 16:13:45 +03:00 |
|
|
86234d32fd
|
Merge pull request #964 from ONLYOFFICE/bugfix/fixed-integration-route
Web: Setting: fixed integration route
|
2022-10-31 13:18:33 +03:00 |
|
|
0e7bb6447c
|
Web: Setting: fixed integration route
|
2022-10-31 13:15:20 +03:00 |
|
|
7a01578f0c
|
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove "new TenantQuotaController"
|
2022-10-31 13:03:28 +03:00 |
|
|
81b298cf72
|
fix
|
2022-10-31 13:03:02 +03:00 |
|
Elyor Djalilov
|
c4ff1d057c
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 11:24:05 +05:00 |
|
|
50951fac6d
|
Merge branch 'develop' into feature/active-sessions
|
2022-10-31 08:50:06 +03:00 |
|
|
b8314e86e1
|
Merge pull request #958 from ONLYOFFICE/feature/invite-accounts
Feature/invite accounts
|
2022-10-28 20:43:26 +03:00 |
|
|
f7cee67855
|
Create .dockerignore
|
2022-10-28 20:30:32 +03:00 |
|
|
9647236ea8
|
Update Dockerfile.dev
Fix docker git clone layer caching
|
2022-10-28 20:30:20 +03:00 |
|
|
641d63b0a5
|
Update stop.backend.docker.sh
|
2022-10-28 20:29:28 +03:00 |
|
|
e197a7b506
|
Quota: fix
|
2022-10-28 17:35:22 +03:00 |
|
TimofeyBoyko
|
14c6770d85
|
Merge branch 'feature/invite-accounts' of github.com:ONLYOFFICE/DocSpace into feature/invite-accounts
|
2022-10-28 18:27:02 +05:00 |
|
TimofeyBoyko
|
6db2ace603
|
Web:Client:EmptyContainer: fix rooms description for free user
|
2022-10-28 18:26:54 +05:00 |
|
|
ef10f570f5
|
Files: fixed incorrect setting user type
|
2022-10-28 16:24:58 +03:00 |
|
|
556c0b8041
|
People: renamed IsDocSpaceAdmin to IsAdmin
|
2022-10-28 16:23:41 +03:00 |
|
TimofeyBoyko
|
ed33f59c96
|
Web:Client:Files: enable archive routes for free users
|
2022-10-28 18:21:49 +05:00 |
|
TimofeyBoyko
|
f0178d6c95
|
Web:Client:Article: fix catalog items for visitors
|
2022-10-28 18:20:48 +05:00 |
|
|
0baa36c1c0
|
GetDataStore tenant string to int
|
2022-10-28 15:23:51 +03:00 |
|