|
|
da96e47773
|
Web: Files: get campaigns translations from firebase
|
2021-09-07 12:48:41 +03:00 |
|
|
|
c46ebd5af9
|
Web: Common: get campaigns translations from firebase
|
2021-09-07 12:48:22 +03:00 |
|
|
|
24e13fb79d
|
Web: deleted campaigns locales
|
2021-09-07 12:47:53 +03:00 |
|
|
|
432e58f9cd
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
|
2021-09-06 11:43:35 +03:00 |
|
|
|
1e77063d32
|
fix Bug 51866
|
2021-09-05 22:59:14 +03:00 |
|
|
|
64e23cf324
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2021-09-05 21:09:52 +03:00 |
|
|
|
d06b67a420
|
Jenkins: release build
|
2021-09-05 21:09:43 +03:00 |
|
|
|
7f74e3f6c6
|
Merge pull request #334 from ONLYOFFICE/feature/backup.core
Feature/backup.core
|
2021-09-05 13:10:28 +03:00 |
|
|
|
d099326e7f
|
Merge branch 'develop' into feature/backup.core
# Conflicts:
# common/services/ASC.Data.Backup/Program.cs
|
2021-09-05 12:50:05 +03:00 |
|
|
|
9cb01be544
|
Elastic: removed unused isInit
|
2021-09-03 18:05:05 +03:00 |
|
|
|
d78195aa5a
|
Added notify
|
2021-09-03 18:04:06 +03:00 |
|
|
|
211224ca1a
|
Storage: fix S3
|
2021-09-02 23:49:59 +03:00 |
|
|
|
c5b135afbe
|
backup.core: remove waste
|
2021-09-02 16:11:41 +03:00 |
|
|
|
8171563965
|
backup.core: move backup.core
|
2021-09-02 15:41:54 +03:00 |
|
|
|
61946283e5
|
fix 52181
|
2021-09-02 15:15:30 +03:00 |
|
|
|
a8f9b6a096
|
Files: removed empty queries
|
2021-09-01 19:22:30 +03:00 |
|
|
|
9f69a836ca
|
Merge pull request #333 from ONLYOFFICE/feature/compare-files-in-editor
Feature/compare files in editor
|
2021-09-01 16:05:43 +03:00 |
|
|
|
bdc190de13
|
Merge branch 'develop' into feature/compare-files-in-editor
|
2021-09-01 15:46:58 +03:00 |
|
|
|
fe0193a284
|
Merge pull request #335 from ONLYOFFICE/feature/chunk-size-setting
Feature/chunk size setting
|
2021-09-01 15:36:42 +03:00 |
|
|
|
ed171ecb9d
|
Merge branch 'develop' into feature/chunk-size-setting
|
2021-09-01 15:01:06 +03:00 |
|
|
|
de373f09fa
|
Web: Files: added default chunkUploadSize
|
2021-09-01 14:50:46 +03:00 |
|
|
|
7b4cb77321
|
fix 52181
|
2021-09-01 14:37:42 +03:00 |
|
|
|
99903b3fab
|
Merge branch 'develop' into feature/compare-files-in-editor
|
2021-09-01 10:25:39 +03:00 |
|
|
|
fce956991e
|
nginx: fix
|
2021-08-31 18:38:59 +03:00 |
|
|
|
b4c5edfa21
|
Merge branch 'develop' into feature/backup.core
|
2021-08-31 17:58:07 +03:00 |
|
|
|
83a269ec4a
|
Merge branch 'develop' into feature/chunk-size-setting
|
2021-08-31 17:37:53 +03:00 |
|
|
|
9b7464a894
|
Web: Client: Files: UploadDataStore: Fixed upload chunk value, now it get from settings
|
2021-08-31 17:35:46 +03:00 |
|
|
|
abaf381a09
|
Files: increase limits
|
2021-08-31 17:03:51 +03:00 |
|
|
|
d8654444c6
|
backup.core: fix
|
2021-08-31 16:59:32 +03:00 |
|
|
|
115d752582
|
backup.core: fix
|
2021-08-31 15:43:40 +03:00 |
|
|
|
a6b55a7496
|
Files: settings. Added ChunkUploadSize
|
2021-08-31 14:34:30 +03:00 |
|
|
|
a812971c07
|
Merge branch 'develop' into feature/backup.core
|
2021-08-31 13:55:47 +03:00 |
|
|
|
4b3cb1b4fb
|
backup.core: first version
|
2021-08-31 12:40:28 +03:00 |
|
|
|
a84bddad3c
|
fix
|
2021-08-30 19:17:57 +03:00 |
|
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
|
|
c4fb8be12a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-08-30 16:54:41 +03:00 |
|
|
|
d7ea8a84a7
|
Merge branch 'develop' into feature/compare-files-in-editor
|
2021-08-27 17:18:34 +03:00 |
|
|
|
43ee204e80
|
Merge pull request #312 from ONLYOFFICE/feature/table-view
Feature/table view
|
2021-08-27 16:26:29 +03:00 |
|
|
|
cd66c4ffdb
|
Web: Editor: Refactoring.
|
2021-08-27 14:21:51 +03:00 |
|
|
|
45865753a2
|
Web: Components: Table: fixed onResize error
|
2021-08-27 14:18:13 +03:00 |
|
|
|
beb2a6c707
|
Web:Editor: Refactoring.
|
2021-08-27 14:13:50 +03:00 |
|
|
|
3c0638482d
|
Web: Files: fixed getHeaderMenu
|
2021-08-27 14:07:51 +03:00 |
|
|
|
a4d12a2c75
|
Web: Files: removed console.log
|
2021-08-27 14:06:24 +03:00 |
|
|
|
19290bf8cb
|
Web: Editor: Added translation for documents type.
|
2021-08-27 13:46:03 +03:00 |
|
|
|
7fba408991
|
Web: Editor: Added option "Compare files" for editor.
|
2021-08-27 13:25:23 +03:00 |
|
|
|
4f30eb9a2a
|
Web: removed duplicate translations from Common.json
|
2021-08-27 11:09:19 +03:00 |
|
|
|
f740b63fa5
|
Web: Components: fixed hasAccess
|
2021-08-26 17:50:27 +03:00 |
|
|
|
6bb9cb2235
|
Web: People: fixed user access for module People
|
2021-08-26 17:47:21 +03:00 |
|
|
|
833cd9553c
|
Web: Files: fixed FilesTableRow after merge
|
2021-08-26 16:20:02 +03:00 |
|
|
|
ff7f3926ce
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
|
2021-08-26 16:05:15 +03:00 |
|
