Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 14:05:44 +01:00
Code Issues Packages Projects Releases Activity
6,303 Commits 32 Branches 207 Tags
161885ff1230f216395c6d574af1951a0208e7ba
Commit Graph

616 Commits

Author SHA1 Message Date
Philipp Czora
161885ff12 Fixed issue with branch selector 2018-12-14 20:20:00 +01:00
René Pfeuffer
5cb1a2e0cd Use abstract base class for json enrichment 2018-12-14 17:25:42 +01:00
Philipp Czora
8a6a235e77 Implement Git repo config 2018-12-14 16:01:57 +01:00
René Pfeuffer
c2d872bd59 Modify git HEAD on default branch change 2018-12-13 18:32:20 +01:00
René Pfeuffer
360cba6c50 Use constant 2018-12-13 11:32:44 +01:00
René Pfeuffer
9e963b6aeb Enrich repository collection, too 2018-12-13 10:00:03 +01:00
René Pfeuffer
24cd9c3f8c Introduce repository config change event to clear caches 2018-12-13 09:22:10 +01:00
René Pfeuffer
db092e57e7 Move cache event to central position 2018-12-12 18:49:38 +01:00
René Pfeuffer
dbbe467479 Remove old property for default branch 2018-12-12 17:30:23 +01:00
René Pfeuffer
b4081aaa99 Add endpoint to set default branch 2018-12-12 15:04:56 +01:00
René Pfeuffer
bc8c776821 Introduce config rest endpoint for default git branch 2018-12-12 14:12:55 +01:00
Sebastian Sdorra
b22cb46ac2 reimplement diff and move it to ui-components 2018-12-11 13:25:35 +01:00
Sebastian Sdorra
ee3e3d4ecc Merged in feature/merge_conflictResolution (pull request #126) 
Feature/merge conflictResolution
 2018-12-11 09:00:26 +00:00
Sebastian Sdorra
858d2816da fix wrong i18n key and added step 6 the push 2018-12-11 09:53:40 +01:00
Maren Süwer
f834dd5297 update information 2018-12-10 15:56:21 +01:00
Maren Süwer
5902dfab6a refactor 2018-12-10 15:47:46 +01:00
Maren Süwer
e636d409ed correct error throwing in apiclient and add extension point 2018-12-10 15:36:52 +01:00
Sebastian Sdorra
8d27449c86 merge with 2.0.0-m3 2018-12-10 14:06:44 +01:00
René Pfeuffer
a54faf1233 Do not merge with fast forward 2018-12-10 12:01:13 +01:00
René Pfeuffer
0e333002db Create local branch for target during merge 2018-12-10 11:43:27 +01:00
René Pfeuffer
8b518d320d Fix checkout of target branch 2018-12-10 08:59:19 +01:00
René Pfeuffer
438339ae49 Unbind scm protocol after test 2018-12-07 13:33:58 +01:00
René Pfeuffer
8b97e00b36 Fix unit test 2018-12-07 13:28:21 +01:00
René Pfeuffer
133655418f Merge with 2.0.0-m3 2018-12-07 12:55:14 +01:00
René Pfeuffer
830c155b3d Fix transport protocol 2018-12-07 10:10:50 +01:00
René Pfeuffer
261e41f8bf Handle not existing revisions in merge 2018-12-07 08:49:37 +01:00
René Pfeuffer
540a525bc3 Use SCM protocol for internal merge command 2018-12-07 08:19:14 +01:00
Mohamed Karray
8232938afd use protected constant and mutableSet for final field 2018-12-06 18:01:39 +01:00
René Pfeuffer
f447ae437b Check feature in "incoming" commands 2018-12-06 11:35:56 +01:00
René Pfeuffer
de6d52bad9 Introduce feature for incoming changes 2018-12-06 10:49:37 +01:00
René Pfeuffer
d889cf0831 Fix permission check 2018-12-05 17:25:10 +01:00
René Pfeuffer
35f73cdc18 Do not commit empty merges 2018-12-05 16:09:38 +01:00
René Pfeuffer
9a3b8c26fb Fix unit test 2018-12-05 16:01:34 +01:00
René Pfeuffer
8c9e38e395 Secure merge command 2018-12-05 15:32:30 +01:00
Sebastian Sdorra
7bcf7a4774 merge repository heads 2018-12-05 15:06:58 +01:00
Sebastian Sdorra
b53ab4d438 merge with feature/autocomplete 2018-12-05 15:05:56 +01:00
René Pfeuffer
3021bea65a Multiply floating store factories for type safety 2018-12-04 08:56:39 +01:00
René Pfeuffer
33f3216164 Make type optional 2018-12-03 16:30:19 +01:00
René Pfeuffer
44d99f55f2 Do no longer expose StoreParameters 2018-12-03 12:28:35 +01:00
René Pfeuffer
3638d3520f Use static method for new StoreParameters instance 2018-12-03 11:28:03 +01:00
Mohamed Karray
37f4a2b669 merge 2018-11-29 16:01:43 +01:00
Sebastian Sdorra
e9401624a7 re implement XmlRepositoryDAO 2018-11-28 19:49:55 +01:00
Mohamed Karray
fb79cbfd02 merge + refactor getStoreDirectory 2018-11-28 15:14:49 +01:00
René Pfeuffer
d4db39755f Harmonize repository resolution 2018-11-27 15:31:57 +01:00
Mohamed Karray
7a1de0f67b add the interface StoreFactory and refactor storeFactories 2018-11-27 11:35:02 +01:00
René Pfeuffer
00ab764dab Store repository id in native config file 
Hooks can read this repository type dependant config file and handle
the changes for the correct repository id
 2018-11-26 17:22:17 +01:00
Sebastian Sdorra
4146618a04 added react-select to list of vendor dependencies 2018-11-26 14:37:05 +01:00
René Pfeuffer
c8fc673ce0 Remove hooks for internal repository id 2018-11-23 16:12:35 +01:00
René Pfeuffer
0f7e49d20f Bring constant home 2018-11-23 15:52:21 +01:00
René Pfeuffer
3d671caada Let dao create repository base directory before native creation 2018-11-23 15:04:59 +01:00