Commit Graph

79 Commits

Author SHA1 Message Date
197f468bf7 Removed unused proto, added backup rewrite 2020-06-25 19:05:14 +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
2782d9f64c Merge branch 'master' into feature/ef
# Conflicts:
#	common/ASC.VoipService/Dao/CachedVoipDao.cs
#	common/ASC.VoipService/Dao/VoipDao.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2019-12-23 16:25:33 +03:00
8a931c29ae Consumers: added config 2019-12-20 16:12:59 +03:00
89efaf9d26 Consumers: added config 2019-12-20 14:17:01 +03:00
61b4a295e3 EF: added support mysql 8.0 2019-12-18 15:25:32 +03:00
0d2da8219c Nginx: fix 2019-12-11 18:36:51 +03:00
5ab0487e55 Nginx: public env 2019-12-11 18:15:10 +03:00
NikolayRechkin
858757fd86 PWA: renamed images for pwa 2019-12-11 15:18:55 +03:00
NikolayRechkin
c6ba00ae87 PWA: added update of cached items and the use of a fallback page 2019-12-11 12:41:22 +03:00
7185a54427 PWA: nginx conf 2019-12-05 18:26:43 +03:00
NikolayRechkin
c0c69badf3 first version of a progressive web application 2019-12-03 17:04:40 +03:00
162225a118 fixed config 2019-11-15 18:06:02 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
503f163483 fixed mysql test settings 2019-10-08 22:39:00 +03:00
bc52b0508e Revert "fixed test connection string"
This reverts commit f9b2ce01fc.
2019-09-27 17:37:23 +03:00
f9b2ce01fc fixed test connection string 2019-09-27 17:32:39 +03:00
18a9c846b8 Notify: added email sender 2019-09-25 13:36:22 +03:00
ed2caea266 fix config 2019-09-24 14:25:14 +03:00
12b6b06533 Config: added cultures 2019-09-23 16:22:14 +03:00
1b0f8617e1 Nginx: batch.json 2019-09-10 16:07:39 +03:00
422ed49134 Added storage route 2019-09-09 16:28:43 +03:00
6cae722b9d kafka disabled by default 2019-08-23 15:49:23 +03:00