Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-24 16:29:09 +01:00
Code Issues Packages Projects Releases Activity
11,451 Commits 40 Branches 210 Tags
4e326fe7e5be625b680f3b8a72a955bc29cf8885
Commit Graph

11451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
4e326fe7e5 Merge pull request #1416 from scm-manager/feature/hg_hooks_over_tcp 
Feature/hg hooks over tcp
 2020-11-27 13:12:07 +01:00
René Pfeuffer
d732100935 Fix typo 2020-11-27 13:11:42 +01:00
René Pfeuffer
5f130c685c Fix german text 2020-11-27 11:49:13 +01:00
Sebastian Sdorra
52f26ab9e7 Merge with develop branch 2020-11-27 10:47:47 +01:00
Sebastian Sdorra
136cdbb6b0 Fix broken HgVersionCommand 
Use waitFor instead of exitValue to wait for process to finish
 2020-11-27 10:46:37 +01:00
René Pfeuffer
ef60880e20 Merge pull request #1450 from scm-manager/bugfix/content_detection_interpreter_parameter 
Fix language detection of files with interpreter parameters
 2020-11-27 09:04:26 +01:00
Sebastian Sdorra
8ee8c8b351 Merge branch 'develop' into feature/hg_hooks_over_tcp 
# Conflicts:
#	CHANGELOG.md
 2020-11-27 08:57:09 +01:00
René Pfeuffer
c442d9271e Merge pull request #1451 from scm-manager/snyk-upgrade-a3ff3c60d389420077910272327f99b5 
[Snyk] Upgrade org.assertj:assertj-core from 3.17.2 to 3.18.0
 2020-11-27 08:54:30 +01:00
Sebastian Sdorra
3e19f28cc0 Do not use socket.MSG_WAITALL 2020-11-27 08:50:22 +01:00
Sebastian Sdorra
7357d83b73 Use DataInputStream and DataOutputStream instead of manual reading and writing 2020-11-27 08:10:18 +01:00
snyk-bot
2a2324bbc3 fix: upgrade org.assertj:assertj-core from 3.17.2 to 3.18.0 
Snyk has created this PR to upgrade org.assertj:assertj-core from 3.17.2 to 3.18.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.assertj/assertj-core/

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/4ac22872-f5a6-4220-bfe8-e6e5bf4c5fcb?utm_source=github&utm_medium=upgrade-pr
 2020-11-27 01:00:30 +00:00
Sebastian Sdorra
79a9b56135 Fix language detection of files with interpreter parameters 
Update spotter to version 3.0.1 in order to fix language detection of
files with a shebang which contains a parameter e.g. /usr/bin/make -f
 2020-11-26 16:06:33 +01:00
Sebastian Sdorra
aaeeed0ea5 Update smp plugin to version 1.4.0 2020-11-26 15:33:04 +01:00
Sebastian Sdorra
490b566066 Merge pull request #1447 from scm-manager/feature/validate_translation_files 
Validate translation files
 2020-11-26 15:18:52 +01:00
René Pfeuffer
ac9804004a Merge pull request #1440 from scm-manager/feature/unify_key_views 
Feature/unify key views
 2020-11-26 11:03:30 +01:00
René Pfeuffer
c476b3757b Clarify texts 2020-11-26 11:01:01 +01:00
Florian Scholdei
1402e377f2 Update CHANGELOG.md 2020-11-26 09:37:58 +01:00
Florian Scholdei
db31f72658 Small typo in documentation 2020-11-26 09:37:40 +01:00
Florian Scholdei
dc4bc2b32b Update documentation 2020-11-26 09:37:40 +01:00
Florian Scholdei
ba9143d78e Unify key views across all user settings 2020-11-26 09:37:40 +01:00
René Pfeuffer
f390830e83 Merge pull request #1439 from scm-manager/feature/commit_date_for_branch 
Feature "Commit Date for Branch"
 2020-11-26 09:37:23 +01:00
René Pfeuffer
bbd9160b18 Clean up imports 2020-11-26 09:24:09 +01:00
René Pfeuffer
58cbe1a535 Improve readability 2020-11-26 09:00:40 +01:00
René Pfeuffer
dcc848eb4b Update docs 
Co-authored-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
 2020-11-26 09:00:23 +01:00
