Commit Graph

  • e9856b1643 Close branch bugfix/decode_git_filenames_in_diff Sebastian Sdorra 2019-11-18 15:05:36 +00:00
  • 0abb2e108d Merged in bugfix/missing_styles (pull request #353) Eduard Heimbuch 2019-11-18 13:20:16 +00:00
  • 142a55d66c Close branch bugfix/missing_styles Eduard Heimbuch 2019-11-18 13:20:16 +00:00
  • c6ba50b3b5 fix path for loading migration styles Eduard Heimbuch 2019-11-18 14:18:37 +01:00
  • 1ac39d1355 Merged in bugfix/anon_after_session_expired (pull request #351) Rene Pfeuffer 2019-11-18 12:42:05 +00:00
  • bf98c59050 Close branch bugfix/anon_after_session_expired Rene Pfeuffer 2019-11-18 12:42:05 +00:00
  • 436252b7a9 Merged in bugfix/anon_not_deletable (pull request #354) Sebastian Sdorra 2019-11-18 12:28:50 +00:00
  • 02ecef61a3 Close branch bugfix/anon_not_deletable Sebastian Sdorra 2019-11-18 12:28:50 +00:00
  • 999a3476e6 move to scm-webapp Sebastian Sdorra 2019-11-18 13:28:28 +01:00
  • fdfb033f6a Fix import Rene Pfeuffer 2019-11-18 13:25:08 +01:00
  • f12c3920c0 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-18 13:15:54 +01:00
  • f960bbd0b9 Replace quotes in git command line, too Rene Pfeuffer 2019-11-18 12:51:16 +01:00
  • babbc67653 Prohibit deletion of _anonymous user as long as the anonymous access is still enabled Eduard Heimbuch 2019-11-18 12:06:52 +01:00
  • 2c85a137a5 implement client side xsrf protection Sebastian Sdorra 2019-11-18 11:45:48 +01:00
  • cbee87fa0c Buffer output and do not create new temp array streams Rene Pfeuffer 2019-11-18 11:41:09 +01:00
  • 5ea3c53613 create separate styles bundle Sebastian Sdorra 2019-11-18 10:56:40 +01:00
  • b35d407d96 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-18 10:34:12 +01:00
  • 78e5c1e21d Merged in feature/pr_approval (pull request #352) Rene Pfeuffer 2019-11-15 11:35:27 +00:00
  • f5b7d9f8f9 Close branch feature/pr_approval Rene Pfeuffer 2019-11-15 11:35:27 +00:00
  • cc4c4f0822 Fix browse of empty repository Rene Pfeuffer 2019-11-15 09:50:28 +01:00
  • 2f5095e76a Handle missing blobs in blob store for lfs pointers Rene Pfeuffer 2019-11-15 09:33:38 +01:00
  • 5038c42869 merge 2.0.0-m3 Eduard Heimbuch 2019-11-15 08:56:25 +01:00
  • d1747557b3 Make conflict exception accessible with complex context Rene Pfeuffer 2019-11-13 10:48:36 +01:00
  • 9132167a6c Add title option to Button and remove IconButton Florian Scholdei 2019-11-12 17:30:37 +01:00
  • 6d2bdb6f29 Add IconButton Florian Scholdei 2019-11-12 14:48:32 +01:00
  • ad063675f3 Merge with upstream Florian Scholdei 2019-11-12 14:31:10 +01:00
  • 234d98aee7 Don't use anonymous access after access token expires Eduard Heimbuch 2019-11-12 13:49:37 +01:00
  • f0f134daeb Merged in feature/delete_source_branch (pull request #350) Rene Pfeuffer 2019-11-12 07:50:07 +00:00
  • 875b33d5c8 Close branch feature/delete_source_branch Rene Pfeuffer 2019-11-12 07:50:07 +00:00
  • cc03af197f Merged in bugfix/merge_with_conflict (pull request #348) Eduard Heimbuch 2019-11-12 07:48:20 +00:00
  • b14fb1d852 Close branch bugfix/merge_with_conflict Eduard Heimbuch 2019-11-12 07:48:20 +00:00
  • 8ed874c103 Use dedicated exception for default branch deletion Rene Pfeuffer 2019-11-11 16:51:46 +01:00
  • f7e42db850 Rename method Rene Pfeuffer 2019-11-11 16:50:39 +01:00
  • 8e4606cff1 Merge with 2.0.0-m3 Rene Pfeuffer 2019-11-11 16:33:40 +01:00
  • 0168234534 Merged in feature/create_branch_without_clone (pull request #349) Sebastian Sdorra 2019-11-11 15:08:27 +00:00
  • 6a2bf9d32a Close branch feature/create_branch_without_clone Sebastian Sdorra 2019-11-11 15:08:27 +00:00
  • 73efd244ab add BranchCommand to git + hg repositoryServiceProvider Eduard Heimbuch 2019-11-11 11:53:28 +01:00
  • 782b201e55 cleanup Eduard Heimbuch 2019-11-11 11:21:51 +01:00
  • 39d41a56c5 implement deleteBranchCommand for hg Eduard Heimbuch 2019-11-11 11:16:33 +01:00
  • 7cd2cb4ccb implement deleteBranchCommand for git Eduard Heimbuch 2019-11-11 11:15:56 +01:00
  • 1695d13a98 Create new branches without clone of git repository Rene Pfeuffer 2019-11-11 10:30:11 +01:00
  • c2e30a582f Remove unused mapper Rene Pfeuffer 2019-11-08 16:44:04 +01:00
  • 73cdab4ddc Merged in feature/merge_with_squash (pull request #347) Rene Pfeuffer 2019-11-08 15:41:45 +00:00
  • 520c0d6ecf Close branch feature/merge_with_squash Rene Pfeuffer 2019-11-08 15:41:45 +00:00
  • ae32b6f797 Use dedicated exception for unsupported merge strategies Rene Pfeuffer 2019-11-08 15:44:37 +01:00
  • 52ccce1aaa Secure test Rene Pfeuffer 2019-11-08 15:43:51 +01:00
  • 8e0026962d Fix typo Rene Pfeuffer 2019-11-08 14:10:27 +01:00
  • 313ec7fe5d fix dependencies after removing mergeResource Eduard Heimbuch 2019-11-08 13:10:31 +01:00
  • b1216a898b remove mergeResource and move dryRun to review-plugin Eduard Heimbuch 2019-11-08 11:46:13 +01:00
  • a41f490871 refactor after review Eduard Heimbuch 2019-11-08 08:36:00 +01:00
  • e736ae6c50 cleanup Eduard Heimbuch 2019-11-07 13:42:45 +01:00
  • ec6b4493c8 use strategy pattern for mergeStrategies Eduard Heimbuch 2019-11-07 11:50:28 +01:00
  • de09097203 cleanup Eduard Heimbuch 2019-11-07 08:14:15 +01:00
  • cf90654e24 implement fast forward if possible Eduard Heimbuch 2019-11-06 15:26:20 +01:00
  • b4f1e8874a change mergeStrategy order Eduard Heimbuch 2019-11-06 09:54:17 +01:00
  • c51118f575 Merged in feature/remove_redundant_logging (pull request #346) Sebastian Sdorra 2019-11-06 08:06:26 +00:00
  • 2826273719 Close branch feature/remove_redundant_logging Sebastian Sdorra 2019-11-06 08:06:26 +00:00
  • b47cc56a86 Remove redundant logging Rene Pfeuffer 2019-11-06 08:32:00 +01:00
  • 7e00d22e9e merge 2.0.0-m3 Eduard Heimbuch 2019-11-06 07:48:35 +01:00
  • bc5948f823 add new MergeStrategies Eduard Heimbuch 2019-11-06 07:47:23 +01:00
  • 5d7bdc24d4 Make payload parameter optional Florian Scholdei 2019-11-05 16:10:41 +01:00
  • 4e053b1aa0 Merged in feature/modify_for_svn (pull request #342) Sebastian Sdorra 2019-11-05 13:30:25 +00:00
  • c18c64c15a Close branch feature/modify_for_svn Sebastian Sdorra 2019-11-05 13:30:25 +00:00
  • db46441adf move mergeResultDto + mapper to scm-core Eduard Heimbuch 2019-11-05 09:51:58 +01:00
  • 9df12bc35e check if mergeStrategy is supported for mergeCommand Eduard Heimbuch 2019-11-04 17:34:44 +01:00
  • 4b024c650c implement squash to mergeCommand Eduard Heimbuch 2019-11-04 15:16:37 +01:00
  • a532426958 refactor SvnModifyCommand to be more readable Sebastian Sdorra 2019-11-04 12:16:22 +01:00
  • 3aea20370a fixed returning null for getScmRepository from SimpleSvnWorkDirFactory Sebastian Sdorra 2019-11-04 12:03:19 +01:00
  • e4c8783c61 return null if commit was not merged into requested branch Sebastian Sdorra 2019-11-04 11:46:27 +01:00
  • d5bd83fafb fix encoding and decoding for branches including slashes Eduard Heimbuch 2019-11-01 13:52:53 +01:00
  • 557856185a small fix Eduard Heimbuch 2019-11-01 10:18:13 +01:00
  • d7d7c87d16 Merged in feature/fix_sonar_and_lifecycle (pull request #345) Eduard Heimbuch 2019-11-01 09:13:35 +00:00
  • b9fd0b3011 Close branch feature/fix_sonar_and_lifecycle Eduard Heimbuch 2019-11-01 09:13:35 +00:00
  • 33cce15e33 fix navLink Highlighting for sourceext Eduard Heimbuch 2019-11-01 09:40:20 +01:00
  • 5a9cbbc073 use i18n for missing extension warning / fix encoding for branches containing slashes Eduard Heimbuch 2019-11-01 09:29:57 +01:00
  • c9defc7595 added missing tests for language select of DateFromNow Sebastian Sdorra 2019-10-30 15:46:03 +01:00
  • 55efed92f9 fix DateFromNow i18n without provided locales Sebastian Sdorra 2019-10-30 15:29:49 +01:00
  • 8b632fdb37 fix wrong localization of dates for locales with regions such as de_DE Sebastian Sdorra 2019-10-30 15:26:43 +01:00
  • f5fb4fb11a fix sonarqube warning about js array sort Sebastian Sdorra 2019-10-30 14:52:46 +01:00
  • e878f86b46 update apache tika to version 1.22 Sebastian Sdorra 2019-10-30 14:18:00 +01:00
  • 3a4c4b0986 update commons-codec to version 1.13 Sebastian Sdorra 2019-10-30 14:17:15 +01:00
  • 7252d10b95 update apache shiro to version 1.4.1 Sebastian Sdorra 2019-10-30 14:14:30 +01:00
  • 6fe2765edb update jackson to version 2.10.0 Sebastian Sdorra 2019-10-30 14:13:14 +01:00
  • 8e9aaea292 update jetty to version 9.4.22.v20191022 Sebastian Sdorra 2019-10-30 13:59:25 +01:00
  • 7c1c067798 Merged in feature/enhance_ui_experience (pull request #344) Sebastian Sdorra 2019-10-30 12:09:17 +00:00
  • 1a1570fba0 Close branch feature/enhance_ui_experience Sebastian Sdorra 2019-10-30 12:09:17 +00:00
  • 4f17bc6b1c refactor backend for modifyCommand / add sourceExtension for plugins Eduard Heimbuch 2019-10-30 12:59:54 +01:00
  • 3c239aea4e Update storyshots Florian Scholdei 2019-10-29 17:21:40 +01:00
  • b74865f4df Correct className type Florian Scholdei 2019-10-29 16:44:35 +01:00
  • 289b3a3d21 Add styling of group memberlist Florian Scholdei 2019-10-29 16:41:35 +01:00
  • b5d30e53e4 Fix border-radius for modal in case no .modal-foot exists Florian Scholdei 2019-10-29 16:15:25 +01:00
  • cd4874f4d3 Specify card-columns to select css properties more clearly Florian Scholdei 2019-10-29 14:35:23 +01:00
  • 37b8a50e98 Pass new title option Florian Scholdei 2019-10-29 14:33:52 +01:00
  • e74f8a4d4e Remove doubled field/column Florian Scholdei 2019-10-29 14:32:27 +01:00
  • f496279592 Add title option comparable to label for InputFields Florian Scholdei 2019-10-29 14:31:47 +01:00
  • ec488c1880 Remove unused field grouping Florian Scholdei 2019-10-29 14:20:14 +01:00
  • 73c4b21429 Hide proxy excludes list when empty Florian Scholdei 2019-10-29 14:18:47 +01:00
  • 19f180d1e1 Correct tooltip classNames for bulma-tooltip version 3.0.0 Florian Scholdei 2019-10-29 14:14:34 +01:00
  • 48154cce0f fix unit tests Eduard Heimbuch 2019-10-29 13:49:04 +01:00
  • 7fd3d08540 add requestedRevision to BrowseCommandResult Eduard Heimbuch 2019-10-29 13:04:29 +01:00