Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-16 17:20:20 +01:00
Code Issues Packages Projects Releases Activity
8,643 Commits 42 Branches 215 Tags
c65ac7f61d0efe912e5a3f37db160cff4baa1071
Commit Graph

869 Commits

Author SHA1 Message Date
Rene Pfeuffer
c65ac7f61d Close working copy 2019-11-07 16:34:14 +01:00
Rene Pfeuffer
758e4ab750 Use jgit client library for diff with conflict 2019-11-07 16:26:30 +01:00
Rene Pfeuffer
df144e298c Add POC for diff against temporary merge result 
This fails for files with merge conflicts, because results for these
files are not added to git and therefore there is no blob the diff
formatter can use to render. This has somehow to be fixed by making
jgit use the version from the file system. Taking a look at the
implementation of Git.clone() might help here.
 2019-11-06 17:30:02 +01:00
Sebastian Sdorra
e4c8783c61 return null if commit was not merged into requested branch 2019-11-04 11:46:27 +01:00
Eduard Heimbuch
4f17bc6b1c refactor backend for modifyCommand / add sourceExtension for plugins 2019-10-30 12:59:54 +01:00
Eduard Heimbuch
531259bec0 check if request branch contains revision 2019-10-28 11:45:42 +01:00
Eduard Heimbuch
a3d5e9669e add test for gitLogCommand 2019-10-26 17:59:37 +02:00
Eduard Heimbuch
949a8fe4f1 merge 2.0.0-m3 2019-10-25 12:33:16 +02:00
Eduard Heimbuch
a938fd8682 enhance logcommand 2019-10-25 12:31:18 +02:00
Eduard Heimbuch
5c7bd90f7a return changesetId for git & hg 2019-10-24 11:57:16 +02:00
Eduard Heimbuch
fb0eb329e5 return branch for git & hg for correct redirect 2019-10-24 09:11:17 +02:00
Florian Scholdei
6b21f609f4 Migrate react-i18next translate components in scm-plugins 2019-10-23 16:09:28 +02:00
Sebastian Sdorra
8a6f862d3d Merged in feature/lfs_over_ssh (pull request #336) 
Feature LFS over ssh
 2019-10-22 12:01:38 +00:00
Sebastian Sdorra
52f471b5dd fix lfs authentication via ssh command and enabled xsrf protection 2019-10-22 10:50:49 +02:00
Sebastian Sdorra
e885d130be add push permissions to read access token 
This is required because the read access token is used to obtain the write access token.
 2019-10-22 10:13:46 +02:00
Sebastian Sdorra
bdb4bb73ac fix plugin frontend build 2019-10-21 14:52:08 +02:00
Rene Pfeuffer
a93380b867 Differentiate types for central and cloned repository 2019-10-21 14:10:50 +02:00
Sebastian Sdorra
f7b7e0321e added shared tsconfig package 2019-10-21 14:10:48 +02:00
Rene Pfeuffer
5185a68eeb Formatter is not thread safe 2019-10-21 13:10:48 +02:00
Sebastian Sdorra
0703f1e2bd migrate core plugins from flow to typescript 2019-10-21 12:13:08 +02:00
Rene Pfeuffer
36d2723c50 Add unit test 2019-10-21 11:11:44 +02:00
Rene Pfeuffer
287ee9efe1 Simplify stream 2019-10-21 10:40:16 +02:00
Rene Pfeuffer
647464618a Fix time format 2019-10-21 10:24:53 +02:00
Rene Pfeuffer
2a501a9dbb Simplify test 2019-10-19 16:31:54 +02:00
Rene Pfeuffer
f9ecae129e Add unit test 2019-10-19 15:55:07 +02:00
Rene Pfeuffer
9f6674cce4 Add permission checks 2019-10-19 13:54:27 +02:00
Rene Pfeuffer
2a998060f4 Cleanup 2019-10-19 13:50:49 +02:00
Rene Pfeuffer
c067ce1a5c Extract token generation 2019-10-19 13:47:59 +02:00
Rene Pfeuffer
d43080a3ea Extract common functionality 2019-10-19 13:24:58 +02:00
Rene Pfeuffer
a2c42060e5 POC 2019-10-18 16:17:22 +02:00
Rene Pfeuffer
162a1d9e05 POC 2019-10-18 13:33:53 +02:00
Rene Pfeuffer
6cdb81d263 POC 2019-10-18 10:22:45 +02:00
Rene Pfeuffer
9f48875d57 POC 2019-10-17 09:23:37 +02:00
Eduard Heimbuch
f90b8a987a merge 2.0.0 2019-10-17 08:34:23 +02:00
Eduard Heimbuch
12ecfcd443 Merged in bugfix/empty_merge_git (pull request #334) 
do merge commit also without diffs between branches

Approved-by: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
 2019-10-17 06:16:28 +00:00
Rene Pfeuffer
4cb79ffe5a Detect proper merge and prevent empty commits 2019-10-16 14:59:38 +02:00
Sebastian Sdorra
092fb6d90b added ui-plugins package to bundle all plugin dependencies 2019-10-16 08:30:15 +02:00
Sebastian Sdorra
468cc32d06 indent changes after lerna version 2019-10-15 13:23:47 +02:00
Eduard Heimbuch
668007e084 change unit test 2019-10-15 13:09:51 +02:00
Sebastian Sdorra
09eebd7985 use ui-scripts to build the core plugins 2019-10-15 13:07:22 +02:00
Eduard Heimbuch
ef7d958ba1 fix / change unit test 2019-10-15 13:05:26 +02:00
Eduard Heimbuch
bf32f53c2d do merge commit also without diffs between branches 2019-10-15 10:16:26 +02:00
Sebastian Sdorra
cab5d6c863 start implementation of ui-scripts 2019-10-14 16:00:50 +02:00
Sebastian Sdorra
00117955e7 added shared prettier config 2019-10-14 11:58:18 +02:00
Sebastian Sdorra
889e186257 fix routing and added ui-extension package 2019-10-11 13:24:02 +02:00
Eduard Heimbuch
a3c5f97a23 merged 2019-10-11 11:22:24 +02:00
Sebastian Sdorra
49a7aab45c merge branch heads and added ui-polyfill 2019-10-11 07:34:19 +02:00
Sebastian Sdorra
43295f9007 fix core-plugin test execution 2019-10-10 15:16:31 +02:00
Sebastian Sdorra
7bfd9862a5 merge branch heads 2019-10-10 14:33:13 +02:00
Sebastian Sdorra
631f2f6482 implemented jest-preset 2019-10-10 14:32:37 +02:00