Mohamed Karray
cea4f99d02
fix unit test
2018-09-17 10:39:07 +02:00
Mohamed Karray
d426445b4f
change password endpoint
2018-09-17 09:59:19 +02:00
Johannes Schnatterer
470909199e
Automated merge
2018-09-12 18:01:12 +02:00
Johannes Schnatterer
2c752f9e8b
Jenkins: Add a global build timeout
...
Prepares migration to oss.cloudogu.com.
There, we're recognized some builds that hang for hours after some
errors.
2018-09-12 18:01:00 +02:00
Johannes Schnatterer
f9a9a94a3f
Jenkins: Run maven build in docker.
...
Prepares migration to oss.cloudogu.com.
There, we're only running on one build node, where concurrent builds
result in failing integration tests, because they all bind to port 8081.
2018-09-12 17:59:03 +02:00
Johannes Schnatterer
7fc78e7c32
Maven: Downgrade to animal-sniffer
...
Prepares migration to oss.cloudogu.com.
There, builds failed every now and then (when a lot of builds ran in
parallel) with the problem described in the link of the comment in
pom.xml
2018-09-12 17:57:48 +02:00
Philipp Czora
0616c13d47
Merged in feature/ui-for-production (pull request #70 )
...
Feature/ui for production
2018-09-12 08:36:19 +00:00
Philipp Czora
bfa323dcad
Close branch feature/ui-for-production
2018-09-12 08:36:19 +00:00
Philipp Czora
de5dc77cec
Fixed avatar file paths for the Subversion- and Git-Plugin
2018-09-12 10:03:29 +02:00
Philipp Czora
07eb8aa4e4
Merged in feature/file_history_endpoint_v2 (pull request #69 )
...
Feature/file history endpoint v2
2018-09-12 07:40:51 +00:00
Philipp Czora
2387c17e5e
Close branch feature/file_history_endpoint_v2
2018-09-12 07:40:51 +00:00
Mohamed Karray
cad0b9ff49
merge
2018-09-10 15:51:29 +02:00
Sebastian Sdorra
78f19ecfa3
update ui-bundler to version 0.0.15
2018-09-10 15:11:51 +02:00
Sebastian Sdorra
d3c54396d3
merge with branch 2.0.0-m3
2018-09-10 14:53:59 +02:00
Sebastian Sdorra
0cb44e3317
allow changing context path, by using a template for index.html
2018-09-10 14:52:32 +02:00
Sebastian Sdorra
13b8b92273
fixed web resource path loading on windows
2018-09-10 13:44:42 +02:00
Sebastian Sdorra
570840577e
Merged in feature/diff_endpoint_v2 (pull request #66 )
...
implement the diff endpoint for v2
2018-09-10 11:06:03 +00:00
Sebastian Sdorra
f57d87b257
Close branch feature/diff_endpoint_v2
2018-09-10 11:06:03 +00:00
Sebastian Sdorra
e6e5fee54c
update web-resources to v1.0.2
2018-09-10 12:54:52 +02:00
Sebastian Sdorra
72a5b6f43c
use web-resources to deliver web resources from the WebResourceServlet
2018-09-10 12:04:56 +02:00
Mohamed Karray
75428d545f
merge
2018-09-10 11:13:36 +02:00
Philipp Czora
6b6b558823
Merged in feature/ui-components (pull request #68 )
...
Feature/ui components
2018-09-10 08:59:00 +00:00
Philipp Czora
0cd5f7cd1c
Close branch feature/ui-components
2018-09-10 08:59:00 +00:00
Mohamed Karray
8ec7677b75
integration tests for the file history endpoint
2018-09-10 09:51:59 +02:00
Philipp Czora
db40d9e3b7
Merged 2.0.0-m3
2018-09-07 11:32:36 +02:00
Johannes Schnatterer
006a496d08
Jenkins: Changes name of Sonar instance.
...
Prepares migration to oss.cloudogu.com.
There already is an instance called "sonarcloud.io", which refers to a
different sonarcloud organization.
2018-09-07 10:29:58 +02:00
Mohamed Karray
faea3cddce
add crlf exception and exception mapper
2018-09-06 14:57:52 +02:00
Sebastian Sdorra
9c80da5838
use scm-ui as overlay war, if livereload property was not set
2018-09-06 14:44:01 +02:00
Sebastian Sdorra
51529f3186
update ui-bundler in order to compress ui bundles
2018-09-06 14:43:25 +02:00
Sebastian Sdorra
94e23ca91e
create war file of scm-ui
2018-09-06 14:42:48 +02:00
Sebastian Sdorra
f9a8d903b7
fxi missing contextPath for ForwardingPushStateDispatchers
2018-09-06 14:41:48 +02:00
Mohamed Karray
016bef395a
add crlf exception and exception mapper
2018-09-06 14:08:20 +02:00
Mohamed Karray
6acfb38132
add crlf exception and exception mapper
2018-09-06 13:54:52 +02:00
René Pfeuffer
3c784ce8c7
Merged in feature/self_link_bug (pull request #67 )
...
Fixes faulty self links
2018-09-06 11:33:33 +00:00
René Pfeuffer
dbde9181f2
Close branch feature/self_link_bug
2018-09-06 11:33:33 +00:00
Philipp Czora
c583dae111
Merged changes of 2.0.0-m3
2018-09-06 13:16:19 +02:00
Philipp Czora
a2182da8fa
Made ArgumentMatchers in test match more specifically
2018-09-06 11:56:09 +02:00
Mohamed Karray
56d323793e
file history endpoint
2018-09-06 11:33:39 +02:00
Philipp Czora
2f2ac8953b
Merged in feature/tag_endpoints_v2 (pull request #65 )
...
add tag endpoints
2018-09-06 08:44:04 +00:00
Philipp Czora
20f50acf46
Close branch feature/tag_endpoints_v2
2018-09-06 08:44:04 +00:00
Philipp Czora
b961a82e15
Minor refactoring
2018-09-06 10:41:49 +02:00
Sebastian Sdorra
fdd17b2998
update buildfrontend-maven-plugin to v2.1.1 in order to fix ci build
2018-09-06 07:36:22 +02:00
Mohamed Karray
85999904b3
merge
2018-09-05 17:14:23 +02:00
Mohamed Karray
e595d6039c
implement the diff endpoint for v2
2018-09-05 17:06:21 +02:00
René Pfeuffer
092fcdfde4
Fail for missing revision
2018-09-05 17:01:13 +02:00
René Pfeuffer
e79041140f
Remove tags and branches from browse result and embed files
2018-09-05 15:17:49 +02:00
René Pfeuffer
753349ae18
Log illegal argument exception before mapping to 400
2018-09-05 15:17:16 +02:00
Philipp Czora
ec8cc06589
Merged in feature/add_permission_prefix (pull request #64 )
...
Feature/add permission prefix
2018-09-05 13:02:25 +00:00
Philipp Czora
6940198a88
Close branch feature/add_permission_prefix
2018-09-05 13:02:25 +00:00
Sebastian Sdorra
dba9af4780
align buildfrontend configuration
2018-09-05 14:57:42 +02:00
