Commit Graph

12416 Commits

Author SHA1 Message Date
Rene Pfeuffer
0763ae9440 Add optional heades for api client push and put 2019-11-20 08:29:05 +01:00
Eduard Heimbuch
49bdf18fb0 fix integration tests 2019-11-20 08:24:42 +01:00
Rene Pfeuffer
55b1d1331b Merge with 2.0.0-m3 2019-11-20 07:54:15 +01:00
Eduard Heimbuch
fd75277176 cleanup 2019-11-19 16:43:45 +01:00
Eduard Heimbuch
9046a3f4d5 Merged in bugfix/outdated_context_bottom_border (pull request #355)
bugfix/outdated_context_bottom_border
2019-11-19 15:06:12 +00:00
Eduard Heimbuch
303458c44e Close branch bugfix/outdated_context_bottom_border 2019-11-19 15:06:12 +00:00
Eduard Heimbuch
aa7b6f5282 only migrate public flag if repository-v1-xml-backup 2019-11-19 15:42:22 +01:00
Eduard Heimbuch
e7cb674bb5 fix anonymous email 2019-11-19 14:27:14 +01:00
Eduard Heimbuch
e432d6d210 refactor 2019-11-19 14:23:05 +01:00
Eduard Heimbuch
2ec98c2763 remove repository public flag 2019-11-19 14:04:47 +01:00
Eduard Heimbuch
dd8f84e7c4 implement repository public flag migration to repositoryPermissions for _anonymous user 2019-11-19 13:50:57 +01:00
Rene Pfeuffer
1d2888f8e6 Fix dequote error in "normal" lines
Without this, quotes in normal lines were removed.
2019-11-19 10:13:58 +01:00
Rene Pfeuffer
3a3c27bb67 Enhance logging for diff comparison 2019-11-19 09:26:01 +01:00
Florian Scholdei
a795129c70 Remove global style: last div two levels below .modal-card-body
Apparently added for the CI plugin on 2019-07-24, but no longer necessary
2019-11-19 08:48:46 +01:00
Sebastian Sdorra
85861eddcc Merged in bugfix/decode_git_filenames_in_diff (pull request #337)
Bugfix decode git filenames in diff
2019-11-18 15:05:36 +00:00
Sebastian Sdorra
e9856b1643 Close branch bugfix/decode_git_filenames_in_diff 2019-11-18 15:05:36 +00:00
Eduard Heimbuch
0abb2e108d Merged in bugfix/missing_styles (pull request #353)
create separate styles bundle
2019-11-18 13:20:16 +00:00
Eduard Heimbuch
142a55d66c Close branch bugfix/missing_styles 2019-11-18 13:20:16 +00:00
Eduard Heimbuch
c6ba50b3b5 fix path for loading migration styles 2019-11-18 14:18:37 +01:00
Rene Pfeuffer
1ac39d1355 Merged in bugfix/anon_after_session_expired (pull request #351)
Don't use anonymous access after access token expires
2019-11-18 12:42:05 +00:00
Rene Pfeuffer
bf98c59050 Close branch bugfix/anon_after_session_expired 2019-11-18 12:42:05 +00:00
Sebastian Sdorra
436252b7a9 Merged in bugfix/anon_not_deletable (pull request #354)
Prohibit deletion of _anonymous
2019-11-18 12:28:50 +00:00
Sebastian Sdorra
02ecef61a3 Close branch bugfix/anon_not_deletable 2019-11-18 12:28:50 +00:00
Sebastian Sdorra
999a3476e6 move to scm-webapp 2019-11-18 13:28:28 +01:00
Rene Pfeuffer
fdfb033f6a Fix import 2019-11-18 13:25:08 +01:00
Rene Pfeuffer
f12c3920c0 Merge with 2.0.0-m3 2019-11-18 13:15:54 +01:00
Rene Pfeuffer
f960bbd0b9 Replace quotes in git command line, too 2019-11-18 12:51:16 +01:00
Eduard Heimbuch
babbc67653 Prohibit deletion of _anonymous user as long as the anonymous access is still enabled 2019-11-18 12:06:52 +01:00
Sebastian Sdorra
2c85a137a5 implement client side xsrf protection 2019-11-18 11:45:48 +01:00
Rene Pfeuffer
cbee87fa0c Buffer output and do not create new temp array streams 2019-11-18 11:41:09 +01:00
Sebastian Sdorra
5ea3c53613 create separate styles bundle 2019-11-18 10:56:40 +01:00
Rene Pfeuffer
b35d407d96 Merge with 2.0.0-m3 2019-11-18 10:34:12 +01:00
Rene Pfeuffer
78e5c1e21d Merged in feature/pr_approval (pull request #352)
Feature/pr approval
2019-11-15 11:35:27 +00:00
Rene Pfeuffer
f5b7d9f8f9 Close branch feature/pr_approval 2019-11-15 11:35:27 +00:00
Rene Pfeuffer
cc4c4f0822 Fix browse of empty repository
In an empty hg repository the Changeset c is null. This leads to an
NullPointerException in the original code. So we check whether we have
a Changeset and otherwise use the old functionality.
2019-11-15 09:50:28 +01:00
Rene Pfeuffer
2f5095e76a Handle missing blobs in blob store for lfs pointers 2019-11-15 09:33:38 +01:00
Rene Pfeuffer
ecec0764f8 Invert merge to get proper file diff 2019-11-15 09:31:08 +01:00
Eduard Heimbuch
5038c42869 merge 2.0.0-m3 2019-11-15 08:56:25 +01:00
Rene Pfeuffer
ff1abf2c1c Add conflict type 2019-11-14 15:07:49 +01:00
Sebastian Sdorra
42ab81cf50 implement ui client session id
This changeset introduces a client side session id, which is generated
once by the client (ui: apiClient) and is send with each request to server.
The server makes the session id available by the PrincipalCollection of the
subject.
2019-11-13 14:03:48 +01:00
Rene Pfeuffer
47da287178 Merge with 2.0.0-m3 2019-11-13 13:06:39 +01:00
Rene Pfeuffer
d1747557b3 Make conflict exception accessible with complex context 2019-11-13 10:48:36 +01:00
Florian Scholdei
9132167a6c Add title option to Button and remove IconButton 2019-11-12 17:30:37 +01:00
Florian Scholdei
6d2bdb6f29 Add IconButton 2019-11-12 14:48:32 +01:00
Florian Scholdei
ad063675f3 Merge with upstream 2019-11-12 14:31:10 +01:00
Eduard Heimbuch
234d98aee7 Don't use anonymous access after access token expires 2019-11-12 13:49:37 +01:00
Rene Pfeuffer
d8d7d993e3 Merge with 2.0.0-m3 2019-11-12 08:51:28 +01:00
Rene Pfeuffer
f0f134daeb Merged in feature/delete_source_branch (pull request #350)
Feature/delete source branch
2019-11-12 07:50:07 +00:00
Rene Pfeuffer
875b33d5c8 Close branch feature/delete_source_branch 2019-11-12 07:50:07 +00:00
Eduard Heimbuch
cc03af197f Merged in bugfix/merge_with_conflict (pull request #348)
Remove unused mapper
2019-11-12 07:48:20 +00:00