Eduard Heimbuch
713b57a212 Merge pull request #1444 from scm-manager/dependabot/maven/scm-webapp/com.cronutils-cron-utils-9.1.3 
Bump cron-utils from 8.1.1 to 9.1.3 in /scm-webapp
 2020-11-26 08:59:13 +01:00
René Pfeuffer
9119d2c075 Adapt documentation 2020-11-26 08:32:06 +01:00
René Pfeuffer
07cf290370 Do not render last commit date when it's missing 2020-11-26 08:32:06 +01:00
René Pfeuffer
7a47e68707 Make stale state computation configurable 2020-11-26 08:32:06 +01:00
René Pfeuffer
518a1118fc Log change 2020-11-26 08:32:03 +01:00
René Pfeuffer
0988ec5c7b Compute stale flag depending on default branch 
A branch should be considered as stale, when it's commit wai more than
30 days older than the commit of the default branch.
 2020-11-26 08:31:14 +01:00
René Pfeuffer
a2341f3ce2 Do not mark default branch as stale 2020-11-26 08:31:14 +01:00
René Pfeuffer
9d25a93558 Distinct between active and stale branches 2020-11-26 08:31:14 +01:00
René Pfeuffer
541933a03a Show last commit of branch in ui 2020-11-26 08:31:14 +01:00
René Pfeuffer
4d4f89dc7e Read last commit date for hg branches 2020-11-26 08:31:14 +01:00
René Pfeuffer
f0f7ddc444 Add test for hg branches command 2020-11-26 08:31:14 +01:00
René Pfeuffer
181806f84b Read last commit date for git branches 2020-11-26 08:31:14 +01:00
René Pfeuffer
6adba1bad2 Add lastCommitDate to branch 2020-11-26 08:31:14 +01:00
Eduard Heimbuch
b59616572a Merge pull request #1413 from scm-manager/snyk-upgrade-8c5af34ae9866fb87ba851f86530a074 
[Snyk] Upgrade com.github.spullara.mustache.java:compiler from 0.9.6-scm1 to 0.9.7
 2020-11-26 08:03:08 +01:00
René Pfeuffer
14659a47a0 Merge pull request #1441 from scm-manager/feature/repository_overview_tooltips 
Feature/repository overview tooltips
 2020-11-25 15:47:55 +01:00
René Pfeuffer
dce761d017 Add test to validate translation files in ui 2020-11-25 14:58:00 +01:00
René Pfeuffer
8e7d0d87af Validate 'plugins.json' files from core 2020-11-25 10:31:42 +01:00
dependabot[bot]
13906dce2d Bump cron-utils from 8.1.1 to 9.1.3 in /scm-webapp 
Bumps [cron-utils](https://github.com/jmrozanec/cron-utils) from 8.1.1 to 9.1.3.
- [Release notes](https://github.com/jmrozanec/cron-utils/releases)
- [Commits](https://github.com/jmrozanec/cron-utils/compare/8.1.1...9.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-11-25 00:29:15 +00:00
Florian Scholdei
f918615df9 Merge with upstream 2020-11-25 00:15:32 +01:00
CES Marvin
4752fdeea1 prepare for next development iteration 2020-11-24 18:59:15 +00:00
Jenkins Agent User
7f807bcfa0 Merge branch 'master' into develop 2020-11-24 18:58:46 +00:00
CES Marvin
b283f782ab release version 2.10.1 2.10.1 2020-11-24 18:22:43 +00:00
René Pfeuffer
f3d25e0440 Merge pull request #1442 from scm-manager/feature/improve_plugin_update_logging 
Improve logging for plugin update installation
 2020-11-24 18:52:15 +01:00
Florian Scholdei
f65f3222ee Update documentation, storyshots 2020-11-24 18:35:07 +01:00
René Pfeuffer
f4b8a40f59 Adjust changelog for release 2.10.1 2020-11-24 18:32:44 +01:00
René Pfeuffer
c6139c647e Log change 2020-11-24 18:31:18 +01:00