|
a4b2f18f0e
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 18:44:13 +03:00 |
|
|
c12dbbe3d7
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# packages/client/public/locales/az/CreateEditRoomDialog.json
# packages/client/public/locales/hy-AM/Payments.json
|
2023-04-05 18:43:49 +03:00 |
|
Viktor Fomin
|
64afc0d5b7
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 18:42:10 +03:00 |
|
Viktor Fomin
|
1c3da6de97
|
Client: Confirm: CreateUser: check oAuth enabled
|
2023-04-05 18:42:02 +03:00 |
|
|
890b6bf613
|
Add translations
|
2023-04-05 18:37:37 +03:00 |
|
|
2f059d4a18
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0
|
2023-04-05 18:26:37 +03:00 |
|
|
4f7dcbd4cb
|
Web:Client:Delete styles.
|
2023-04-05 18:26:14 +03:00 |
|
|
0e8b484765
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 18:24:17 +03:00 |
|
|
d06c04eccf
|
fixed first visit
|
2023-04-05 18:07:35 +03:00 |
|
|
84d1a9a899
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# packages/client/public/locales/pl/DeleteDialog.json
# packages/client/public/locales/ro/Payments.json
# packages/client/public/locales/ro/Translations.json
|
2023-04-05 17:44:00 +03:00 |
|
|
48e011ea19
|
Add translations: nl, pl, ro, sk, tr
|
2023-04-05 17:37:15 +03:00 |
|
NikitaVashchuk
|
69230b5dc6
|
added change-quota-feature-value for CountRoomFeature and FreeFeature
|
2023-04-05 19:30:59 +05:00 |
|
|
5d0c9f8f18
|
Web: Article: Added missed prop.
|
2023-04-05 17:30:30 +03:00 |
|
|
746826fcce
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 17:03:38 +03:00 |
|
|
0c4d1f8810
|
added translations
|
2023-04-05 17:03:14 +03:00 |
|
|
6d5d3e57cf
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 16:55:05 +03:00 |
|
|
cd87de9540
|
fixed date format in room history
|
2023-04-05 16:54:33 +03:00 |
|
|
aecb015cfe
|
Web: Components: Row: fixed filename click
|
2023-04-05 16:44:08 +03:00 |
|
|
597e047320
|
Web: Login: added health route
|
2023-04-05 14:41:38 +03:00 |
|
|
a9cdf6f841
|
Web: Editor: added health route
|
2023-04-05 14:41:26 +03:00 |
|
Viktor Fomin
|
ea3a48ad32
|
Common: Components: LoginContainer: fix style
|
2023-04-05 14:41:13 +03:00 |
|
Viktor Fomin
|
d301a3e8dd
|
Login: fix tooltip position
|
2023-04-05 14:31:36 +03:00 |
|
|
8d6e51a16f
|
fix
|
2023-04-05 12:54:02 +03:00 |
|
|
2d9f979cad
|
Web: Article: Added missed imports.
|
2023-04-05 11:12:32 +03:00 |
|
|
0d1ec03952
|
Merge branch 'feature/quota-via-websocket' of https://github.com/ONLYOFFICE/DocSpace into feature/quota-via-websocket
|
2023-04-05 10:57:43 +03:00 |
|
|
eccef4ae77
|
Web: PortalSettings: Payments: Refactoring.
|
2023-04-05 10:57:21 +03:00 |
|
|
e35e8f1369
|
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
|
2023-04-05 11:20:45 +04:00 |
|
|
f11c62892e
|
Merge branch 'feature/quota-via-websocket' of https://github.com/ONLYOFFICE/DocSpace into feature/quota-via-websocket
|
2023-04-05 09:27:04 +03:00 |
|
|
b85aeb0926
|
Web: PortalSettings: Payments: Refactoring.
|
2023-04-05 09:26:59 +03:00 |
|
Akmal Isomadinov
|
c094a49e41
|
Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-05 10:44:11 +05:00 |
|
Akmal Isomadinov
|
a5ec1923ef
|
Web:Locales:En:Common Fixed translation
|
2023-04-05 10:38:34 +05:00 |
|
|
edefc8e959
|
fix
|
2023-04-04 20:01:33 +03:00 |
|
|
e043518f1f
|
edited line 246
|
2023-04-04 19:02:07 +03:00 |
|
|
9bdbfe09d6
|
added translations
|
2023-04-04 18:52:06 +03:00 |
|
|
04e0078af9
|
added translations
|
2023-04-04 18:45:32 +03:00 |
|
|
2f5405a4d4
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
# Conflicts:
# public/locales/en/Common.json
|
2023-04-04 18:44:08 +03:00 |
|
|
4cb671c761
|
Add translations
|
2023-04-04 18:41:28 +03:00 |
|
|
e7b2e0916b
|
added translations
|
2023-04-04 18:38:04 +03:00 |
|
|
a9c53b944f
|
Merge pull request #1329 from ONLYOFFICE/features/return-zendesk-and-book-a-training
add ZendeskKey and BookTrainingEmail in SettingsDto
|
2023-04-04 19:23:22 +04:00 |
|
|
1fd451fa2d
|
Merge branch 'release/v1.0.0' into features/return-zendesk-and-book-a-training
|
2023-04-04 19:22:09 +04:00 |
|
|
fd3eac23b7
|
Web: Added bookTrainingEmail from settings api
|
2023-04-04 19:18:07 +04:00 |
|
|
6e53c7cee0
|
Web: Added zendeskKey from settings api
|
2023-04-04 19:07:30 +04:00 |
|
|
675778cc2d
|
empty "zendesk-key"
|
2023-04-04 17:44:43 +03:00 |
|
|
33769c73eb
|
Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0
|
2023-04-04 16:38:15 +03:00 |
|
|
0aa56967dc
|
Web: Fixed translations.
|
2023-04-04 16:38:02 +03:00 |
|
|
7a86276e81
|
Web: Article: Fixed alerts styles.
|
2023-04-04 16:36:07 +03:00 |
|
Sergey Kirichenko
|
2238a82444
|
Add docker healthchek for dotnet containers (#1330)
|
2023-04-04 18:34:14 +05:00 |
|
NikitaVashchuk
|
bcdab67ba0
|
fix notify webSocket about rooms count
|
2023-04-04 18:10:15 +05:00 |
|
|
97320379c5
|
Web: Files: fixed operationId
|
2023-04-04 15:52:43 +03:00 |
|
NikitaVashchuk
|
1827dead7e
|
fix problems with notify about count paid users
|
2023-04-04 17:23:46 +05:00 |
|