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 |
|
|
|
78f406f4d3
|
Merge pull request #1084 from ONLYOFFICE/bugfix/payments-page-loading
Bugfix/payments page loading
|
2022-11-25 14:13:03 +03:00 |
|
|
|
f929e42dcb
|
Merge branch 'develop' into bugfix/fix-article-iphone
|
2022-11-25 14:04:37 +03:00 |
|
|
|
ac236c8399
|
Web: Fixed checks.
|
2022-11-25 13:24:27 +03:00 |
|
|
|
4a0bb69db9
|
Merge branch 'develop' into feature/subject-filter
|
2022-11-25 13:21:40 +03:00 |
|
|
|
95ff7c57e8
|
Web: Changed dependency array.
|
2022-11-25 13:08:34 +03:00 |
|
|
|
e2e81982f9
|
SocketIO: new rooms and events
|
2022-11-25 12:42:15 +03:00 |
|
|
|
a8ebab9510
|
Web: Deleted useless code.
|
2022-11-25 12:37:19 +03:00 |
|
|
|
e02b4ec633
|
Web: Changed the check for getting a link to an account.
|
2022-11-25 12:33:48 +03:00 |
|
|
|
0999986a8c
|
Web: Renamed function.
|
2022-11-25 12:32:43 +03:00 |
|
|
|
4469e4aa63
|
Web: Added waiting for receiving information on the tariff on the payment page.
|
2022-11-25 12:31:18 +03: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 |
|
Elyor Djalilov
|
8f4d6eb638
|
bugfix/157: badge style fixed
|
2022-11-24 20:08:46 +05:00 |
|
Elyor Djalilov
|
0697454a59
|
bugfix/157: badge style fixed
|
2022-11-24 20:07:23 +05:00 |
|
Elyor Djalilov
|
5870df42bc
|
bugfix/156: tooltip style fixed
|
2022-11-24 20:03:23 +05:00 |
|
Elyor Djalilov
|
6daf5a2670
|
bugfix/156: tooltip style fixed
|
2022-11-24 19:57:40 +05:00 |
|
Elyor Djalilov
|
e186950190
|
bugfix/156: tooltip style fixed
|
2022-11-24 19:56:37 +05:00 |
|
|
|
130532927b
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-24 17:56:32 +03:00 |
|
Elyor Djalilov
|
bbb1afb7ec
|
bugfix/156: tooltip style fixed
|
2022-11-24 19:54:30 +05:00 |
|
Sergey Kirichenko
|
dfa948d5b3
|
Delete docker services (#1081)
|
2022-11-24 17:47:27 +03:00 |
|
Elyor Djalilov
|
b7de4a5ab0
|
bugfix/156: tooltip style fixed
|
2022-11-24 19:40:19 +05: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 |
|
mushka
|
5db2980ed2
|
fix 2
|
2022-11-24 15:26:03 +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 |
|
