octoleo/plantuml-server
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml-server.git synced 2024-11-16 01:07:10 +00:00
Code Issues Releases Wiki Activity
333 Commits 5 Branches 70 Tags 12 MiB
6cb587e156
Commit Graph

333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud Roques
9bc56edca6 Fix security #122 2019-09-26 19:13:07 +02:00
Arnaud Roques
83138142c5 Fix security #122 2019-09-26 19:08:48 +02:00
Arnaud Roques
aa9172f715 Merge branch 'master' of https://github.com/plantuml/plantuml-server 2019-09-26 19:07:34 +02:00
Arnaud Roques
a985880361 version 1.2019.11 2019-09-25 17:54:19 +02:00
arnaudroques
18d887385f
Merge pull request #120 from fabianhauser/patch-1 
Fix CI to only release docker tags on master branch
 2019-09-25 17:53:12 +02:00
Fabian Hauser
b7651c4dae
Remove docker-push build step for pull requests 2019-09-25 17:49:20 +02:00
Fabian Hauser
894be6744e
Remove docker tag build step for pull requests 2019-09-25 17:43:37 +02:00
Fabian Hauser
b98e227ce7
Fix CI to only release docker tags on master branch 
Fixes the build error in pull request #119 and also prevent release tags that are not also commited on the master branch.
 2019-09-25 17:35:31 +02:00
Arnaud Roques
d73b61a805 version 1.2019.11 2019-09-22 23:00:06 +02:00
arnaudroques
513453e51b
Merge pull request #118 from jarv/jarv/fix-tagging 
Creates a docker tagged image for jetty and tomcat
 2019-09-16 16:01:42 +02:00
John Jarvis
10707c4df7 Create separate tags for jetty and tomcat 2019-09-16 15:18:20 +02:00
John Jarvis
749cdfb7ab Revert "Tags the docker image if there is a git tag" 
This reverts commit fffa69238c.
 2019-09-16 14:59:44 +02:00
Arnaud Roques
eedd4691c8 version 1.2019.10 2019-09-14 21:58:26 +02:00
arnaudroques
5e7b8ddad0
Merge pull request #115 from jarv/jarv/add-tags 
Tags the docker image if there is a git tag
 2019-09-07 11:09:20 +02:00
John Jarvis
fffa69238c Tags the docker image if there is a git tag 2019-09-06 16:28:10 +02:00
Arnaud Roques
7112ea8a04 version 1.2019.6 2019-05-25 13:14:02 +02:00
Arnaud Roques
2b4fbe2452 version 1.2019.6 2019-05-25 13:10:30 +02:00
Arnaud Roques
e98937d0b3 ALLOW_PLANTUML_INCLUDE 2019-05-20 20:12:41 +02:00
arnaudroques
ea7bb65d4e
Merge pull request #106 from skuro/expose-language 
New servlet to expose the language tokens of the PlantUML engine
 2019-05-20 19:39:17 +02:00
Carlo Sciolla
887a5055f2
New servlet to expose the language tokens of the PlantUML engine 
Same as `java -jar plantum.jar -language`, a new servlet is added to
expose the tokens supported by the current version of the PlantUML engine.
Useful to support tools relying on a running PlantUML server to support
syntax highlight.
 2019-05-20 15:06:38 +02:00
arnaudroques
cd65d5719a
Merge pull request #105 from norbitheeviljester/master 
Added support for Authorization header
 2019-05-17 18:07:37 +02:00
Norbert.Nogacki@tomtom.com
a53416b4da Added support for Authorization header 2019-05-17 16:24:27 +02:00
arnaudroques
b9df1f2278
Merge pull request #103 from mrausch/compose-baseurl 
Custom BaseURL using docker-compose
 2019-05-08 11:34:00 +02:00
Michael Rausch
e276733481 Added docker-compose file to build plantuml-server with a custom base url. 2019-05-07 19:06:08 +02:00
arnaudroques
3c3c64b3d6
Merge pull request #99 from translucens/revert-builder-base-image 
revert builder's base image to based on OpenJDK8 (non-headless)
 2019-04-27 18:11:41 +02:00
translucens
73739b7e85
revert builder's base image to based on OpenJDK8 (non-headless) 
headless OpenJDK does not refer `http_proxy` environment variable, so build image inside proxy will fail.
resolves #98
 2019-04-28 00:33:47 +09:00
