Commit Graph

10291 Commits

Author SHA1 Message Date
Sebastian Sdorra
24dd6b6f1c merge with develop 2020-07-02 07:09:18 +02:00
Sebastian Sdorra
999c2672e3 remove self compiled mercurial and use latest from apk 2020-07-02 07:03:48 +02:00
Sebastian Sdorra
3f857fec04 rename UnixAutoConfigurator to PosixAutoConfigurator and make it match for linux systems 2020-07-02 07:02:51 +02:00
Sebastian Sdorra
2bb865bf5c fixes python module path detection 2020-07-01 15:28:37 +02:00
Sebastian Sdorra
17d31b80e0 implemented a new auto configuration mechanism for mercurial on unix
This new mechanism is more robust and should find python and python3 installations
2020-07-01 15:01:14 +02:00
eheimbuch
aef7a581c6 Merge pull request #1227 from scm-manager/bugfix/restart_with_jsvc
Fixes restart on deb or rpm installations
2020-07-01 14:26:37 +02:00
eheimbuch
ea65f9698f Merge branch 'develop' into bugfix/restart_with_jsvc 2020-07-01 14:26:26 +02:00
Sebastian Sdorra
4061cc6b73 added python 3 support to fielview hg extension 2020-07-01 11:10:39 +02:00
René Pfeuffer
5935e1b49b Merge pull request #1230 from scm-manager/bugfix/debian_installation
adds missing architecture to debian installation documentation
2020-07-01 07:37:28 +02:00
Sebastian Sdorra
d26873f9c6 adds missing architecture to debian installation documentation 2020-07-01 07:12:32 +02:00
Sebastian Sdorra
4acedc1a8d merge with develop branch 2020-06-30 16:46:15 +02:00
Sebastian Sdorra
88f9645126 added changelog entry 2020-06-30 16:44:01 +02:00
Sebastian Sdorra
0720878a19 make scmhooks compatible between python 2 and 3 2020-06-30 16:40:34 +02:00
Sebastian Sdorra
3a4896091b make scmhooks compatible with python 2 and 3 2020-06-30 16:40:01 +02:00
eheimbuch
bc2403903a Merge pull request #1221 from scm-manager/bugfix/migration_with_empty_security_xml
fixes broken migration with an empty security.xml
2020-06-30 15:43:19 +02:00
Sebastian Sdorra
9f1d1f85ec added pr link to changelog 2020-06-30 11:18:32 +02:00
Sebastian Sdorra
dac25f5456 restart service on rpm or deb package upgrade 2020-06-30 11:13:06 +02:00
Sebastian Sdorra
8165032e43 fixes restart on rpm or deb installations
Removes jsvc from rpm and deb package and makes more use of systemd
2020-06-30 10:55:22 +02:00
Florian Scholdei
f0aac8db11 Correct default develop branch in README.md 2020-06-30 09:20:11 +02:00
eheimbuch
4e5d3067c8 Merge pull request #1226 from scm-manager/bugfix/readme
Fix links in README.md
2020-06-30 08:59:03 +02:00
René Pfeuffer
4438ff712a Fix links 2020-06-30 08:01:06 +02:00
René Pfeuffer
528432c2be Fix versions 2020-06-30 07:48:36 +02:00
Sebastian Sdorra
fe2111559a fixed hg clone on python 3 2020-06-29 16:13:05 +02:00
Sebastian Sdorra
f301d174d3 remove old python scripts which are not used in v2 2020-06-29 15:25:00 +02:00
Sebastian Sdorra
813b8db3ca update javahg to version 0.15-scm1 2020-06-29 15:15:03 +02:00
Eduard Heimbuch
19adcd22f1 update storyshots 2020-06-29 14:56:00 +02:00
Sebastian Sdorra
64df54e601 fixes broken migration with an empty security.xml 2020-06-29 14:22:31 +02:00
eheimbuch
3eae7cf813 Merge pull request #1215 from scm-manager/feature/indeterminate_checkbox
Modify checkboxes so that they can be indeterminate
2020-06-29 11:47:10 +02:00
Eduard Heimbuch
52e1eb4008 merge with develop 2020-06-29 11:46:10 +02:00
Sebastian Sdorra
dd5c381db0 added pre-commit hook which lints js and ts files 2020-06-29 08:33:46 +02:00
Sebastian Sdorra
995a59ccd8 added ca-certificates to fix mercurial hooks in some cases 2020-06-29 07:37:06 +02:00
René Pfeuffer
20c6628c02 Merge pull request #1217 from scm-manager/bugfix/missing_at_package_on_debian
fix installation of debian packages on distros without preinstalled "at"
2020-06-26 15:33:56 +02:00
Sebastian Sdorra
3d7254260f update changelog 2020-06-26 10:00:44 +02:00
Sebastian Sdorra
3405ad4203 fix installation of debian packages on distros without preinstalled "at"
This fix will replace the use of "at" with a "nohup" in background.
"nohup" is part of coreutils and should be installed on all debian
based distributions.
2020-06-26 10:00:44 +02:00
Eduard Heimbuch
c18719e573 fix unit test 2020-06-25 13:24:48 +02:00
René Pfeuffer
0623f039cc Heed review comments 2020-06-24 17:44:30 +02:00
René Pfeuffer
c5a2d04789 Modify checkboxes so that they can be indeterminate
To add the third state, we create our own checkboxes using font awesome
icons.
2020-06-24 17:44:26 +02:00
Eduard Heimbuch
149b6cbc2a update storyshots 2020-06-24 16:15:27 +02:00
eheimbuch
2e076960d5 Merge pull request #1210 from scm-manager/feature/commit_mention_links_markdown
enrich commit mentions by internal links
2020-06-24 15:29:57 +02:00
eheimbuch
d651f7a2e4 Merge branch 'develop' into feature/commit_mention_links_markdown 2020-06-24 15:29:39 +02:00
Eduard Heimbuch
0eeddd5103 enrich commit mentions by internal links e. g. "repoNamespace/repoName@commitId" 2020-06-24 15:26:50 +02:00
Sebastian Sdorra
a64fad9622 update winsw to v2.9.0 2020-06-24 07:07:20 +02:00
CES Marvin
c5f2502e6f prepare for next development iteration 2020-06-23 16:22:47 +00:00
CES Marvin
e5c7b4eda4 release version 2.1.1 2.1.1 2020-06-23 15:34:23 +00:00
René Pfeuffer
137f4e1eae Adjust changelog for release 2.1.1 2020-06-23 17:28:58 +02:00
René Pfeuffer
b2f68a2004 Merge remote-tracking branch 'origin/support/2.1.x' into develop
# Conflicts:
#	CHANGELOG.md
2020-06-23 17:26:34 +02:00
Sebastian Sdorra
1009a52b49 Merge pull request #1213 from scm-manager/bugfix/fix_git_migration_non_bare
Fix migration of non-bare git repositories
2020-06-23 16:20:07 +02:00
René Pfeuffer
086a471161 Fix migration of non-bare git repositories
During the migration of git repositories from v1 to v2, we have to
create an "scmm" config section with the repository id of the current
repository. If this does not happen, further write requests to this
repository will fail, because the hooks cannot determine the id.

However, the migration failed to write this configuration for non-bare
repositories. Therefore this fix checks beforehand, whether a '.git'
folder exists in the date directory. If this is the case, we assume that
this is a non-bare repository and write the config file inside this
folder.
2020-06-23 11:47:52 +02:00
René Pfeuffer
fa8311990a Merge branch 'support/2.1.x' into develop 2020-06-23 11:04:48 +02:00
René Pfeuffer
e4ca2c2490 Prepare support version 2020-06-23 11:01:46 +02:00