Eduard Heimbuch
29a6b42fce
Check for external merge tools during merge
...
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-06-25 05:50:04 +02:00
René Pfeuffer
11a2dcda41
Re-add Sonar build stage
2024-06-24 14:36:46 +02:00
CES Marvin
a0db5326be
Prepare for next development iteration
2024-06-24 12:35:52 +00:00
CES Marvin
bad14dfcfa
Release version 3.2.2
2024-06-24 12:23:27 +00:00
René Pfeuffer
8434e07d76
Adjust changelog for release 3.2.2
2024-06-24 11:58:11 +02:00
René Pfeuffer
e29d30c578
Merge branch 'hotfix/2.46.4' into develop
...
# Conflicts:
# CHANGELOG.md
# gradle.properties
# scm-dao-xml/src/main/java/sonia/scm/repository/xml/XmlRepositoryDAO.java
# scm-plugins/scm-git-plugin/package.json
# scm-plugins/scm-hg-plugin/package.json
# scm-plugins/scm-legacy-plugin/package.json
# scm-plugins/scm-svn-plugin/package.json
# scm-ui/e2e-tests/package.json
# scm-ui/ui-api/package.json
# scm-ui/ui-buttons/package.json
# scm-ui/ui-components/package.json
# scm-ui/ui-extensions/package.json
# scm-ui/ui-forms/package.json
# scm-ui/ui-layout/package.json
# scm-ui/ui-legacy/package.json
# scm-ui/ui-modules/package.json
# scm-ui/ui-overlays/package.json
# scm-ui/ui-plugins/package.json
# scm-ui/ui-polyfill/package.json
# scm-ui/ui-scripts/package.json
# scm-ui/ui-shortcuts/package.json
# scm-ui/ui-styles/package.json
# scm-ui/ui-syntaxhighlighting/package.json
# scm-ui/ui-tests/package.json
# scm-ui/ui-text/package.json
# scm-ui/ui-types/package.json
# scm-ui/ui-webapp/package.json
2024-06-24 11:53:58 +02:00
CES Marvin
c023ebf3ff
Release version 2.46.4
2024-06-24 08:59:07 +00:00
Eduard Heimbuch
79326f3c1b
Fix highlighting for search results which were not marked properly
...
Co-authored-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Pushed-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
2024-06-24 10:54:37 +02:00
René Pfeuffer
e8af0ee7cd
Adjust changelog for release
2024-06-24 10:51:24 +02:00
Laura Gorzitze
38d0325b4c
Check on duplicate name for rename
...
Add check whether namespace and name already exist
when renaming a repository.
2024-06-24 10:12:53 +02:00
Laura Gorzitze
74ec91a95c
Prepare for next development iteration
2024-06-21 09:53:02 +02:00
Rene Pfeuffer
b98cdeb28d
Fix sub repositories in mercurial
...
The sub repositories did not show up in the source view. This fixes python errors for the computation of sub repositories in hg.
Pushed-by: Rene Pfeuffer<rene.pfeuffer@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-06-19 17:46:42 +02:00
Laura Gorzitze
d74fd099cc
Add written offer to the distributions
...
Add written offer as a text file in all distributions
Co-authored-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
Committed-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
Pushed-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
2024-06-18 15:23:30 +02:00
Laura Gorzitze
978aebf664
Fix distribution call when calling without setting hotfix variable
2024-06-18 10:52:14 +02:00
Laura Gorzitze
25548e9f0a
Add error description for read-only exception
2024-06-18 09:47:52 +02:00
René Pfeuffer
0887be3ec1
Fix tooltip text for "show whitespace" button
2024-06-17 16:46:07 +02:00
Florian Scholdei
03e5ecbc7c
Form on search page retains context
...
The result category will no longer be reset
to 'repository' when the search query is
refined and resubmitted.
2024-06-12 13:55:35 +02:00
Eduard Heimbuch
728915fe1c
Prevent hiding the inner content on diffs without content
...
. This breaks the file comments on empty files in the review plugin.
Co-authored-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Committed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
Pushed-by: Eduard Heimbuch<eduard.heimbuch@cloudogu.com >
2024-06-10 15:45:46 +02:00
Tarik Gürsoy
5145bc9300
Add documentation for the search syntax
...
Pushed-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
Co-authored-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
2024-06-10 14:03:36 +02:00
Viktor Egorov
5d446278d9
Fixed branch name limit
...
Pushed-by: Viktor Egorov<viktor.egorov-extern@cloudogu.com >
Co-authored-by: Viktor<viktor.egorov@triology.de >
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Pushed-by: Thomas Zerr<thomas.zerr@cloudogu.com >
2024-06-10 13:21:30 +02:00
René Pfeuffer
ba8e43349a
Fix issues when replaying a release build
...
- The release branch is reset to the original state
- The local tag is deleted
2024-05-31 11:30:50 +02:00
CES Marvin
0ffd80310b
Prepare for next development iteration
2024-05-31 09:18:21 +00:00
CES Marvin
a0e464bed6
Release version 3.2.1
2024-05-31 09:03:24 +00:00
René Pfeuffer
4a79718531
Adjust changelog for release 3.2.1
2024-05-31 09:25:39 +02:00
René Pfeuffer
2222a78baa
Merge branch 'main' into develop
2024-05-30 10:40:03 +02:00
René Pfeuffer
ae53ff2494
Merge tag '2.46.3'
...
Release version 2.46.3
2024-05-30 10:39:05 +02:00
CES Marvin
87a727b587
Release version 2.46.3
2024-05-29 12:02:24 +00:00
René Pfeuffer
5e3b660e8e
Adjust changelog for release 2.46.3
2024-05-29 10:40:29 +02:00
René Pfeuffer
ea4a148d86
Fix determination of default branch for git config on push
2024-05-29 10:40:28 +02:00
René Pfeuffer
e79ad2b1b8
Prepare for next development iteration
2024-05-29 10:34:19 +02:00
Florian Scholdei
59238eb0ea
Fix mirror tag import
...
Pushed-by: Florian Scholdei<florian.scholdei@cloudogu.com >
Co-authored-by: Florian Scholdei<florian.scholdei@cloudogu.com >
2024-05-29 08:47:19 +02:00
Florian Scholdei
96548dad88
Enhance CHANGELOG.md
2024-05-28 11:04:59 +02:00
CES Marvin
c663879137
Prepare for next development iteration
2024-05-23 11:38:26 +00:00
CES Marvin
458d72002c
Release version 3.2.0
2024-05-23 10:50:27 +00:00
Thomas Zerr
b9abe8a729
Adjust changelog for release 3.2.0
2024-05-23 11:17:03 +02:00
Eduard Heimbuch
d55f5deda7
Fix unit tests
2024-05-23 08:21:36 +02:00
Eduard Heimbuch
bef418692b
Delete annoying unit test which breaks the unit test suite
2024-05-22 14:33:06 +02:00
Thomas Zerr
09d72280d0
Fix exact search
...
Previously a query was only parsed by lucene as it is, if the query
contained a colon (:) or a wildcard character (*). With this, every query
gets parsed as it is, as long as there is one operator contained inside
the query (colon, quotation marks, logical operators, ...). These are
called "expert queries". All other queries are still processed as
"simple queries" where every part of the query is extended with a
wildcard operator.
Addtionally the user is now getting feedback for every
search, if the query is a simple query or an expert query. The syntax
documentation got also extended with the quotation mark operator
and the definition of the two query types.
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-05-14 11:45:10 +02:00
Viktor Egorov
c8ef99cf07
Add option to hide whitepace changes in diffs
...
Co-authored-by: Florian Scholdei<florian.scholdei@cloudogu.com >
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
Reviewed-by: Florian Scholdei <florian.scholdei@cloudogu.com >
2024-05-14 11:33:48 +02:00
Tarik Gürsoy
e5e2fd151c
added lombok env variable for jococo
...
this single env variable had to be set in order for jococo to ignore code that is auto generated by lombok annotations
Pushed-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
Co-authored-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Committed-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
Pushed-by: Thomas Zerr<thomas.zerr@cloudogu.com >
Co-authored-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
2024-05-13 16:44:47 +02:00
Laura Gorzitze
f811831858
Fix mirror tag component to show color respective to synchronisation status
...
Adjust component used for mirror tag in Respository-Mirror-Plugin to display a wider range of colors in order to display color respective to synchronisation status
Pushed-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
Co-authored-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
Pushed-by: Laura Gorzitze<laura.gorzitze@cloudogu.com >
Co-authored-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
2024-05-08 13:47:24 +02:00
Thomas Zerr
6fbde760d4
Fix double /trunk folder bug
...
With this change, every repository initializer gets its own modification command and therefore its own commit. This allows each initializer to decide on its own, if he want to use the default path of the repository.
2024-04-30 15:28:08 +02:00
Viktor Egorov
cdbf86b8c9
Add option to mark whitespace characters in diffs
...
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-04-26 15:15:52 +02:00
Florian Scholdei
3773d77889
Add possibility to specify StickyHeader top position of Diff component
2024-04-22 18:04:26 +02:00
Tarik Gürsoy
4aec33177c
added a11y tooltip
...
a11y tooltip has been implemented according to the figma mockup
Pushed-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
Co-authored-by: Tarik Gürsoy<tarik.guersoy@cloudogu.com >
2024-04-22 09:25:51 +02:00
Rene Pfeuffer
c7b3511942
Update bouncycastle due to snyk
...
See SNYK-JAVA-ORGBOUNCYCASTLE-6612985
2024-04-17 16:45:18 +02:00
Tarik Gürsoy
fdb6f2cd42
Implement new Icon Button component
...
Co-authored-by: René Pfeuffer<rene.pfeuffer@cloudogu.com >
2024-04-11 16:31:13 +02:00
CES Marvin
56f335468d
Prepare for next development iteration
2024-04-09 08:38:52 +00:00
CES Marvin
a896fc08c9
Release version 3.1.0
2024-04-09 07:52:08 +00:00
Viktor
53db64d064
Adjust changelog for release 3.1.0
2024-04-09 09:47:07 +02:00