Arnaud Roques
f5d9b2591f version 1.2019.5 2019-04-22 11:57:38 +02:00
arnaudroques
7eba9632e6
Merge pull request #97 from translucens/replace-fonts 
replace fonts to Google noto fonts
 2019-04-13 22:03:53 +02:00
translucens
f878c0ec22
replace fonts to Google noto fonts 2019-04-14 02:46:09 +09:00
arnaudroques
60b716d61b
Merge pull request #92 from morotti/buildwar 
fix travis build after #91
 2019-04-01 11:18:18 +02:00
morotti
978a203487 remove armv8a docker build. it doesn't work. looks like it never worked and no docker image was ever pushed to the docker registry. failing commands were ignored silently by travis. 2019-03-31 23:57:54 +01:00
morotti
1b07c6d9c2 use different container names for jetty and tomcat so they can be built in parallel without conflicting 2019-03-31 23:51:41 +01:00
morotti
0ec8cb68f4 fix travis: script should be an array of strings 2019-03-31 23:26:57 +01:00
arnaudroques
c5e0c6fdea
Merge pull request #91 from morotti/buildwar 
build the war file with travis.
 2019-03-31 18:46:01 +02:00
morotti
c4ace921cd build the war file with travis. 
automatically add the generated war to github releases.
split the docker build in stages to run in parallel and only if the build succeeded.
 2019-03-30 23:45:15 +00:00
Arnaud Roques
bd49d5cf7f version 1.2019.4 2019-03-29 21:53:36 +01:00
arnaudroques
1398d778bb
Merge pull request #88 from tnguyen14/jsp-1.7 
Set compiler version for jsp servlet to 1.7
 2019-03-15 09:10:05 +01:00
Tri Nguyen
18d461a38a Set compiler version for jsp servlet to 1.7 2019-03-14 15:04:11 -04:00
Arnaud Roques
74db037a27 version 1.2019.1 2019-02-09 22:57:47 +01:00
Arnaud Roques
813500c549 fix link 2019-02-09 16:34:05 +01:00
Arnaud Roques
44487018ce version 1.2018.14 2018-12-22 12:14:10 +01:00
arnaudroques
731ea2ff87
Merge pull request #83 from paddy-hack/redo-base-url-support-to-use-ROOT 
Redo base url support to use root
 2018-12-03 12:26:30 +01:00
Olaf Meeuwissen
73c23724db Use ROOT as the BASE_URL 
This fixes a misread of the README.md when preparing 055faca.
 2018-12-03 18:54:18 +09:00
Olaf Meeuwissen
38772dedd3 Revert "Revert "Make the server's BASE_URL configurable"" 
This reverts commit 5501258087.
 2018-12-03 18:30:47 +09:00
Arnaud Roques
5501258087 Revert "Make the server's BASE_URL configurable" 
This reverts commit 055facac9e.
 2018-11-30 22:30:03 +01:00
Arnaud Roques
c30807b178 version 1.2018.13 2018-11-26 23:44:55 +01:00
arnaudroques
59f37e996d
Merge pull request #81 from paddy-hack/jetty-tomcat-dockerfile-improvements 
Dockerfile improvements for Jetty and Tomcat images.
 2018-11-17 10:36:15 +01:00
Olaf Meeuwissen
055facac9e Make the server's BASE_URL configurable 
The "special" value of `ROOT` will serve requests on `/`.  Any other
value should serve on `/$BASE_URL` (as long as there are no slashes
in `BASE_URL` at least).

The default has been set to `plantuml` to better match documentation
in the README.md file.

Re #80, may help with #79.
 2018-11-15 22:09:14 +09:00
Olaf Meeuwissen
3ce59edba7 Fix rendering of non-sequence diagrams 
Although sequence diagrams render fine without, any(?) other diagram
type requires the  `GRAPHVIZ_DOT` environment variable to be set for
the server to produce usable output.
 2018-11-15 21:59:52 +09:00
Olaf Meeuwissen
31a42da6bb Support building behind a proxy 
In order to use this functionality, you need to pass `--build-arg`
options for the `http_proxy`, `https_proxy` and `no_proxy` values
that are suitable for *your* build environment.

If not behind a proxy, simply don't pass any `*_proxy` build args.
 2018-11-15 21:53:00 +09:00