maksim
|
7481b25ad4
|
ASC.Data.Storage.Migration: transferring from the old solution to the new one
|
2020-08-18 16:46:50 +03:00 |
|
Artem Tarasov
|
034d60707d
|
fixed link
|
2020-08-12 13:08:24 +03:00 |
|
|
|
cc50145275
|
Fix license path
|
2020-08-10 20:17:27 +03:00 |
|
Artem Tarasov
|
d463a4ab25
|
fixed bugs upload incorrect file license after upload current
|
2020-08-10 18:25:04 +03:00 |
|
Artem Tarasov
|
b8d42d53ed
|
fixed language
|
2020-08-07 22:02:55 +03:00 |
|
Artem Tarasov
|
3b8796ca93
|
refactoring
|
2020-08-07 13:39:53 +03:00 |
|
Artem Tarasov
|
c4ba6adee2
|
fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout
|
2020-08-06 00:01:41 +03:00 |
|
Artem Tarasov
|
555eac84b8
|
add method getIsRequiredLicense
|
2020-08-03 22:04:49 +03:00 |
|
|
|
178bf82c28
|
Settings: fix
|
2020-08-03 17:06:37 +03:00 |
|
|
|
72ae1f5e9b
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-31 16:49:54 +03:00 |
|
|
|
c325cb139d
|
Settings: added authproviders and login.ashx
|
2020-07-28 11:13:49 +03:00 |
|
Artem Tarasov
|
1a8aacebdc
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 13:13:47 +03:00 |
|
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
|
|
7f095f03d1
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Resource.Manager/Startup.cs
# config/kafka.json
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
# web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
# web/ASC.Web.Core/TariffSettings.cs
|
2020-07-15 15:23:28 +03:00 |
|
Artem Tarasov
|
84ca1146a0
|
layout fix
|
2020-07-14 17:46:00 +03:00 |
|
|
|
ded7034ba7
|
Files: fix convert
|
2020-07-03 13:36:31 +03:00 |
|
|
|
461fc55f22
|
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
|
2020-06-28 16:23:36 +03:00 |
|
|
|
36e0d6a200
|
Thumb: fix
|
2020-06-26 12:55:19 +03:00 |
|
|
|
7cafc968eb
|
Thumb: fix
|
2020-06-26 12:40:46 +03:00 |
|
|
|
29a0e752bb
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
# web/ASC.Web.Api/Controllers/PortalController.cs
|
2020-06-25 19:21:42 +03:00 |
|
|
|
197f468bf7
|
Removed unused proto, added backup rewrite
|
2020-06-25 19:05:14 +03:00 |
|
SuhorukovAnton
|
103de233e9
|
Thumbnails: fix
|
2020-06-17 14:00:28 +03:00 |
|
|
|
38c40eec05
|
Merge branch 'master' into feature/backup
|
2020-06-15 18:40:26 +03:00 |
|
|
|
2f8e09f915
|
fix
|
2020-06-10 17:22:48 +03:00 |
|
|
|
5aef887fe1
|
test: fix
|
2020-06-10 11:49:50 +03:00 |
|
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
SuhorukovAnton
|
26f2107590
|
Backup: refactoring
|
2020-06-04 13:47:22 +03:00 |
|
SuhorukovAnton
|
89368aed8b
|
Backup: refactoring
|
2020-06-03 12:15:05 +03:00 |
|
SuhorukovAnton
|
1796c682a4
|
Backup: add backup.json and BackupSettings.cs, fix BackupWorker
|
2020-06-01 13:33:39 +03:00 |
|
|
|
1700ba1965
|
UrlShortener: config
|
2020-05-22 12:41:14 +03:00 |
|
|
|
3fadf8db6c
|
fix log, added UrlShortenerService config
|
2020-05-21 11:03:35 +03:00 |
|
|
|
02dd1e9e31
|
Merge branch 'master' into feature/urlshortener
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/DependencyInjection/AutofacExtension.cs
|
2020-05-20 18:18:31 +03:00 |
|
|
|
d08a564946
|
ApiSystem: service, config, di
|
2020-05-19 20:41:37 +03:00 |
|
|
|
eef99a3e96
|
Files: ChunkedUploaderHandler
|
2020-04-20 11:08:04 +03:00 |
|
|
|
f5e90209b9
|
Files: fixed configs
|
2020-04-16 16:49:24 +03:00 |
|
|
|
1dbdb1aedd
|
Files: configuration
|
2020-04-15 18:39:59 +03:00 |
|
|
|
12436fb832
|
Files: FileHandler
|
2020-04-14 16:32:31 +03:00 |
|
|
|
ef806e6c2b
|
Added url shortener service launcher
|
2020-03-05 14:55:12 +03:00 |
|
|
|
db5a4586f1
|
fixed test config
|
2020-03-03 17:27:32 +03:00 |
|
|
|
911662df96
|
removed files
|
2020-02-28 16:23:30 +03:00 |
|
|
|
190341c716
|
Files: renamed filescontroller
|
2020-02-27 11:22:42 +03:00 |
|
|
|
b0bb74d7ee
|
removed product
|
2020-02-26 13:02:26 +03:00 |
|
|
|
c1c8bab59d
|
Files: api
|
2020-02-26 13:01:12 +03:00 |
|
|
|
a78dad4064
|
web: files: Fixed proxy configure for images and socketjs
|
2020-02-26 11:04:26 +03:00 |
|
|
|
9800bfed8e
|
web: files: Added onlyoffice-files.conf
|
2020-02-26 11:03:13 +03:00 |
|
|
|
ac5017da99
|
Merge branch 'master' into feature/elastic
# Conflicts:
# build/build.bat
# build/rebuild.bat
|
2020-02-26 10:46:37 +03:00 |
|
|
|
2ccd226940
|
web: clients: Fixed CRA proxy bug;
|
2020-02-26 10:02:37 +03:00 |
|
|
|
4ca24f0077
|
Files: Init Files.Client
|
2020-02-25 09:58:09 +03:00 |
|
|
|
7a8baecb2a
|
Files: ef, di
|
2020-02-19 11:37:52 +03:00 |
|
|
|
c24d15806a
|
fix config
|
2020-01-31 10:58:22 +03:00 |
|
