Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-29 18:59:11 +01:00
Code Issues Packages Projects Releases Activity
12,416 Commits 40 Branches 210 Tags
369e369ea32bdd4e8ceb8ea64eaadff446cbefdb
Commit Graph

12416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Konstantin Schaper
bd5b54d6de update storyshots 2020-10-21 15:22:15 +02:00
Konstantin Schaper
f9dab3dc42 Merge branch 'develop' into feature/user_converter 2020-10-21 14:34:57 +02:00
Konstantin Schaper
13134df198 Merge remote-tracking branch 'origin/feature/syntax-highlighting' into feature/syntax-highlighting 2020-10-21 14:29:05 +02:00
Konstantin Schaper
74f180f14a fix ui annotate glitch 2020-10-21 14:28:52 +02:00
Konstantin Schaper
66abe18fa2 Update CHANGELOG.md 2020-10-21 14:16:19 +02:00
Konstantin Schaper
79882725c9 Update CHANGELOG.md 2020-10-21 14:15:44 +02:00
Konstantin Schaper
97d207f16d Merge branch 'develop' into feature/syntax-highlighting 2020-10-21 14:14:25 +02:00
Konstantin Schaper
405ab92575 fix typo 2020-10-21 13:20:01 +02:00
Konstantin Schaper
626f322b88 update changelog 2020-10-21 13:19:50 +02:00
eheimbuch
bee82001ee Merge pull request #1383 from scm-manager/bugfix/fullscreen 
Bugfix/fullscreen
 2020-10-21 13:04:41 +02:00
Eduard Heimbuch
69950f63b3 Mind review findings 2020-10-21 12:48:43 +02:00
Florian Scholdei
e141e33aa3 Clarify prop usage by renaming in more self-evident name 2020-10-21 12:23:58 +02:00
Konstantin Schaper
01333176f5 update storyshots 2020-10-21 12:23:38 +02:00
Konstantin Schaper
a289fe00a9 remove unnecessary background color definition for tokens and string literals 2020-10-21 11:51:17 +02:00
Konstantin Schaper
cfa44df41a update storyshots due to editor theme changes 2020-10-21 11:36:19 +02:00
Florian Scholdei
5ef3e2ed52 Update storyshots 2020-10-21 11:04:09 +02:00
Florian Scholdei
8995cb4c81 Close Modal by clicking into the background 2020-10-21 11:00:09 +02:00
Florian Scholdei
6a93d861fa Fix empty content in modal view of collapsed panel 2020-10-21 10:50:14 +02:00
Florian Scholdei
36133e639c Fix vertical placement of comments and code in pr diff view 2020-10-21 10:48:45 +02:00
Florian Scholdei
6024d8c3e1 Unify title usage within an area 2020-10-21 10:47:05 +02:00
Eduard Heimbuch
c005944a5c wrap lookup command result in java.util.Optional to clarify api 2020-10-21 10:18:29 +02:00
Eduard Heimbuch
018ebf03ba fix unit test 2020-10-20 13:14:03 +02:00
Eduard Heimbuch
020314bd00 Merge branch 'develop' into feature/lookup_api 2020-10-20 12:58:39 +02:00
eheimbuch
42c5ed1638 Merge pull request #1376 from scm-manager/feature/fullscreen 
Feature/fullscreen
 2020-10-20 12:31:48 +02:00
Konstantin Schaper
3b9fa12d71 fix visual glitch in annotate view 2020-10-20 12:21:05 +02:00
Eduard Heimbuch
8fe612cc06 create lookup command 2020-10-20 11:40:29 +02:00
Florian Scholdei
cfb0b2d6c6 Merge with upstream, add missing refs in CHANGELOG.md 2020-10-20 11:11:18 +02:00
Konstantin Schaper
8c78b058a3 add ui publishing mechanism for plugins 2020-10-20 11:08:49 +02:00
Florian Scholdei
5889bb0365 Update storyshots 2020-10-20 10:49:56 +02:00
Eduard Heimbuch
445d26e2b7 fix storyshots 2020-10-20 10:31:56 +02:00
Florian Scholdei
27d4b0a755 Fix review findings 2020-10-20 10:18:44 +02:00
Sebastian Sdorra
ef983b4483 Merge with support/2.6.x branch 2020-10-20 07:55:29 +02:00
Sebastian Sdorra
adeca20023 Merge pull request #1377 from scm-manager/bugfix/missing_gpg_permissions 
Fix missing default permission for managing public gpg keys
 2020-10-20 07:45:12 +02:00
Konstantin Schaper
9b874e7eab fix imports 2020-10-19 20:47:59 +02:00
Eduard Heimbuch
9f29c13ae0 fix unit tests 2020-10-19 17:00:52 +02:00
Eduard Heimbuch
da672a01e5 update CHANGELOG.md 2020-10-19 16:42:09 +02:00
Eduard Heimbuch
4d06bd61a8 fix user form validation rule 2020-10-19 16:35:06 +02:00
Eduard Heimbuch
ca40703d98 update documentation 2020-10-19 16:24:38 +02:00
Eduard Heimbuch
05bf51b5b1 rm obsolete check for type change 2020-10-19 15:36:43 +02:00
Eduard Heimbuch
119d274ad8 remove checks for user type since it is deprecated now 2020-10-19 15:19:12 +02:00
Eduard Heimbuch
4f4ab9cad4 new user created by SyncingRealmHelper are always external 2020-10-19 15:18:35 +02:00
Eduard Heimbuch
2573d93c39 fix global settings ui 2020-10-19 13:45:03 +02:00
Eduard Heimbuch
613346fb97 merge with develop 2020-10-19 13:34:54 +02:00
Eduard Heimbuch
f0f96a5de9 improve logging 2020-10-19 13:29:48 +02:00
Sebastian Sdorra
d09a0b2a7c Merge pull request #1378 from scm-manager/snyk-upgrade-69095b646ff585a3714c2f29d15a4ff3 
[Snyk] Upgrade org.mockito:mockito-core from 3.5.11 to 3.5.13
 2020-10-17 10:04:34 +02:00
snyk-bot
5f1035986d fix: upgrade org.mockito:mockito-core from 3.5.11 to 3.5.13 
Snyk has created this PR to upgrade org.mockito:mockito-core from 3.5.11 to 3.5.13.

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

See this project in Snyk:
https://app.snyk.io/org/scm-manager/project/c575ed09-e310-44e7-afc8-22b77c5873cf?utm_source=github&utm_medium=upgrade-pr
 2020-10-16 21:57:13 +00:00
CES Marvin
597f29f466 prepare for next development iteration 2020-10-16 11:43:18 +00:00
CES Marvin
fbf3f9fd5f release version 2.6.3 2.6.3 2020-10-16 11:12:06 +00:00
Sebastian Sdorra
abb0a29e0f Prepare changelog for release 2.6.3 2020-10-16 11:50:12 +02:00
Sebastian Sdorra
46bcaa4eff Set support/2.6.x as development and main branch in order to release 2.6.3 2020-10-16 11:46:25 +02:00