Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-06 14:49:11 +01:00
Code Issues Packages Projects Releases Activity
12,416 Commits 41 Branches 210 Tags
369e369ea32bdd4e8ceb8ea64eaadff446cbefdb
Commit Graph

12416 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Philipp Czora
88e45d5eef Minor fixes 2018-12-17 11:29:20 +01:00
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
René Pfeuffer
a9c5df1403 Merge with 2.0.0-m3 2018-12-14 17:23:22 +01:00
René Pfeuffer
a696a9cc9b Merged in feature/abstract_repository_enricher (pull request #134) 
Add abstract base class to enrich repository json responses
 2018-12-14 16:21:36 +00:00
René Pfeuffer
01eb287bb0 Close branch feature/abstract_repository_enricher 2018-12-14 16:21:36 +00:00
René Pfeuffer
84e27b60d4 Give attribute proper name 2018-12-14 17:20:22 +01:00
René Pfeuffer
c0ba6984e9 Add unit test 2018-12-14 16:51:40 +01:00
René Pfeuffer
cef43b8b91 Add abstract base class to enrich repository json responses 2018-12-14 16:38:14 +01:00
Florian Scholdei
30fdce5455 corrected wrong approach 2018-12-14 16:30:19 +01:00
Florian Scholdei
ae28b51358 added css-class to branch column and renamed it 2018-12-14 16:28:06 +01:00
Philipp Czora
8a6a235e77 Implement Git repo config 2018-12-14 16:01:57 +01:00
Florian Scholdei
3edd3cbb45 implemented work-break for media and table 2018-12-14 15:03:59 +01:00
René Pfeuffer
d02cb60b47 Add getters with Optional to stores 2018-12-14 14:50:14 +01:00
Florian Scholdei
044a60c7c9 implemented word-break for column 2018-12-14 10:42:20 +01:00
René Pfeuffer
9392619572 Map JAX NotFoundException to 404 2018-12-14 10:42:19 +01:00
Philipp Czora
9666c174b4 Merged in feature/bad_request (pull request #127) 
Feature bad request exception
 2018-12-14 08:09:50 +00:00
Philipp Czora
de2c594faf Close branch feature/bad_request 2018-12-14 08:09:50 +00:00
Sebastian Sdorra
6f29aed9df fixed broken AuthenticationResourceTest 2018-12-14 08:33:45 +01:00
Sebastian Sdorra
306482094d move AccessTokenCookieIssue from scm-webapp to scm-core 2018-12-14 08:29:30 +01:00
Sebastian Sdorra
d6efec8fe3 use url safe base64 encoding 2018-12-14 08:28:28 +01:00
René Pfeuffer
c2d872bd59 Modify git HEAD on default branch change 2018-12-13 18:32:20 +01:00
Philipp Czora
0af5d3901c Renamed NotSupportedFeatureException 2018-12-13 15:31:00 +01:00
Philipp Czora
7e2184ef61 Fixed typo 2018-12-13 15:21:13 +01:00
Janika Kefel
3a62f81ba0 Added first UI changes 2018-12-13 14:49:59 +01:00