You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/10/22 11:12:02 UTC
[1/3] isis git commit: Temp disable Amelia theme to avoid bad UX
Repository: isis
Updated Branches:
refs/heads/master 067ea19a1 -> 696921930
Temp disable Amelia theme to avoid bad UX
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7800cf09
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7800cf09
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7800cf09
Branch: refs/heads/master
Commit: 7800cf099ad5039bfbf7533eb610b6dadfc0c6e8
Parents: d023786
Author: bibryam <red2KIDS>
Authored: Mon Oct 17 11:29:37 2016 +0100
Committer: bibryam <red2KIDS>
Committed: Mon Oct 17 11:29:37 2016 +0100
----------------------------------------------------------------------
.../webapp/src/main/webapp/WEB-INF/viewer_wicket.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7800cf09/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index 5ed15f9..7b72fb1 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -91,7 +91,8 @@ isis.viewer.wicket.themes.showChooser=true
#
#isis.viewer.wicket.themes.enabled=bootstrap-theme,Cosmo,Flatly,Darkly,Sandstone,United
-
+# ISIS-1520 Temporarily disable the broken Amelia theme and list all other themes
+isis.viewer.wicket.themes.enabled=bootstrap-theme, Cerulean, Cosmo, Cyborg, Darkly, Flatly, Journal, Lumen, Paper, Readable, Sandstone, Simplex, Slate, Spacelab, Superhero, United, Yeti
#
# whether to automatically select dependent choice when the choice it depends upon changes.
[2/3] isis git commit: Merge branch 'ISIS-1520' of
https://github.com/bibryam/isis into ISIS-1520_pr-59
Posted by da...@apache.org.
Merge branch 'ISIS-1520' of https://github.com/bibryam/isis into ISIS-1520_pr-59
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/5d46c539
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/5d46c539
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/5d46c539
Branch: refs/heads/master
Commit: 5d46c5398430d1fd0722af00d237bb83d80c506d
Parents: 067ea19 7800cf0
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Oct 22 12:00:09 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Oct 22 12:00:09 2016 +0100
----------------------------------------------------------------------
.../webapp/src/main/webapp/WEB-INF/viewer_wicket.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[3/3] isis git commit: Merge branch 'ISIS-1520_pr-59'
Posted by da...@apache.org.
Merge branch 'ISIS-1520_pr-59'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/69692193
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/69692193
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/69692193
Branch: refs/heads/master
Commit: 696921930eee45423abb19b23f4c9f1b7cd169b2
Parents: 067ea19 5d46c53
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Sat Oct 22 12:11:50 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Sat Oct 22 12:11:50 2016 +0100
----------------------------------------------------------------------
.../webapp/src/main/webapp/WEB-INF/viewer_wicket.properties | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------