Commit Graph

778 Commits

Author SHA1 Message Date
René Pfeuffer
1ad2ea61f5 Remove not implemented config options 2019-03-14 13:42:13 +01:00
René Pfeuffer
dbc20f3560 Merge with 2.0.0-m3 2019-03-12 15:20:03 +01:00
René Pfeuffer
6ebbfa97a3 Start entity types with a capital char 2019-03-12 15:10:43 +01:00
Sebastian Sdorra
a5da481593 fix german locale for DateFromNow 2019-03-12 10:44:58 +01:00
Sebastian Sdorra
3ac47b0977 replace diff2html with react-diff-view 2019-02-26 15:00:05 +01:00
Sebastian Sdorra
fddb3ddc1f removed debugging log file from mercurial hooks 2019-02-25 11:33:40 +01:00
René Pfeuffer
9244a72110 Fix unit test 2019-02-21 12:16:39 +01:00
René Pfeuffer
3007004b8b Fix permission check for plugins 2019-02-21 11:25:03 +01:00
Philipp Czora
17c496222d Merged in feature/consolidate_permissions (pull request #196)
Feature consolidate permissions
2019-02-20 14:20:03 +00:00
René Pfeuffer
8c674c6fdb Merged in bugflix/mercurial_pending_changesets (pull request #195)
fixed injection of HgContext, if no request scope is available
2019-02-20 12:14:50 +00:00
Sebastian Sdorra
13adf4b234 fixed PreReceiveRepositoryHooks for newer versions of mercurial 2019-02-20 11:56:10 +01:00
René Pfeuffer
242e0b3972 Fix case 2019-02-19 13:16:22 +01:00
René Pfeuffer
849d818f3a Adapt to new permissions 2019-02-18 15:05:33 +01:00
Sebastian Sdorra
173e51096b fixed injection of HgContext, if no request scope is available 2019-02-18 12:01:34 +01:00
René Pfeuffer
5a5cafaee0 Add comment from previous commit 2019-02-14 11:22:58 +01:00
Sebastian Sdorra
49e9671fa7 added some javadoc 2019-02-13 12:42:07 +01:00
Sebastian Sdorra
352bfe7f5a fixed mercurial PreReceiveRepositoryHooks
The problem seems to be that guice had multiple options for injecting
HgContext. HgContextProvider bound via Module and HgContext bound void
RequestScoped annotation. It looks like that Guice 4 injects randomly
the one or the other, in SCMv1 (Guice 3) everything works as expected.

To fix the problem we have created a new class annotated with
RequestScoped, which holds an instance of HgContext. This way only the
HgContextProvider is used for injection.
2019-02-13 12:30:40 +01:00
Mohamed Karray
d4a79ee140 Merged in bugfix/read_vcs_versions (pull request #178)
Fix class loader for creation of vcs version string
2019-02-06 09:04:04 +00:00
Sebastian Sdorra
ad4277ba41 merge with 2.0.0-m3 2019-02-05 16:50:14 +01:00
Mohamed Karray
75b5e88a90 merge 2019-02-05 15:18:52 +01:00
René Pfeuffer
accd20538e Fix class loader for creation of vcs version string
Use UberClassLoader in
AbstractSimpleRepositoryHandler#getStringFromResource

Therefore pass through plugin loader
2019-02-04 14:35:51 +01:00
Iwan Schindler
0319bdf8f0 i18n for core plugins 2019-02-01 11:45:44 +01:00
Sebastian Sdorra
8bf82213b8 remove unused imports 2019-01-30 14:48:37 +01:00
Sebastian Sdorra
f8f5237ad0 fix usage of deprecated mockito classes 2019-01-30 14:44:38 +01:00
Sebastian Sdorra
69dda6403d update resteasy to v3.6.2.Final in order to fix CVE-2017-7561 and CVE-2016-6347 2019-01-30 13:21:11 +01:00
Sebastian Sdorra
4f72f1d304 remove unused repositories to speedup build 2019-01-30 10:32:29 +01:00
Sebastian Sdorra
d820605186 fixed integration of mercurial config changes of 1.x 2019-01-29 14:00:11 +01:00
Sebastian Sdorra
b231499cd0 merge with branch 1.x 2019-01-29 09:42:03 +01:00
Sebastian Sdorra
02c3698aaf merge with branch feature/bugfix_issuetracker 2019-01-25 12:35:58 +01:00
Sebastian Sdorra
78b2874a19 Merged in matt_harbison/scm-manager/1.x (pull request #43)
Load global Mercurial configuration in 4.1+ and minor hook tweaks
2019-01-24 20:35:42 +00:00
Matt Harbison
628973ed7d #1001 support Mercurial 4.7 through 4.9
The command fallback is per the documented example[1], and the date fallback is
adapted from hg-evolve.

[1] https://www.mercurial-scm.org/repo/hg/rev/86f6b441adea
2019-01-23 11:49:57 -05:00
Philipp Czora
5c4d2764ad Renamed logger constant 2019-01-22 14:20:54 +01:00
Philipp Czora
13fa846d6a Fixed bug caused by an unclosed InputStream 2019-01-22 13:43:49 +01:00
Philipp Czora
bb6682ac0e Fixed a bug causing problems with rev numbers > 999 2019-01-22 13:43:22 +01:00
René Pfeuffer
760a37409b Specify global permissions 2019-01-21 09:17:43 +01:00
Philipp Czora
4875ef9639 Use recent ui-extensions version b/c of a required bugfix 2019-01-18 11:25:59 +01:00
Sebastian Sdorra
b22cb46ac2 reimplement diff and move it to ui-components 2018-12-11 13:25:35 +01:00
Sebastian Sdorra
7bcf7a4774 merge repository heads 2018-12-05 15:06:58 +01:00
Sebastian Sdorra
b53ab4d438 merge with feature/autocomplete 2018-12-05 15:05:56 +01:00
René Pfeuffer
3021bea65a Multiply floating store factories for type safety 2018-12-04 08:56:39 +01:00
René Pfeuffer
33f3216164 Make type optional 2018-12-03 16:30:19 +01:00
René Pfeuffer
44d99f55f2 Do no longer expose StoreParameters 2018-12-03 12:28:35 +01:00
René Pfeuffer
ab8b3bae42 Merge with 2.0.0-m3 2018-12-03 08:28:47 +01:00
Sebastian Sdorra
84dd6bf60f fix some code smells reported by sonarqube 2018-11-30 08:19:47 +01:00
Mohamed Karray
171f4e2f07 merge 2018-11-29 16:59:04 +01:00
Mohamed Karray
37f4a2b669 merge 2018-11-29 16:01:43 +01:00
Sebastian Sdorra
e9401624a7 re implement XmlRepositoryDAO 2018-11-28 19:49:55 +01:00
Mohamed Karray
fb79cbfd02 merge + refactor getStoreDirectory 2018-11-28 15:14:49 +01:00
René Pfeuffer
d4db39755f Harmonize repository resolution 2018-11-27 15:31:57 +01:00
René Pfeuffer
bc629ec648 Send repository id with hg hook request 2018-11-27 14:06:11 +01:00