Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-02 12:49: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
Eduard Heimbuch
9705347c1f update storyshots after merge 2020-02-28 15:14:13 +01:00
Eduard Heimbuch
5624717bc0 merge with default 2020-02-28 15:13:22 +01:00
Eduard Heimbuch
4df33fcc73 fix styling 2020-02-28 14:58:56 +01:00
Eduard Heimbuch
e8074e7f7e Merged in bugfix/keep_file_attributes (pull request #414) 
Keep file attributes on modification
 2020-02-28 12:18:37 +00:00
Eduard Heimbuch
af3c1c52e8 Close branch bugfix/keep_file_attributes 2020-02-28 12:18:37 +00:00
Eduard Heimbuch
2d038327d0 fix re-render bug for changesets 2020-02-28 13:15:27 +01:00
Eduard Heimbuch
aa05b8ede1 update openapi.md 2020-02-28 08:13:58 +01:00
Eduard Heimbuch
d59778c3bd fix secondary navigation responsiveness 2020-02-27 16:41:19 +01:00
Rene Pfeuffer
9b7d5daae3 Use simple executable check from old java io 2020-02-27 13:13:09 +01:00
Rene Pfeuffer
9c75ff95c8 Keep file attributes on modification 2020-02-27 11:42:37 +01:00
Rene Pfeuffer
ba2b6e41e1 Log change 2020-02-27 10:38:47 +01:00
Eduard Heimbuch
2a16ec1b65 Merged in bugfix/merge_failures_without_conflicts (pull request #413) 
Handle unexpected merge results
 2020-02-27 09:35:43 +00:00
Eduard Heimbuch
d36063be24 Close branch bugfix/merge_failures_without_conflicts 2020-02-27 09:35:43 +00:00
Eduard Heimbuch
fbededbcaa cleanup test 2020-02-27 10:34:48 +01:00
Eduard Heimbuch
f9b680f548 fix responsiveness for section 2020-02-27 10:00:29 +01:00
Rene Pfeuffer
33037385e4 Handle unexpected merge results 
It is possible that a git work tree is dirty directly after the clone
of a repository, eg. when files are not changed correctly due to bogous
.gitattribute files (though this is just a guess). In these cases a
merge might fail due to these dirty files and not due to merge
conflicts. Without this change such results lead to null pointer
exceptions, because result.getConflicts() is null.
 2020-02-27 09:56:25 +01:00
Eduard Heimbuch
f8720087a1 refactor 2020-02-27 09:27:02 +01:00
Rene Pfeuffer
eb81bf4005 Enable tests for mercurial 
Therefore disable build in docker and use native worker.
 2020-02-27 08:36:47 +01:00
René Pfeuffer
465b5854ff Merge with default 2020-02-26 17:36:56 +01:00
René Pfeuffer
1567cd8765 Add tests for recursive request 2020-02-26 17:36:41 +01:00
René Pfeuffer
8ff870ccb1 Remove unused property 2020-02-26 16:05:49 +01:00
René Pfeuffer
ffdd80df61 Correct hash and equals for cache 2020-02-26 15:59:03 +01:00
Eduard Heimbuch
ed53745d9f make secondary navigation also for user, group and administration collapsable 2020-02-26 15:45:24 +01:00
Sebastian Sdorra
5cd28f27c6 removed deprecated warnings plugin 2020-02-26 15:14:45 +01:00
Eduard Heimbuch
119236a227 move MenuContext to ui-components 2020-02-26 15:10:56 +01:00
René Pfeuffer
7710088865 Fix offset in recursion 2020-02-26 13:24:31 +01:00
René Pfeuffer
4e7381b98f Fix offset in recursion 2020-02-26 11:10:01 +01:00
René Pfeuffer
67192a203e Read and sort tree first before applying limit 2020-02-26 10:54:16 +01:00
Eduard Heimbuch
7232815900 use react context to toggle collapsable repository menu 2020-02-26 10:41:39 +01:00
Rene Pfeuffer
c0e0ed3d17 Fix tests 2020-02-25 17:34:41 +01:00
Eduard Heimbuch
eee6cad1d3 make repository navigation fixed // add title for collapsed navigation items 2020-02-25 17:15:23 +01:00
Rene Pfeuffer
e33d65b097 Merge with default 2020-02-25 16:37:17 +01:00
Rene Pfeuffer
8c7c21eef9 Merged in feature/sort_extensionpoint_entries (pull request #410) 
Sorted extension point entries with supplied extensionName
 2020-02-25 15:23:56 +00:00
Rene Pfeuffer
2b0d4a65a0 Close branch feature/sort_extensionpoint_entries 2020-02-25 15:23:56 +00:00
Florian Scholdei
affb460584 Merge with upstream 2020-02-25 16:22:54 +01:00
Sebastian Sdorra
412cae3c21 do not try to archive restdocs package, because it does not exists anymore 2020-02-25 11:12:04 +01:00
Sebastian Sdorra
c64c584195 Merged in feature/openapi_doc (pull request #411) 
Feature/openapi doc
 2020-02-25 09:12:45 +00:00
Sebastian Sdorra
2fdd7f31ff Close branch feature/openapi_doc 2020-02-25 09:12:45 +00:00
Sebastian Sdorra
039ea46958 improve openapi description 2020-02-25 10:12:04 +01:00
Sebastian Sdorra
b3a9b8a42c remove heading, because the one from swagger-ui is enough 2020-02-25 10:10:15 +01:00
Eduard Heimbuch
7fe8b58e7d make secondary navigation collapsable // save collapse status in local storage 2020-02-25 09:49:23 +01:00
Florian Scholdei
a557997fa4 Simplify sort extensions method 2020-02-25 09:18:29 +01:00
Eduard Heimbuch
d85cfc23e2 fix typo in Changelog.md 2020-02-25 07:34:31 +00:00
René Pfeuffer
76665b4dbe Sort hg files 2020-02-25 08:25:25 +01:00
Sebastian Sdorra
000dab88ca merge with default branch 2020-02-25 08:24:12 +01:00
Sebastian Sdorra
24de6c89a5 update jgit to version 5.6.1.202002131546-r-scm1 2020-02-24 16:27:42 +01:00
Eduard Heimbuch
36469d64a1 Describe REST API in Swagger UI 2020-02-24 15:21:05 +01:00
Florian Scholdei
a5f27adc71 Described sort method in a more understandable way 2020-02-24 15:05:13 +01:00
Florian Scholdei
a016710c35 Sorted extension point entries with supplied extensionName 2020-02-24 15:02:03 +01:00
Eduard Heimbuch
7e1e77af2b remove enunciate since we are using openapi now 2020-02-24 13:36:34 +01:00