Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-02 20:59:10 +01:00
Code Issues Packages Projects Releases Activity
7,212 Commits 40 Branches 210 Tags
61c94de51dc2eea16f79698cc0f1581c08d01ede
Commit Graph

7212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
René Pfeuffer
fdbb37709b Close branch feature/git_default_branch 2018-12-20 10:31:10 +00:00
Maren Süwer
77c26f0865 Use prettier to format 2018-12-20 11:30:28 +01:00
Maren Süwer
707715ec75 check if column size is full for repo overview 2018-12-20 11:12:04 +01:00
René Pfeuffer
f37534987a Merge with 2.0.0-m3 2018-12-20 10:56:00 +01:00
René Pfeuffer
3b33b3b0a4 Merge with 2.0.0-m3 2018-12-20 10:55:40 +01:00
Sebastian Sdorra
98d30ad25f Merged in feature/no_basic_auth (pull request #140) 
Do not send basic auth for /repo requests from web browser
 2018-12-20 09:49:42 +00:00
Sebastian Sdorra
1a0f3c860f Close branch feature/no_basic_auth 2018-12-20 09:49:42 +00:00
René Pfeuffer
d9bfddce2d Add documentation about status codes 2018-12-20 10:47:24 +01:00
Sebastian Sdorra
ac1da68880 Merged in bugfix/incoming_diff_with_merge (pull request #138) 
Fix incoming diff with merges from target branch.
 2018-12-20 09:46:43 +00:00
Sebastian Sdorra
0eb5bf8117 Close branch bugfix/incoming_diff_with_merge 2018-12-20 09:46:43 +00:00
René Pfeuffer
ffa013de68 Merge with 2.0.0-m3 2018-12-20 10:44:44 +01:00
René Pfeuffer
f87c09334e Undo unnecessary change 2018-12-20 10:31:29 +01:00
Maren Süwer
ca865125b8 remove margin of heading 2018-12-20 10:30:46 +01:00
René Pfeuffer
667accdf93 Undo unnecessary change 2018-12-20 10:30:20 +01:00
Sebastian Sdorra
6efe1861eb Merged in feature/diff_always_loading_when_no_diff (pull request #137) 
Feature/diff always loading when no diff
 2018-12-20 09:29:36 +00:00
Sebastian Sdorra
ca54b31c9d Close branch feature/diff_always_loading_when_no_diff 2018-12-20 09:29:36 +00:00
Maren Süwer
6d182e8bc0 use className instead of class 2018-12-20 10:21:18 +01:00
Maren Süwer
a61fa52fa2 center image 2018-12-20 10:11:23 +01:00
René Pfeuffer
3774b5abb3 Do not send basic auth for /repo requests from web browser 
This fixes the basic auth popups in browsers after session timeout and
reload in browsers "inside" of repositories.
 2018-12-20 10:05:17 +01:00
Maren Süwer
0e924a3176 shorten description if it is longer than expected 2018-12-20 09:48:01 +01:00
Maren Süwer
d559c85b6d add background color to information of content 2018-12-19 17:00:21 +01:00
Maren Süwer
f0fb4dbdd8 added border around content table 2018-12-19 16:39:46 +01:00
René Pfeuffer
9a7c17edb5 Correct merge 2018-12-19 15:32:53 +01:00
René Pfeuffer
98662eb0c2 Merge with 2.0.0-m3 2018-12-19 15:09:40 +01:00
René Pfeuffer
547947a1b3 Add zip for test 2018-12-19 14:38:29 +01:00
Janika Kefel
aa0877fd9e Small CSS fix 2018-12-19 13:56:43 +01:00
René Pfeuffer
a9300df7f4 Fix incoming diff with merges from target branch. 
Taking the git history example below, the previous version only computed
commits 'b3' upward for log of 'b' with ancestor 'master' and missed
commits 'b1', 'b2' and the first merge.

* 86e9ca0 (HEAD -> b) b5
*   d69edb3 Merge branch 'master' into b
|\
| * 946a8db (master) f
| * b19b9cc e
* | 3d6109c b4
* | 6330653 b3
* |   a49a28e Merge branch 'master' into b
|\ \
| |/
| * 0235584 d
| * 20251c5 c
* | 5023b85 b2
* | 201ecc1 b1
|/
* 36b19e4 b
* c2190a9 a
 2018-12-19 13:33:57 +01:00
Janika Kefel
4d181a574a More UI changes 2018-12-19 13:28:04 +01:00
René Pfeuffer
eb84b9693c Merged in feature/session_timeout (pull request #130) 
Feature/session timeout
 2018-12-19 10:37:45 +00:00
René Pfeuffer
25f2867d23 Close branch feature/session_timeout 2018-12-19 10:37:45 +00:00
Maren Süwer
3681936e5c reload diff component if url changes 2018-12-19 11:30:05 +01:00
René Pfeuffer
eaeb95077e Merge with 2.0.0-m3 2018-12-19 11:10:27 +01:00
Florian Scholdei
d93b83d969 added wordBreak class in scm.scss 2018-12-19 11:07:39 +01:00
Maren Süwer
0278e29bd9 merged 2.0.0-m3 2018-12-19 09:58:47 +01:00
Florian Scholdei
d8c5349994 outsourced and refactored is-word-break class 2018-12-19 09:47:44 +01:00
René Pfeuffer
2df50b833e Add constructor 2018-12-19 09:30:36 +01:00
Maren Süwer
cf87eba15b Merged in bug/table_navi_overflow (pull request #132) 
Bug/table navi overflow
 2018-12-19 08:26:50 +00:00
Maren Süwer
0d8e0fef8e Close branch bug/table_navi_overflow 2018-12-19 08:26:50 +00:00
Maren Süwer
367a27f83d Merged in bug/single_source_overflow (pull request #133) 
implemented work-break for media and table
 2018-12-19 07:50:48 +00:00
Maren Süwer
ee90707fcc Close branch bug/single_source_overflow 2018-12-19 07:50:48 +00:00
Maren Süwer
30c9b87cd3 added is-clipped class, and show description not at mobile view 2018-12-19 08:40:04 +01:00
René Pfeuffer
07c34a005e Peer review 2018-12-18 16:55:13 +01:00
René Pfeuffer
3bb8546388 Close branch feature/changes-for-cas-plugin 2018-12-18 14:57:00 +00:00
René Pfeuffer
53eab1dc4b Merged in feature/changes-for-cas-plugin (pull request #135) 
Changes for cas plugin
 2018-12-18 14:57:00 +00:00
Sebastian Sdorra
13e3d54100 added constructor with predefined store 2018-12-18 14:55:38 +01:00
Sebastian Sdorra
4c0f993293 added jaxb adapter for instant objects 2018-12-18 09:26:51 +01:00
René Pfeuffer
480801d3b0 Do not keep directory for stores 2018-12-17 15:23:25 +01:00
Sebastian Sdorra
3daf4f7674 implemented in-memory version of DataStore for testing 2018-12-17 14:58:51 +01:00
René Pfeuffer
f041d63887 Read link from repository for repository config 2018-12-17 14:01:15 +01:00
Sebastian Sdorra
af7e776fdd added getParentKey() to AccessToken interface 2018-12-17 13:06:11 +01:00