Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-20 14:32:12 +01:00
Code Issues Packages Projects Releases Activity
11,177 Commits 38 Branches 210 Tags
14ccd2776bf08c38d7fbdbd3848707ea76fa15fd
Commit Graph

11177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastian Sdorra
14ccd2776b Merge pull request #1404 from scm-manager/bugfix/branches_link 
Fix branches link
 2020-11-02 16:54:07 +01:00
Sebastian Sdorra
66024f249d Merge branch 'develop' of github.com:scm-manager/scm-manager into develop 2020-11-02 10:43:15 +01:00
Sebastian Sdorra
b6b0736cd9 Make JwtAccessTokenBuilderTest more robust 2020-11-02 10:41:21 +01:00
René Pfeuffer
5f99ece3bb Fix branches link 
Without the trailing '/' further links like 'create' will lead to
illegal links because they will not be appended but will replace the
'branches' part.
 2020-11-02 10:08:49 +01:00
René Pfeuffer
68d6d71c71 Merge pull request #1400 from scm-manager/bugfix/svn_diff_prop_changes 
Fix svn diff with property changes
 2020-11-02 09:54:38 +01:00
Sebastian Sdorra
5de4b49392 Improve display of binary values in svn diff 2020-11-02 09:16:47 +01:00
Sebastian Sdorra
7e575036a3 Exclude SCMSvnDiffGenerator from SonarQube duplication report 
SCMSvnDiffGenerator is a copy of an internal SVNKit class, with small changes for SCM-Manger.
If we refactor the class, it could become very hard to merge it with upstream.
So we decided to stop duplication reports for this class.
 2020-11-02 08:41:30 +01:00
Sebastian Sdorra
a336d2c676 Fix svn diff with property changes 2020-11-02 08:41:27 +01:00
René Pfeuffer
42299281ab Merge pull request #1397 from scm-manager/bugfix/git_submodule_without_tree 
Bugfix/git submodule without tree
 2020-10-30 19:17:43 +01:00
eheimbuch
b48bf24834 Merge pull request #1380 from scm-manager/feature/user_converter 
Feature/user converter
 2020-10-30 12:41:51 +01:00
Eduard Heimbuch
0c8fe5a60c confirm password modal by enter key / fix password link for logged in user 2020-10-30 11:48:05 +01:00
Eduard Heimbuch
6d0881d3d9 Merge branch 'feature/user_converter' of github.com:scm-manager/scm-manager into feature/user_converter 2020-10-30 11:13:01 +01:00
Eduard Heimbuch
333de7c404 fix unit tests 2020-10-30 11:12:32 +01:00
Sebastian Sdorra
25e1cc15d8 Merge pull request #1398 from scm-manager/snyk-upgrade-a5f222792632f71468e28c52cce9e071 
[Snyk] Upgrade mini-css-extract-plugin from 0.11.3 to 0.12.0
 2020-10-30 08:38:53 +01:00
Sebastian Sdorra
a63f2ca5e7 Fix javadoc links 2020-10-29 15:31:54 +01:00
Sebastian Sdorra
c76f2efff2 Fix javadoc links 2020-10-29 15:14:41 +01:00
Sebastian Sdorra
991de4bf8b Merge with develop 2020-10-29 15:05:23 +01:00
snyk-bot
f49bbae6a1 fix: upgrade mini-css-extract-plugin from 0.11.3 to 0.12.0 
Snyk has created this PR to upgrade mini-css-extract-plugin from 0.11.3 to 0.12.0.

See this package in npm:
https://www.npmjs.com/package/mini-css-extract-plugin

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/e563ed8d-dedf-4b52-af75-5d89b1e70f44?utm_source=github&utm_medium=upgrade-pr
 2020-10-29 04:41:32 +00:00
Sebastian Sdorra
a9dac9b1a2 Fix some SonarQube warnings 2020-10-28 17:03:30 +01:00
Sebastian Sdorra
ecab3ce13b Fix internal server error for git sub modules without tree object 2020-10-28 17:00:12 +01:00
René Pfeuffer
5c755cd0c9 Merge pull request #1395 from scm-manager/bugfix/svn_commit_zero 
Do not expose subversion commit with id 0
 2020-10-28 15:02:30 +01:00
