|
|
cfdc6d495e
|
Merge branch 'master' into feature/files
|
2020-06-26 09:46:04 +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 |
|
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
|
2fe2c2167b
|
Merge branch 'master' into feature/thumbnails
# Conflicts:
# ASC.Web.sln
|
2020-06-25 15:01:38 +03:00 |
|
|
|
8afdad8eb4
|
docker: select branch
|
2020-06-24 16:51:29 +00:00 |
|
|
|
be09fc0510
|
docker: change config/supervisor/supervisord.conf
|
2020-06-23 19:40:01 +00:00 |
|
|
|
453c812476
|
docker update
|
2020-06-23 18:10:13 +00:00 |
|
|
|
11cf2a954f
|
docker: mysql sample data
|
2020-06-23 19:55:14 +03:00 |
|
|
|
62e179fae0
|
update dockerfile
|
2020-06-23 15:31:48 +00:00 |
|
SuhorukovAnton
|
6f4bd59c6d
|
Thumbnails: refactoring
|
2020-06-21 14:45:31 +03:00 |
|
SuhorukovAnton
|
103de233e9
|
Thumbnails: fix
|
2020-06-17 14:00:28 +03:00 |
|
|
|
fc0826b60d
|
Backup: service, progress
|
2020-06-16 14:34:44 +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 |
|
|
|
90d93db14c
|
FileService: bat and launchSettings
|
2020-05-08 11:35:04 +03:00 |
|
|
|
8bbe383e78
|
Added url shortener service install scripts
|
2020-03-05 14:56:07 +03:00 |
|
NikolayRechkin
|
edf8915867
|
Merge branch 'master' into feature/calendar
|
2020-02-27 16:52:11 +03:00 |
|
NikolayRechkin
|
c18543485b
|
Merge branch 'master' into feature/calendar
|
2020-02-26 14:46:42 +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 |
|
|
|
af40cd8ca7
|
web: files: Fixed TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received type undefined
|
2020-02-25 11:56:41 +03:00 |
|
|
|
4ca24f0077
|
Files: Init Files.Client
|
2020-02-25 09:58:09 +03:00 |
|
|
|
00246f7f9f
|
Files: Startup
|
2020-02-12 13:48:58 +03:00 |
|
NikolayRechkin
|
be5e845438
|
init Calendar
|
2020-02-12 10:58:31 +03:00 |
|
|
|
e33caf13dd
|
Jenkinsfile: chat_id to credentials
|
2020-01-15 13:35:21 +03:00 |
|
|
|
f3da100abe
|
fixed message
|
2020-01-15 12:13:42 +03:00 |
|
|
|
39ceff556a
|
Jenkins: fixed telegram message
|
2020-01-15 11:47:33 +03:00 |
|
|
|
d298e09b0b
|
Removed publishCoverageGithub
|
2020-01-14 23:13:42 +03:00 |
|
|
|
abd5e307be
|
fix
|
2020-01-14 22:21:49 +03:00 |
|
|
|
8332ba4502
|
Revert "fix"
This reverts commit af425365f4.
|
2020-01-14 21:38:25 +03:00 |
|
|
|
af425365f4
|
fix
|
2020-01-14 18:57:04 +03:00 |
|
|
|
184a7febf2
|
Jenkinsfile: fix
|
2020-01-14 18:40:32 +03:00 |
|
|
|
13c3bbc780
|
fix
|
2020-01-14 18:15:52 +03:00 |
|
|
|
fbb75572f9
|
Jenkinsfile: added when
|
2020-01-14 18:10:07 +03:00 |
|
|
|
4330c3b4c3
|
JenkinsFile: publishCoverageGithub and telegram message
|
2020-01-14 17:44:56 +03:00 |
|
|
|
c3d38416a2
|
fix message
|
2020-01-14 16:54:22 +03:00 |
|
|
|
cee6b77cbd
|
Jenkinsfile: fix
|
2020-01-14 16:34:21 +03:00 |
|
|
|
2cb0e94b6b
|
Jenkins: telegram to end
|
2020-01-14 16:07:05 +03:00 |
|
|
|
6f91f1bbf6
|
Jenkisfile: publishCoverage
|
2020-01-14 15:28:14 +03:00 |
|
|
|
cc6eb2a4fb
|
fix
|
2020-01-14 14:06:56 +03:00 |
|
|
|
059989ba90
|
Jenkinsfile: fix cobertura
|
2020-01-14 13:54:46 +03:00 |
|
|
|
38451fd460
|
Jenkinsfile: temp echo.Added cobertura
|
2020-01-14 13:41:38 +03:00 |
|
|
|
c040b1718e
|
Jenkinsfile: test
|
2020-01-14 12:05:28 +03:00 |
|
|
|
58f001f2a3
|
Jenkinsfile: telegram token to credentials, skipdefaultcheckout
|
2020-01-14 11:44:48 +03:00 |
|
|
|
82189388ca
|
fix
|
2020-01-13 18:50:59 +03:00 |
|
|
|
b69e86325f
|
Fix
|
2020-01-13 18:46:28 +03:00 |
|
|
|
27d03a8cd5
|
fix
|
2020-01-13 18:31:49 +03:00 |
|
|
|
90f5723f48
|
fix
|
2020-01-13 18:23:42 +03:00 |
|
|
|
b1bd5a2b01
|
fix
|
2020-01-13 18:18:24 +03:00 |
|
|
|
ff67ff6f2d
|
fix
|
2020-01-13 18:12:12 +03:00 |
|
|
|
6abbe5a81d
|
fix
|
2020-01-13 18:06:53 +03:00 |
|
|
|
3e2a78e046
|
Added telegram step
|
2020-01-13 18:04:05 +03:00 |
|
|
|
7c6a9f09a5
|
Added telegram step
|
2020-01-13 18:02:17 +03:00 |
|
|
|
7c080b9804
|
Jenkins: fixed test
|
2020-01-13 16:51:06 +03:00 |
|
|
|
88a2c9637d
|
Jenkinsfile: fix
|
2020-01-13 16:22:41 +03:00 |
|
|
|
9173603032
|
fix
|
2020-01-13 16:05:16 +03:00 |
|
|
|
b4342db200
|
fix
|
2020-01-13 15:56:11 +03:00 |
|
|
|
71b8b49ed2
|
fix
|
2020-01-13 15:52:40 +03:00 |
|
|
|
5a4ae07ca8
|
fix
|
2020-01-13 15:51:09 +03:00 |
|
|
|
8c1a49c66c
|
fix
|
2020-01-13 15:49:49 +03:00 |
|
|
|
9a6bf07ada
|
fix
|
2020-01-13 15:44:26 +03:00 |
|
|
|
d6513a3291
|
fix
|
2020-01-13 15:38:44 +03:00 |
|
|
|
5f150ed505
|
fix
|
2020-01-13 15:36:30 +03:00 |
|
|
|
eac26ebcf7
|
fix
|
2020-01-13 15:11:47 +03:00 |
|
|
|
05003c34b7
|
Jenkinsfile: added windows build
|
2020-01-08 16:28:12 +03:00 |
|
|
|
549f928c2f
|
Jenkinsfile: added matrix
|
2020-01-08 16:06:12 +03:00 |
|
|
|
e40bbe0bb6
|
Jenkinsfile: added matrix
|
2020-01-08 16:02:43 +03:00 |
|
|
|
a824681768
|
Jenkinsfile: sequental build stage
|
2020-01-08 15:34:06 +03:00 |
|
|
|
de2b072d83
|
removed batch.sh
|
2020-01-08 15:28:27 +03:00 |
|
|
|
7ad678faba
|
Added build.sh
|
2020-01-08 15:04:59 +03:00 |
|
|
|
4bb2b542f3
|
Jenkkinsfile: added scripts
|
2020-01-08 14:58:21 +03:00 |
|
|
|
ff82fea65d
|
build\scripts\components renamed to components.bat
|
2020-01-08 14:22:52 +03:00 |
|
|
|
00e8be08a9
|
fix
|
2020-01-08 14:05:05 +03:00 |
|
|
|
e523cebfe3
|
fix
|
2020-01-08 14:02:55 +03:00 |
|
|
|
5101fcbf06
|
Jenkinsfile: added script for building components
|
2020-01-08 14:01:37 +03:00 |
|
|
|
680b94a61c
|
fix path
|
2020-01-08 12:51:08 +03:00 |
|
|
|
21d6753a69
|
Jenkinsfile: publish coverage
|
2020-01-08 12:44:53 +03:00 |
|
|
|
10e65286bd
|
fix
|
2020-01-07 22:35:05 +03:00 |
|
|
|
be5068127b
|
Jenkinsfile: test
|
2020-01-07 22:28:24 +03:00 |
|
|
|
2fe6d4b559
|
Jenkinsfile: added test
|
2020-01-07 22:20:31 +03:00 |
|
|
|
a74cf994db
|
Jenkinsfile: fixed post
|
2020-01-07 22:13:56 +03:00 |
|
|
|
fe2942286d
|
Jenkinsfile: added test Stage
|
2020-01-07 22:12:23 +03:00 |
|
|
|
c50988c49e
|
Jenkinsfile: added parallel build people
|
2020-01-07 13:21:04 +03:00 |
|
|
|
a434a49505
|
Jenkinsfile: added build scripts
|
2020-01-06 20:01:31 +03:00 |
|
|
|
f79c86a4f5
|
Jenkinsfile: added build scripts
|
2020-01-06 19:57:19 +03:00 |
|
|
|
4332aa13c8
|
Jenkinsfile: fix agent
|
2020-01-06 14:31:29 +03:00 |
|
|
|
0705324c90
|
Jenkinsfile: agent
|
2020-01-06 14:27:40 +03:00 |
|
|
|
040a2d0d6b
|
Jenkinsfile: Hello World
|
2020-01-06 14:15:57 +03:00 |
|
|
|
ea3147af98
|
Update Dockerfile
|
2019-12-16 16:06:06 +03:00 |
|
|
|
5eeff88737
|
web: New packages fixes
|
2019-12-13 16:58:09 +03:00 |
|
|
|
fdfaae8abe
|
Docker: .net core up to 3.1
|
2019-12-09 15:19:18 +03:00 |
|
|
|
0b1feec7af
|
Docker: added ASC.Web.Common
|
2019-12-05 12:14:03 +03:00 |
|
|
|
32a4cb576a
|
web: Common: Added install packages/asc-web-common dependencies
|
2019-11-26 13:51:30 +03:00 |
|
|
|
49d5000cd2
|
Merge branch 'master' into feature/asc-web-common
|
2019-11-15 15:29:57 +03:00 |
|
|
|
740942d938
|
docker: rename repo
|
2019-11-15 10:45:27 +00:00 |
|
|
|
fcc4e4605f
|
Common nlog config
|
2019-11-15 11:47:56 +03:00 |
|
|
|
f07f71cf59
|
docker: add libgdiplus package
|
2019-11-14 14:29:17 +00:00 |
|
|
|
cb057a35ea
|
Merge branch 'master' into feature/asc-web-common
|
2019-11-14 16:39:54 +03:00 |
|
|
|
1f246aac8b
|
docker: add libgdiplus package
|
2019-11-14 13:32:24 +00:00 |
|
|
|
19acdd4a6e
|
web: Common: Init commit of new js library for common code of any App in AppServer
|
2019-11-12 14:55:22 +03:00 |
|
|
|
f1f313a1bf
|
docker: bug fix
|
2019-10-11 15:34:49 +00:00 |
|
|
|
54f3cc778d
|
docker: init commit
|
2019-10-08 15:00:41 +00:00 |
|
|
|
921d919485
|
publish: delete folder before run
|
2019-09-11 11:38:16 +03:00 |
|
|
|
57866b8ce3
|
win: init commit
|
2019-09-10 18:20:33 +03:00 |
|
|
|
01e2b38e5c
|
snap: delete obsolete files
|
2019-09-10 16:45:51 +03:00 |
|
|
|
297b91e560
|
add publish file
|
2019-09-10 16:40:33 +03:00 |
|
|
|
3718f92829
|
fixed STORAGE_ROOT path
|
2019-09-10 10:41:46 +03:00 |
|
|
|
0a5ef37043
|
Getting STORAGE_ROOT from env variable
|
2019-09-09 18:04:28 +03:00 |
|
|
|
025fa319ee
|
web: Removed ASC.Web.Storybook
|
2019-09-08 20:01:46 +03:00 |
|
|
|
3341b343d1
|
snap package: init
|
2019-09-04 15:33:02 +00:00 |
|
|
|
38b13e0d70
|
build run as admin
|
2019-09-03 14:12:19 +03:00 |
|
|
|
2aeec3ea68
|
web: New packages fixes
|
2019-08-29 16:23:47 +03:00 |
|
|
|
b2d5272658
|
web: components: Changed dist.package.json to dynamic creation of package.json by rollup-plugin: "rollup-plugin-generate-package-json"
|
2019-08-19 16:19:55 +03:00 |
|
|
|
79178a0edc
|
Changed folder for asc-web-components (npm-local/ -> packages/); Added react-calendar v2.13.2 (with important fix)
|
2019-08-19 13:30:18 +03:00 |
|
|
|
eec14c838b
|
build: Removed annoying reinstall npm-local
|
2019-08-02 14:07:07 +03:00 |
|
|
|
3036e1cb90
|
Added ASC.Studio.Notify service
|
2019-08-01 11:47:15 +03:00 |
|
|
|
62dee4b3bf
|
Added notify service
|
2019-07-29 12:15:48 +03:00 |
|
|
|
f9fe9daa48
|
build: Added removing npm-local and coping node_modules
|
2019-07-18 12:17:28 +03:00 |
|
|
|
973ea1cee7
|
build: Removed duplicated echo command
|
2019-07-18 11:13:54 +03:00 |
|
|
|
c1ea615a18
|
build: Added yarn link to asc-web-components
|
2019-07-18 10:57:35 +03:00 |
|
|
|
a7148cb793
|
npm install changed to yarn
|
2019-07-17 16:46:08 +03:00 |
|
|
|
28b8cb0dfe
|
Build: Added rebuild.bat
|
2019-07-16 12:48:05 +03:00 |
|
|
|
59d9d723ba
|
fix check
|
2019-07-16 10:32:09 +03:00 |
|
|
|
34c64aacca
|
fix check
|
2019-07-15 19:01:33 +03:00 |
|
|
|
d8eb13ec69
|
check tool
|
2019-07-15 18:54:19 +03:00 |
|
|
|
ff1d098eac
|
temp fix cra bug with public_url in development mode
|
2019-07-15 12:33:28 +03:00 |
|
|
|
26baaa8124
|
Build: removed building people client
|
2019-07-12 17:29:52 +03:00 |
|
|
|
355278cfd1
|
Requesting administrative privileges for install/uninstall/start/stop
|
2019-07-11 16:02:33 +03:00 |
|
|
|
5bd6bf7197
|
Server: remove watch(api/lock people)
|
2019-07-11 14:17:08 +03:00 |
|
|
|
a194b2a2c4
|
Stop services before build
fix dotnet services
|
2019-07-11 14:08:20 +03:00 |
|
|
|
1af2396d38
|
Start/stop, install/uninstall services via nssm
|
2019-07-11 13:24:10 +03:00 |
|
|
|
fd0f9f3d15
|
Build: run npm with --prefix
|
2019-07-10 19:00:37 +03:00 |
|
|
|
273c99c414
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
Conflicts:
build/build.bat
|
2019-07-10 11:29:42 +03:00 |
|
|
|
2458bc2944
|
ASC.People project is divided into two separate parts: Server and Client
|
2019-07-10 11:21:12 +03:00 |
|
|
|
38fd000896
|
fix build
|
2019-07-09 22:01:12 +03:00 |
|
|
|
d1c6a7d82e
|
fixed build
|
2019-07-09 18:04:47 +03:00 |
|
|
|
9afc8a1da1
|
Moved Storybook to separated ASC.Web.Storybook folder (issue: 'git clean -xdf' removes storybook files every time)
|
2019-07-09 17:54:30 +03:00 |
|
|
|
38ea0329b7
|
Fixed build
|
2019-07-09 16:04:59 +03:00 |
|
|
|
d1a42da028
|
fix build
|
2019-07-09 15:20:36 +03:00 |
|
|
|
3d250a0ce0
|
ASC.Web.Client: added package-lock.json
|
2019-07-09 15:19:12 +03:00 |
|
|
|
d93d0fe901
|
Build ASC.Web.Client
|
2019-07-09 15:12:39 +03:00 |
|
|
|
96ca6e122e
|
remove log
|
2019-07-09 15:03:20 +03:00 |
|
|
|
fdbf80e76a
|
build: Added additional bat files for start
|
2019-07-09 15:01:06 +03:00 |
|
|
|
409fa4934d
|
use npm ci instead of npm install
|
2019-07-09 14:15:40 +03:00 |
|
|
|
1ad03ec6d8
|
Added auth to StorageHandler
|
2019-07-09 13:29:53 +03:00 |
|
|
|
832a2a8a71
|
fixed build
|
2019-07-08 13:49:42 +03:00 |
|
|
|
95b2467f76
|
Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore
|
2019-07-05 17:17:23 +03:00 |
|
|
|
73ba76d57b
|
People as external product
nginx reverse proxy
|
2019-07-05 16:58:04 +03:00 |
|
|
|
37a3cce40c
|
Build: Added build storybook
|
2019-07-05 11:55:44 +03:00 |
|
|
|
73308504b3
|
Added ability to connect external products
|
2019-06-26 12:26:36 +03:00 |
|
|
|
c56dc09985
|
Build: log and pause
|
2019-06-07 17:34:51 +03:00 |
|
|
|
c2d61517a5
|
Added ASC.Api.Core.csproj
added build.bat
PeopleController replaced to ASC.People
|
2019-05-29 17:44:37 +03:00 |
|
