Commit Graph

6683 Commits

Author SHA1 Message Date
Sebastian Sdorra
dfd187a247 integrate sonatype lifecycle analysis into jenkins build 2019-01-30 11:25:01 +01:00
Sebastian Sdorra
4f72f1d304 remove unused repositories to speedup build 2019-01-30 10:32:29 +01:00
Sebastian Sdorra
297ecc46db Merged in broDom/scm-manager/dep-updates-2.x (pull request #37) 2019-01-29 17:54:46 +01:00
Sebastian Sdorra
eba07dc006 merge repository heads 2019-01-29 16:01:36 +01:00
Sebastian Sdorra
d820605186 fixed integration of mercurial config changes of 1.x 2019-01-29 14:00:11 +01:00
Sebastian Sdorra
588e248863 fixed UnitTests for AbstractManager after merge with 1.x 2019-01-29 13:46:03 +01:00
Sebastian Sdorra
428734e0c7 port GitNonFastForwardITCase from scm-webapp to scm-it 2019-01-29 13:36:13 +01:00
Sebastian Sdorra
ac83dd93c8 fix execution of integration tests, by updating jetty to 9.4.14.v20181114 2019-01-29 13:35:11 +01:00
Philipp Czora
75c369f022 Merged in feature/repository_permissions (pull request #158)
Feature repository permissions
2019-01-29 12:30:36 +00:00
Philipp Czora
0ceabe454b Close branch feature/repository_permissions 2019-01-29 12:30:36 +00:00
Philipp Czora
65a3899043 Merged 2.0.0-m3 2019-01-29 13:05:23 +01:00
Philipp Czora
38172fb8a1 Fixed test 2019-01-29 11:12:49 +01:00
Philipp Czora
92df3201ee Minor cleanup 2019-01-29 10:47:54 +01:00
Sebastian Sdorra
c42028433f map nonFastForwardDisallowed field from GitConfig and added ui 2019-01-29 10:26:11 +01:00
Philipp Czora
5eb4d321a9 Fixed equals() and hashCode() of RepositoryRole 2019-01-29 10:25:12 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
Philipp Czora
ec4fd48e1e Minor cleanup / typo fixes 2019-01-29 09:34:27 +01:00
Philipp Czora
9c31125cde Fixed type import 2019-01-28 16:54:38 +01:00
Philipp Czora
d997fc09b3 Fixed minor flow issues 2019-01-28 16:48:57 +01:00
Philipp Czora
376fdc0d13 Fixed help texts 2019-01-28 16:47:17 +01:00
Sebastian Sdorra
af3166c2e6 merge repository heads 2019-01-28 14:29:44 +01:00
Sebastian Sdorra
f22abaf0e2 fix restdoc generation and append restdoc artifact to buildjob 2019-01-28 14:28:34 +01:00
Maren Süwer
d9977f31db Merged in feature/jump_order (pull request #163)
Feature/jump order
2019-01-28 13:11:30 +00:00
Maren Süwer
fc76897d18 Close branch feature/jump_order 2019-01-28 13:11:30 +00:00
Maren Süwer
4b5b056c82 Merged in feature/radio_button (pull request #164)
added radio component and used it in permissions
2019-01-28 13:02:22 +00:00
Maren Süwer
dbb8826345 Close branch feature/radio_button 2019-01-28 13:02:22 +00:00
Maren Süwer
9637982a3c Merged in feature/blau_blau_blau (pull request #162)
feature/blau_blau_blau
2019-01-28 12:47:18 +00:00
Maren Süwer
67438b1d72 Close branch feature/blau_blau_blau 2019-01-28 12:47:18 +00:00
Florian Scholdei
bd26de83e2 added radio component and used it in permissions 2019-01-25 17:09:14 +01:00
Florian Scholdei
5ccd79595f swapped displayname and mail 2019-01-25 16:04:04 +01:00
Florian Scholdei
4453f07c3b small correction 2019-01-25 15:58:36 +01:00
Florian Scholdei
b60a80b2cb implemented fix 2019-01-25 15:57:45 +01:00
René Pfeuffer
03ca952840 Fix read only view 2019-01-25 13:55:04 +01:00
René Pfeuffer
5c51aeb85c Merge with 2.0.0-m3 2019-01-25 13:34:45 +01:00
René Pfeuffer
8566c294da Fix permission check for permission link 2019-01-25 13:34:09 +01:00
Florian Scholdei
b877cf2146 set is-info to is-link color and changed wrong class uses 2019-01-25 13:15:04 +01:00
René Pfeuffer
27fd65b234 Enance help text 2019-01-25 13:12:05 +01:00
René Pfeuffer
9cee1957f7 Translate verbs of permissions 2019-01-25 13:10:04 +01:00
René Pfeuffer
39a9615189 Fix key property for empty option 2019-01-25 12:48:04 +01:00
Sebastian Sdorra
ebe5363455 merge repository heads 2019-01-25 12:37:54 +01:00
Sebastian Sdorra
02c3698aaf merge with branch feature/bugfix_issuetracker 2019-01-25 12:35:58 +01:00
Sebastian Sdorra
f9d0a316c5 close branch feature/bugfix_issuetracker 2019-01-25 12:35:33 +01:00
Sebastian Sdorra
9670232ad2 extension point for changeset description should be only rendered once 2019-01-25 12:35:16 +01:00
René Pfeuffer
6f97bd56d3 Fix help icons 2019-01-25 12:32:19 +01:00
René Pfeuffer
3a44193459 Add advanced permission button for new permissions 2019-01-25 12:21:05 +01:00
René Pfeuffer
ec1f066b1f Fix mapping with immutable target collection 2019-01-25 08:26:32 +01:00
René Pfeuffer
b15cfe74a4 Rename type -> role 2019-01-25 08:26:18 +01:00
René Pfeuffer
6721ae9bb7 Fix labels 2019-01-25 08:01:32 +01:00
Sebastian Sdorra
78b2874a19 Merged in matt_harbison/scm-manager/1.x (pull request #43)
Load global Mercurial configuration in 4.1+ and minor hook tweaks
2019-01-24 20:35:42 +00:00
Sebastian Sdorra
c118482a2c Merged in bugfix/makeReposClickableInMobileView (pull request #160)
Make Repos clickable in mobile view
2019-01-24 12:53:21 +00:00