Commit Graph

12416 Commits

Author SHA1 Message Date
René Pfeuffer
e74770cd67 Merge with 2.0.0-m3 2018-12-13 13:44:02 +01:00
René Pfeuffer
360cba6c50 Use constant 2018-12-13 11:32:44 +01:00
René Pfeuffer
9e963b6aeb Enrich repository collection, too 2018-12-13 10:00:03 +01:00
René Pfeuffer
b392e3f9d2 Fix content type for simple exception mappers 2018-12-13 09:38:41 +01:00
René Pfeuffer
24cd9c3f8c Introduce repository config change event to clear caches 2018-12-13 09:22:10 +01:00
René Pfeuffer
c3e6e28262 Fix type 2018-12-13 08:18:04 +01:00
René Pfeuffer
db092e57e7 Move cache event to central position 2018-12-12 18:49:38 +01:00
René Pfeuffer
dbbe467479 Remove old property for default branch 2018-12-12 17:30:23 +01:00
Florian Scholdei
9b1de3cfb4 started impementation of wordbreak for table 2018-12-12 17:14:21 +01:00
René Pfeuffer
ddc2cbbfab Fix directory for file based stores 2018-12-12 15:59:53 +01:00
Maren Süwer
cab797fd83 show nothing if no diff is there 2018-12-12 15:40:24 +01:00
René Pfeuffer
b4081aaa99 Add endpoint to set default branch 2018-12-12 15:04:56 +01:00
René Pfeuffer
bc8c776821 Introduce config rest endpoint for default git branch 2018-12-12 14:12:55 +01:00
Florian Scholdei
6579ecfa75 added translation 2018-12-12 13:38:23 +01:00
Florian Scholdei
b27e3d2600 added translation 2018-12-12 13:35:58 +01:00
Florian Scholdei
c3a8ef9986 implemented unauthorized error message and link to reload page 2018-12-12 13:29:37 +01:00
Maren Süwer
8ecb64a8aa Merged in feature/label_bug (pull request #128)
implemented ie11 bug solution
2018-12-12 10:13:56 +00:00
Maren Süwer
602e432dac Close branch feature/label_bug 2018-12-12 10:13:56 +00:00
Maren Süwer
586a203168 renaming 2018-12-12 10:58:22 +01:00
Maren Süwer
adaa5850ef Merged in feature/move-diff-to-ui-components (pull request #129)
Feature/move diff to ui components
2018-12-12 09:25:34 +00:00
Maren Süwer
db8bba628f Close branch feature/move-diff-to-ui-components 2018-12-12 09:25:34 +00:00
Maren Süwer
8927d56b5c do not create new error when error is catched 2018-12-12 09:40:37 +01:00
Florian Scholdei
48bfd17808 implemented ie11 bug solution 2018-12-12 09:26:21 +01:00
Sebastian Sdorra
675f417d45 fix resultHasMediaType for camel case media types 2018-12-11 15:14:59 +01:00
Sebastian Sdorra
c3727eb9c2 create a separate LoadingDiff component 2018-12-11 14:13:32 +01:00
Sebastian Sdorra
b22cb46ac2 reimplement diff and move it to ui-components 2018-12-11 13:25:35 +01:00
René Pfeuffer
cdf2f2e238 Suppress sonar issue 2018-12-11 11:36:51 +01:00
Sebastian Sdorra
ee3e3d4ecc Merged in feature/merge_conflictResolution (pull request #126)
Feature/merge conflictResolution
2018-12-11 09:00:26 +00:00
Sebastian Sdorra
8807c8f7b3 Close branch feature/merge_conflictResolution 2018-12-11 09:00:26 +00:00
Sebastian Sdorra
858d2816da fix wrong i18n key and added step 6 the push 2018-12-11 09:53:40 +01:00
René Pfeuffer
d31090bcd4 Introduce generic BadRequestException 2018-12-10 18:06:13 +01:00
Maren Süwer
f834dd5297 update information 2018-12-10 15:56:21 +01:00
Maren Süwer
5902dfab6a refactor 2018-12-10 15:47:46 +01:00
Maren Süwer
e636d409ed correct error throwing in apiclient and add extension point 2018-12-10 15:36:52 +01:00
Maren Süwer
caa3d3b62d Merged in feature/move-to-ui-components (pull request #125)
Feature/move to ui components
2018-12-10 14:07:45 +00:00
Maren Süwer
f4d4d58c93 Close branch feature/move-to-ui-components 2018-12-10 14:07:45 +00:00
Sebastian Sdorra
50ba6af6ba use media-content instead of media-left again 2018-12-10 15:06:50 +01:00
Sebastian Sdorra
822a5382ce update ProfileInfo and ChangesetDetails for new avatar components 2018-12-10 14:55:42 +01:00
Sebastian Sdorra
d1da23dd92 merge with 2.0.0-m3 2018-12-10 14:36:10 +01:00
Sebastian Sdorra
c5a625571d merge with branch feature/incomming_endpoint 2018-12-10 14:35:21 +01:00
Sebastian Sdorra
8d27449c86 merge with 2.0.0-m3 2018-12-10 14:06:44 +01:00
Sebastian Sdorra
3d36d07e1d Merged in feature/merge_endpoint (pull request #122)
Feature merge endpoint
2018-12-10 12:20:12 +00:00
Sebastian Sdorra
2a45f250ed Close branch feature/merge_endpoint 2018-12-10 12:20:12 +00:00
René Pfeuffer
868d1302d3 Merge with remote 2018-12-10 12:04:41 +01:00
René Pfeuffer
a54faf1233 Do not merge with fast forward 2018-12-10 12:01:13 +01:00
René Pfeuffer
0e333002db Create local branch for target during merge 2018-12-10 11:43:27 +01:00
Sebastian Sdorra
b08c291e82 merge with 2.0.0-m3 2018-12-10 11:34:06 +01:00
René Pfeuffer
8b518d320d Fix checkout of target branch 2018-12-10 08:59:19 +01:00
Sebastian Sdorra
97c4b0998b move changesets and avatar components to ui-components 2018-12-10 08:45:59 +01:00
Maren Süwer
040035e084 renaming 2018-12-10 08:42:29 +01:00