Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 18:51:10 +01:00
Code Issues Packages Projects Releases Activity
6,271 Commits 32 Branches 207 Tags
adaa5850ef09aa91f6b8f0ae33ec95c8b2cdda9c
Commit Graph

6271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
5bbb4c5267 Use reflection for parameter validation messages 2018-11-07 16:36:54 +01:00
René Pfeuffer
f7348d8882 Incorporate comments from peer review 2018-11-07 16:10:32 +01:00
Philipp Czora
e322a1a80b Merged 2.0.0-m3 2018-11-07 15:44:28 +01:00
Philipp Czora
28fa2c4b2b Fixed routing for profile page 2018-11-07 15:43:33 +01:00
Sebastian Sdorra
c59ba9e149 Merged in feature/log_two_revisions (pull request #104) 
Feature log two revisions
 2018-11-07 14:07:50 +00:00
Sebastian Sdorra
291e6115f9 Close branch feature/log_two_revisions 2018-11-07 14:07:50 +00:00
Sebastian Sdorra
73c402890c Merged in feature/diff_two_revisions (pull request #101) 
Feature diff between two revisions
 2018-11-07 13:54:23 +00:00
Sebastian Sdorra
7127cc4cda Close branch feature/diff_two_revisions 2018-11-07 13:54:23 +00:00
Sebastian Sdorra
8154ad8f59 Merged in feature/fix_error_display_for_repo_edit (pull request #100) 
Fixes persistent displaying of errors happened while editing Repos/Groups/Users
 2018-11-07 13:47:24 +00:00
Sebastian Sdorra
9ec09c10d5 Close branch feature/fix_error_display_for_repo_edit 2018-11-07 13:47:24 +00:00
Sebastian Sdorra
4c732564a0 Merged in feature/git-config (pull request #103) 
Repository type configuration + abstraction for global configuration
 2018-11-07 13:46:22 +00:00
Sebastian Sdorra
2adebd7ca0 Close branch feature/git-config 2018-11-07 13:46:22 +00:00
Philipp Czora
b5cde2a39f Merged 2.0.0-m3 2018-11-07 14:45:27 +01:00
Philipp Czora
b05c8892a1 Merged 2.0.0-m3 2018-11-07 14:14:03 +01:00
René Pfeuffer
2f91531d05 Assert existence of pool directory 2018-11-07 14:04:00 +01:00
René Pfeuffer
8771f68081 Set author for merge 2018-11-07 14:02:02 +01:00
Sebastian Sdorra
e9396f4947 fixed missing validation update on change 2018-11-07 13:39:38 +01:00
René Pfeuffer
2d04e6c2f0 Specify not mergeable files in merge result 2018-11-07 13:34:35 +01:00
René Pfeuffer
26d5e6e062 Set merge message 2018-11-07 13:17:21 +01:00
Philipp Czora
4caa9c1da0 Merged in feature/ui_userprofile (pull request #98) 
Implemented Profile component
 2018-11-07 12:11:43 +00:00
Philipp Czora
7ca88e7839 Close branch feature/ui_userprofile 2018-11-07 12:11:43 +00:00
Philipp Czora
8a23537e68 Removed unused i18n line 2018-11-07 13:10:29 +01:00
Philipp Czora
74382f26b7 Moved Profile component to top level; added error message 2018-11-07 12:55:09 +01:00
René Pfeuffer
d5da106038 Implement merge using api of class Git 2018-11-07 12:52:40 +01:00
René Pfeuffer
e377ce5988 Implement first steps for actual merge 2018-11-07 11:52:49 +01:00
Philipp Czora
1caab8adbf Bootstrapped ChangeUserPassword.js 2018-11-07 11:52:30 +01:00
René Pfeuffer
04c5d6f84a Fix deletion of temporary clone directory 2018-11-07 11:13:21 +01:00
René Pfeuffer
e2766d494a Register SimpleGitWorkdirFactory in guice context 2018-11-07 10:38:01 +01:00
René Pfeuffer
62c20b071b Fix reminders of dry run 2018-11-07 10:33:47 +01:00
René Pfeuffer
33642352ea Start with a simple factory instead of a complex pool 2018-11-07 10:28:27 +01:00
Philipp Czora
5aaf9ef01e Extracted PasswordConfirmation component 2018-11-07 10:27:47 +01:00
Sebastian Sdorra
b029efb5c9 update ui-extensions to fix unit tests 2018-11-07 09:45:12 +01:00
René Pfeuffer
4cdf3e468c Add merge command to repository service api 2018-11-07 08:38:26 +01:00
René Pfeuffer
fc3e08d612 Include dry run in merge command 2018-11-07 08:32:27 +01:00
René Pfeuffer
23783d43f6 Fix build breaker 2018-11-07 08:19:38 +01:00
Philipp Czora
8c13f38c99 Added method to change password as a user 2018-11-06 17:29:08 +01:00
René Pfeuffer
6863337faf Implement first steps for merge 2018-11-06 17:14:27 +01:00
Sebastian Sdorra
da9db10701 implemented global configuration for subversion 2018-11-06 16:39:28 +01:00
Sebastian Sdorra
9c043145a2 implemented global configuration for mercurial 2018-11-06 16:39:11 +01:00
Sebastian Sdorra
f5f96042b3 use global configuration abstraction to implement global configuration for git 2018-11-06 16:38:49 +01:00
Sebastian Sdorra
c14e8d654b added name to select component and fixed wrong type for value 2018-11-06 16:37:39 +01:00
Sebastian Sdorra
d230511ad8 added abstraction for global configurations, to simplify plugin development 2018-11-06 16:36:11 +01:00
Philipp Czora
26e23ead21 Merged in feature/ui-AdminPasswordChange (pull request #102) 
Allows admin user to set other users' passwords
 2018-11-06 15:31:04 +00:00
Philipp Czora
2179315301 Close branch feature/ui-AdminPasswordChange 2018-11-06 15:31:04 +00:00
Philipp Czora
1b694ebda7 Merged 2.0.0-m3 2018-11-06 16:08:44 +01:00
Philipp Czora
6f44a4ed67 Renamed variable to reduce risk of confusion 2018-11-06 15:48:12 +01:00
Philipp Czora
081cd93c51 Polished pw labels 2018-11-06 15:27:01 +01:00
Philipp Czora
6e32d354cf Renamed incorrectly named variable 2018-11-06 15:26:25 +01:00
Philipp Czora
4086622647 Renamed function for clarity 2018-11-06 15:25:49 +01:00
René Pfeuffer
e0cc99a3d8 Implement simple merge dry run 2018-11-06 14:40:55 +01:00