|
403388fbf1
|
Added solution filter
Removed unused services
replaced sh with bat
start service from source
|
2021-10-25 14:29:36 +03:00 |
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
Vashchuk Nikita
|
82abf11109
|
Merge branch 'develop' into feature/calendar
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
# products/ASC.Calendar/Server/ASC.Calendar.csproj
# products/ASC.Calendar/Server/Controllers/CalendarController.cs
# products/ASC.Calendar/Server/Program.cs
# products/ASC.Calendar/Server/Properties/launchSettings.json
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
# products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
# products/ASC.Calendar/Server/Startup.cs
|
2021-05-18 13:24:02 +03:00 |
|
|
8816e535c1
|
merge from develop
|
2021-04-28 19:50:59 +03:00 |
|
|
6a4fed2d2c
|
Init Calendar Server back-end
|
2021-04-21 21:47:27 +03:00 |
|
|
63a8caeb97
|
Init Mail Server back-end
|
2021-04-21 19:00:38 +03:00 |
|
NikitaVashchuk
|
6256c906f6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
# Conflicts:
# ASC.Web.sln
# config/autofac.products.json
# config/nginx/onlyoffice.conf
|
2021-04-05 18:29:13 +03:00 |
|
|
c0582c1130
|
merge from develop
|
2021-04-01 16:28:36 +03:00 |
|
|
61cfd029d9
|
Added CRM
|
2021-01-26 20:36:03 +03:00 |
|
|
69922e7c48
|
Added ASC.Projects
|
2021-01-26 12:32:31 +03:00 |
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
NikolayRechkin
|
005d287f1e
|
Merge branch 'master' into feature/calendar
|
2020-03-06 10:02:14 +03:00 |
|
|
911662df96
|
removed files
|
2020-02-28 16:23:30 +03:00 |
|
NikolayRechkin
|
edf8915867
|
Merge branch 'master' into feature/calendar
|
2020-02-27 16:52:11 +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 |
|
|
4ca24f0077
|
Files: Init Files.Client
|
2020-02-25 09:58:09 +03:00 |
|
NikolayRechkin
|
be5e845438
|
init Calendar
|
2020-02-12 10:58:31 +03:00 |
|
|
89efaf9d26
|
Consumers: added config
|
2019-12-20 14:17:01 +03:00 |
|
|
73308504b3
|
Added ability to connect external products
|
2019-06-26 12:26:36 +03:00 |
|