Elyor Djalilov
|
b8348af578
|
Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
# packages/client/public/locales/en/DeleteDialog.json
# packages/client/public/locales/en/Files.json
# packages/client/public/locales/en/InfoPanel.json
# packages/client/public/locales/en/InviteDialog.json
# packages/client/public/locales/en/Payments.json
# packages/client/public/locales/en/Profile.json
# packages/client/public/locales/en/Settings.json
# packages/client/public/locales/en/Translations.json
# packages/client/public/locales/ru/Files.json
# packages/client/public/locales/ru/InfoPanel.json
# packages/client/public/locales/ru/Payments.json
# packages/client/src/components/GlobalEvents/RenameEvent.js
# packages/client/src/pages/Home/Section/Filter/index.js
|
2022-11-25 16:27:23 +05:00 |
|
|
|
14aae505bc
|
Merge pull request #1061 from ONLYOFFICE/bugfix/access-rights
Bugfix/access rights
|
2022-11-24 22:15:08 +03:00 |
|
|
|
a714937a2c
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-24 22:14:26 +03:00 |
|
|
|
f8165f7640
|
Fixed Dockerfile.dev after merge
|
2022-11-24 21:36:13 +03:00 |
|
|
|
b77c6c9c03
|
Update Dockerfile.dev
Fix unknown "service_migration" variable
|
2022-11-24 21:35:00 +03:00 |
|
|
|
fa0146416b
|
Update docspace.dev.yml
Restored variables for nginx upstream
|
2022-11-24 21:23:38 +03:00 |
|
|
|
23a7210fbc
|
Merge branch 'develop' into bugfix/access-rights
|
2022-11-24 20:33:59 +03:00 |
|
|
|
18b89b1517
|
nlog: fixed
|
2022-11-24 19:18:27 +03:00 |
|
Sergey Kirichenko
|
dfa948d5b3
|
Delete docker services (#1081)
|
2022-11-24 17:47:27 +03:00 |
|
|
|
db7dffe624
|
refactoring
|
2022-11-24 17:22:34 +03:00 |
|
|
|
ac8293d7f7
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2022-11-24 17:22:02 +03:00 |
|
|
|
8d421a3b24
|
refactoring
|
2022-11-24 17:21:34 +03:00 |
|
|
|
c040870df1
|
Update build.backend.docker.ps1
|
2022-11-24 17:20:02 +03:00 |
|
|
|
6765a2eeb8
|
Merge pull request #1079 from ONLYOFFICE/bugfix/crlf-docker-build
Bugfix/crlf docker build
|
2022-11-24 16:06:38 +03:00 |
|
|
|
924a317839
|
Merge pull request #1080 from ONLYOFFICE/bugfix/save-as-dialog
Bugfix/save as dialog
|
2022-11-24 16:02:45 +03:00 |
|
|
|
35698e1ea6
|
Web: Added temp path.
|
2022-11-24 16:00:32 +03:00 |
|
|
|
6933d668eb
|
Build: Added passing variable from command line
|
2022-11-24 15:39:38 +03:00 |
|
|
|
90db4721d6
|
Web: Fixed getting the correct folder when opening a dialog inside a room.
|
2022-11-24 15:33:10 +03:00 |
|
|
|
97b0fe6e75
|
Merge branch 'develop' into bugfix/crlf-docker-build
|
2022-11-24 15:09:33 +03:00 |
|
|
|
1f56cdf94b
|
Build: Commented ASC.Notify and ASC.ApiSystem for Dockerfile.dev
|
2022-11-24 15:05:06 +03:00 |
|
|
|
28e1cb31a7
|
Build: Fixed warning with empty APP_DOTNET_ENV
|
2022-11-24 15:01:18 +03:00 |
|
|
|
d8dd8669b0
|
Build: Added .bat files: build.backend.docker.bat, start.backend.docker.bat, stop.backend.docker.bat, restart.backend.docker.bat, clear.backend.docker.bat
|
2022-11-24 15:00:42 +03:00 |
|
|
|
ee04a7a55c
|
removed unused dependencies
|
2022-11-24 14:40:13 +03:00 |
|
|
|
d9c7bd924e
|
Web: Added opening a document when saving a copy in the editor.
|
2022-11-24 13:56:30 +03:00 |
|
|
|
c0c8572ff9
|
Build: Renamed build.docker.bat to build.backend.docker.bat
|
2022-11-24 13:40:06 +03:00 |
|
|
|
c4323a7e7d
|
Build: Removed from build: MigrationService, TelegramService, UrlShortenerService, Webhooks Server images
|
2022-11-24 13:38:07 +03:00 |
|
|
|
ec40329427
|
Build: Fixed issue with CLRF on windows docker build
|
2022-11-24 13:36:40 +03:00 |
|
|
|
950ab06035
|
removed build urlshortener.bat
|
2022-11-24 13:08:21 +03:00 |
|
|
|
ed40f2509c
|
Merge pull request #1078 from ONLYOFFICE/bugfix/fixed-remove-third-party-room
Web: Files: fixed delete third-party room
|
2022-11-24 12:23:40 +03:00 |
|
|
|
0a8f262826
|
fix
|
2022-11-24 12:14:38 +03:00 |
|
|
|
043bf639c7
|
Web: Files: fixed delete third-party room
|
2022-11-24 11:59:02 +03:00 |
|
|
|
e647ed59f2
|
Merge pull request #1077 from ONLYOFFICE/feature/new-slnf
Feature/new slnf
|
2022-11-24 11:35:07 +03:00 |
|
|
|
372d104161
|
Merge branch 'develop' into feature/new-slnf
|
2022-11-24 11:27:30 +03:00 |
|
|
|
eca223a45f
|
Merge pull request #1062 from ONLYOFFICE/feature/custom-theme
Feature/custom theme
|
2022-11-23 20:12:51 +03:00 |
|
|
|
d3d91ba54e
|
Merge branch 'develop' into feature/custom-theme
|
2022-11-23 19:57:15 +03:00 |
|
|
|
5e8ffb9585
|
Merge pull request #1076 from ONLYOFFICE/feature/win-docker
Feature/win docker
|
2022-11-23 19:43:52 +03:00 |
|
|
|
2f73ecb0cc
|
Merge branch 'feature/win-docker' of https://github.com/ONLYOFFICE/DocSpace into feature/win-docker
|
2022-11-23 19:24:02 +03:00 |
|
|
|
57b257b9af
|
Removed useless builds in docker dev for k8s
|
2022-11-23 19:23:56 +03:00 |
|
|
|
bd4ec8c77a
|
Fix docker dev mysql version
|
2022-11-23 19:22:55 +03:00 |
|
|
|
3ceb194d5d
|
Build: .env up MySQL version to 8.0.31
|
2022-11-23 19:07:08 +03:00 |
|
|
|
cd1751536e
|
Merge branch 'develop' into feature/win-docker
|
2022-11-23 18:56:55 +03:00 |
|
|
|
0d65c0dccf
|
revert
|
2022-11-23 18:54:59 +03:00 |
|
|
|
284c329f70
|
Core: autodetect mysql version
|
2022-11-23 18:45:33 +03:00 |
|
|
|
df450b1dd3
|
added slnf
|
2022-11-23 18:26:50 +03:00 |
|
|
|
faf2b40abd
|
Web:Client:Add color theme in link.
|
2022-11-23 18:19:49 +03:00 |
|
|
|
10d2859441
|
Web:Client:Add color theme.
|
2022-11-23 17:50:29 +03:00 |
|
|
|
0ee0cdadcc
|
Web:Common:Removed adding a theme for the buttons that are in the top panel when working with a file.
|
2022-11-23 17:33:24 +03:00 |
|
|
|
c68bca73c8
|
Web:Client:Add theme.
|
2022-11-23 17:22:13 +03:00 |
|
|
|
9bc8eb5455
|
Web:Client:Fix.
|
2022-11-23 16:32:27 +03:00 |
|
|
|
531b469d90
|
Build: Fixed typo
|
2022-11-23 16:24:35 +03:00 |
|
