Branch: refs/heads/feature-tree
Home: https://github.com/xwiki/xwiki-platform
Commit: 1ba94ae3b783e4969c447b62e5b63c129e4b9f79
https://github.com/xwiki/xwiki-platform/commit/1ba94ae3b783e4969c447b62e5b63c129e4b9f79
Author: Guillaume Delhumeau <guillaume.delhumeau-l2mTs9s+***@public.gmane.org>
Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/menus_macros.vm
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/menus_space.vm
Log Message:
-----------
XWIKI-11299: On subwikis (using Flamingo), 'Administer Wiki' links to the 'import' action.
Commit: e239694e9b94ced61c368ec16ef0963fa0c44bf8
https://github.com/xwiki/xwiki-platform/commit/e239694e9b94ced61c368ec16ef0963fa0c44bf8
Author: Guillaume Delhumeau <guillaume.delhumeau-l2mTs9s+***@public.gmane.org>
Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths:
M xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/DefaultLESSSkinFileCompiler.java
M xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/test/java/org/xwiki/lesscss/internal/DefaultLESSSkinFileCompilerTest.java
Log Message:
-----------
XWIKI-11304: Cannot use, in a subwiki, a skin based on Flamingo stored in the main wiki.
Commit: 3e83c7c24cac83e7f1f1d79b73b162480d90e8e9
https://github.com/xwiki/xwiki-platform/commit/3e83c7c24cac83e7f1f1d79b73b162480d90e8e9
Author: Guillaume Delhumeau <guillaume.delhumeau-l2mTs9s+***@public.gmane.org>
Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths:
M xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/stylesheets.vm
Log Message:
-----------
XWIKI-11302: Cannot use, in a subwiki, a skin stored in the main wiki and a color theme stored in the subwiki.
Commit: 6e7246b7e92c16c155e18d29cbd583024341d4e4
https://github.com/xwiki/xwiki-platform/commit/6e7246b7e92c16c155e18d29cbd583024341d4e4
Author: Ecaterina Moraru (Valica) <valicac-***@public.gmane.org>
Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/less/layout.less
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/less/variablesInit.vm
Log Message:
-----------
XWIKI-11292: Not rendered ColorTheme properties in Flamingo's CSS
Commit: 641d58924cc66ae112e56391f8d7ed6c987a0cac
https://github.com/xwiki/xwiki-platform/commit/641d58924cc66ae112e56391f8d7ed6c987a0cac
Author: Guillaume Delhumeau <guillaume.delhumeau-l2mTs9s+***@public.gmane.org>
Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths:
M xwiki-platform-core/xwiki-platform-web/src/main/webapp/resources/js/xwiki/compatibility.js
Log Message:
-----------
XWIKI-11306: Breaking compatibility: applications that are using the <meta name="language"> do not work anymore.
Commit: c33e76d9e20eb844e332ea2d06b8f1e649e0127d
https://github.com/xwiki/xwiki-platform/commit/c33e76d9e20eb844e332ea2d06b8f1e649e0127d
Author: Marius Dumitru Florea <marius-l2mTs9s+***@public.gmane.org>
Date: 2014-10-22 (Wed, 22 Oct 2014)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/less/layout.less
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/less/variablesInit.vm
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/menus_macros.vm
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/src/main/resources/flamingo/menus_space.vm
M xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/DefaultLESSSkinFileCompiler.java
M xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/test/java/org/xwiki/lesscss/internal/DefaultLESSSkinFileCompilerTest.java
M xwiki-platform-core/xwiki-platform-web/src/main/webapp/resources/js/xwiki/compatibility.js
M xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/stylesheets.vm
Log Message:
-----------
Merge branch 'master' of github.com:xwiki/xwiki-platform into feature-tree
Compare: https://github.com/xwiki/xwiki-platform/compare/9555bb8eee61...c33e76d9e20e