Commit Graph

9438 Commits

Author SHA1 Message Date
Eduard Heimbuch
d4a3d52f04 fix collapsed navLinks for plugins after collapse menu with diff side-by-side button 2020-03-10 16:48:41 +01:00
Eduard Heimbuch
8df7406101 update CHANGELOG.md 2020-03-10 11:21:39 +01:00
Eduard Heimbuch
cb9b7e66c9 Merge branch 'develop' into feature/ui_utilization 2020-03-10 11:19:09 +01:00
René Pfeuffer
005ca83799 Fix drop down selection 2020-03-10 11:06:17 +01:00
Eduard Heimbuch
13799044bd use position sticky to avoid css glitches // cleanup 2020-03-10 10:45:37 +01:00
René Pfeuffer
55ef3f8c8c Merge remote-tracking branch 'origin/develop' into feature/browse_commit_with_limit
# Conflicts:
#	CHANGELOG.md
2020-03-10 09:43:31 +01:00
René Pfeuffer
5a3bb52b72 Fix update of sources
An Update of sources must not set the hunk count.
2020-03-10 09:28:03 +01:00
René Pfeuffer
4b1c74fa78 Try other jgit configuration to prevent flappy git integration tests 2020-03-10 08:25:39 +01:00
Sebastian Sdorra
7dccf6f9f4 Merge pull request #1031 from scm-manager/feature/set_nfs_related_git_config
Add possibility to set jgit nfs related config
2020-03-10 08:16:48 +01:00
René Pfeuffer
0927e3e421 Fix error handling 2020-03-09 16:53:17 +01:00
René Pfeuffer
2d117648ba Add possibility to set jgit nfs related config
It may be necessary for users to configure jgit behaviour related to
file handling. This commit makes the following two configurations
available (among others):

- core.trustfolderstat
- core.supportsatomicfilecreation
2020-03-09 16:44:42 +01:00
René Pfeuffer
85a893824c Log change 2020-03-09 16:10:08 +01:00
Sebastian Sdorra
5879249bd5 fix wrong ignore rule for .pyc files 2020-03-09 14:26:48 +01:00
Eduard Heimbuch
2db6980098 fix toggle button position 2020-03-09 14:03:01 +01:00
Eduard Heimbuch
030d35fb03 update .gitignore after migration 2020-03-09 11:29:43 +01:00
Eduard Heimbuch
6ad7ebeb18 update .gitignore // delete .hgignore 2020-03-09 11:17:16 +01:00
Eduard Heimbuch
2c18933951 update .gitignore 2020-03-09 11:12:21 +01:00
René Pfeuffer
fa889529a2 Only count files in frontend 2020-03-09 09:48:14 +01:00
René Pfeuffer
df1cc365ed Cleanup test 2020-03-09 09:23:53 +01:00
René Pfeuffer
845a3ea72f Check order of files in test 2020-03-09 09:20:08 +01:00
René Pfeuffer
b8ab729c45 Merge branch 'develop' into feature/browse_commit_with_limit 2020-03-09 08:40:29 +01:00
Sebastian Sdorra
2b6a961d9a migrate bitbucket wiki to docs folder 2020-03-09 08:01:43 +01:00
Sebastian Sdorra
d350177b3f migrate Jenkinsfile from mercurial to git 2020-03-09 08:01:36 +01:00
Sebastian Sdorra
abb6a41946 migrate from bitbucket to github 2020-03-09 08:01:36 +01:00
Rene Pfeuffer
cae398d945 Merge with upstream 2020-03-06 16:19:35 +01:00
Rene Pfeuffer
4ddfbcd86e Sort directories correctly 2020-03-06 16:17:47 +01:00
Sebastian Sdorra
700615f7d0 merge repository heads 2020-03-05 11:13:56 +01:00
Sebastian Sdorra
35152610bc find active child to figure out if the section is collapsible 2020-03-05 11:07:02 +01:00
Eduard Heimbuch
028b562387 align icon center in menu toggle button 2020-03-05 08:53:11 +01:00
Sebastian Sdorra
89bc3dcc91 allow SubNavigation to collapse menu 2020-03-04 15:59:41 +01:00
René Pfeuffer
a6b45ce556 Fig python tests 2020-03-04 14:39:36 +01:00
René Pfeuffer
c7b466f3c6 Fix offset calculation for hg 2020-03-04 14:01:53 +01:00
Sebastian Sdorra
8d2f117a6b update httpclient in order to fix security vulnerability 2020-03-04 13:27:47 +01:00
René Pfeuffer
8b4dd26425 Implement more complex implicit directories 2020-03-04 12:03:58 +01:00
René Pfeuffer
7aa91bf846 Implement simple implicit directories 2020-03-04 11:47:30 +01:00
René Pfeuffer
cb1d9334bb Remove unnecessary check 2020-03-04 10:54:35 +01:00
Sebastian Sdorra
7785ea2d68 Merged in bugfix/openapi_errors (pull request #417)
prevent using same classloader multiple times
2020-03-04 08:31:08 +00:00
Sebastian Sdorra
6fe273e821 Close branch bugfix/openapi_errors 2020-03-04 08:31:08 +00:00
René Pfeuffer
f2ce14294d Extract parsing of fileview stream and bootstrap tests 2020-03-04 09:30:25 +01:00
Eduard Heimbuch
8b738f52c1 add schema for response headers 2020-03-04 08:46:33 +01:00
Sebastian Sdorra
cb22c4c2f5 merge with feature/update_jgit branch 2020-03-04 08:23:55 +01:00
Sebastian Sdorra
62dd29c4d7 close branch feature/update_jgit 2020-03-04 08:23:25 +01:00
René Pfeuffer
5fb338fbd2 Adapt test for new limit/offset rule for hg 2020-03-04 07:15:03 +01:00
Rene Pfeuffer
cf43e3bc84 Implement new limit/offset rule for git and svn
Directories shall no longer be taken into account for limit/offset
calculations.
2020-03-03 17:06:55 +01:00
Sebastian Sdorra
65918fc187 Merged in bugfix/remove_obsolete_repository_fields (pull request #416)
remove obsolete repository fields
2020-03-03 15:40:02 +00:00
Sebastian Sdorra
69eb9793a8 Close branch bugfix/remove_obsolete_repository_fields 2020-03-03 15:40:02 +00:00
Rene Pfeuffer
e0b02ea1a3 Use api to set system config for lfs
Could be so simple if this works :-)
2020-03-03 16:13:17 +01:00
Sebastian Sdorra
1160702ede merge with default branch 2020-03-03 16:00:30 +01:00
Sebastian Sdorra
4dd3e5e7d2 merge with branch bugfix/fix_broken_unit_test_timing 2020-03-03 16:00:06 +01:00
Sebastian Sdorra
5368f17893 close branch bugfix/fix_broken_unit_test_timing 2020-03-03 15:59:40 +01:00