Eduard Heimbuch
baefc9f9a3 external flag is not optional 2020-10-28 12:58:40 +01:00
Sebastian Sdorra
6ebc131a42 Suppress non fixable SonarQube issue 2020-10-28 11:46:39 +01:00
Sebastian Sdorra
d9b5d86c05 Do not expose subversion commit with id 0 2020-10-28 11:44:35 +01:00
Eduard Heimbuch
a842f0f78c fix CHANGELOG.md 2020-10-28 08:43:31 +01:00
Eduard Heimbuch
23cc02ec99 Merge branch 'develop' into feature/user_converter 2020-10-28 08:42:26 +01:00
Eduard Heimbuch
76dac8bc6b mind review findings 2020-10-28 08:42:13 +01:00
Sebastian Sdorra
200deed11f Update winsw to version 2.10.3 2020-10-28 07:49:09 +01:00
CES Marvin
520db79a38 prepare for next development iteration 2020-10-27 08:35:13 +00:00
CES Marvin
1db75f4cf3 release version 2.8.0 2.8.0 2020-10-27 08:00:25 +00:00
Eduard Heimbuch
d2591256b8 Adjust changelog for release 2.8.0 2020-10-27 08:54:26 +01:00
Eduard Heimbuch
c1a018a00d update javadoc 2020-10-27 08:24:52 +01:00
Sebastian Sdorra
557f726b9f Update storyshots 2020-10-26 17:03:03 +01:00
eheimbuch
bef98ecd03 Merge pull request #1387 from scm-manager/bugfix/diff_syntax_highlighting_css_conflict 
Fix css conflicts on diff syntaxhighlighting by using a css module
 2020-10-26 15:36:41 +01:00
Sebastian Sdorra
99dae1c1bc Fix css syntax highlighting conflict with bulma title 2020-10-26 15:24:54 +01:00
Sebastian Sdorra
6021832788 Merge pull request #1388 from scm-manager/bugfix/no_jwt_token_with_api_key 
Do not create web tokens for api keys
 2020-10-26 10:53:16 +01:00
René Pfeuffer
6002e560ef Heed review remarks 2020-10-26 10:19:59 +01:00
René Pfeuffer
1ca18cd44c Do not create web tokens for api keys 
This fixes a way for privilege escalation with api keys.
 2020-10-26 10:19:59 +01:00
Sebastian Sdorra
ab5043eb93 Merge pull request #1389 from scm-manager/snyk-fix-c4395030b33d727dd0bbb27e1cab632d 
[Snyk] Security upgrade org.eclipse.jetty:jetty-webapp from 9.4.31.v20200723 to 9.4.33.v20201020
 2020-10-26 07:29:53 +01:00
Sebastian Sdorra
19bd660ddb Indent css module 2020-10-24 13:30:38 +02:00
Sebastian Sdorra
8140619c3c Replace wrong selector mozselect with -moz-select 2020-10-24 13:28:00 +02:00
snyk-bot
97a7921818 fix: pom.xml to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1021614
 2020-10-23 21:16:05 +00:00
Sebastian Sdorra
5f30cf8f30 Fix css conflicts on diff syntaxhighlighting by using a css module 2020-10-23 13:52:10 +02:00
eheimbuch
ea1eab6356 Merge pull request #1386 from scm-manager/bugfix/golang_syntaxhighlighting 
Fix syntax highlighting for go files
 2020-10-23 12:48:55 +02:00
eheimbuch
b8c419792e Merge branch 'develop' into feature/user_converter 2020-10-23 12:08:23 +02:00
Eduard Heimbuch
c5c999c750 update storyshots 2020-10-23 11:59:15 +02:00
Sebastian Sdorra
0d31ad2138 Fix syntax highlighting for go files 2020-10-23 10:35:13 +02:00
Eduard Heimbuch
0cce79786a update screenshots in documentation 2020-10-23 08:59:27 +02:00
Eduard Heimbuch
e8b07aaae1 fix translations 2020-10-23 08:54:56 +02:00
René Pfeuffer
d2d237e0c2 Merge pull request #1385 from scm-manager/bugfix/logging_error_reading_api_token 
Reduce logging of ApiTokenRealm
 2020-10-23 08:15:22 +02:00