jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject [9/9] jspwiki git commit: Merge branch 'master' into JSPWIKI-1035
Date Sun, 18 Dec 2016 17:22:44 GMT
Merge branch 'master' into JSPWIKI-1035


Project: http://git-wip-us.apache.org/repos/asf/jspwiki/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki/commit/10596bde
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki/tree/10596bde
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki/diff/10596bde

Branch: refs/heads/JSPWIKI-1035
Commit: 10596bdec0763dd81bb1a8626bc0a06eb898160e
Parents: c404436 cb0a11e
Author: Harry Metske <harry.metske@gmail.com>
Authored: Sun Dec 18 18:22:12 2016 +0100
Committer: Harry Metske <harry.metske@gmail.com>
Committed: Sun Dec 18 18:22:12 2016 +0100

----------------------------------------------------------------------
 ChangeLog                                       |  46 +
 jspwiki-war/src/main/config/wro/wro.properties  |   4 +-
 .../src/main/java/org/apache/wiki/Release.java  |   2 +-
 .../apache/wiki/plugin/WeblogArchivePlugin.java |  28 +-
 .../org/apache/wiki/plugin/WeblogPlugin.java    |  20 +-
 .../apache/wiki/xmlrpc/MetaWeblogHandler.java   |  34 +-
 .../resources/plugin/PluginResources.properties |   1 +
 .../main/resources/templates/default.properties |  17 +-
 .../src/main/scripts/behaviors/Accordion.js     |   4 +-
 .../src/main/scripts/behaviors/AddCSS.js        |  11 +-
 .../src/main/scripts/behaviors/Columns.js       |   2 +-
 jspwiki-war/src/main/scripts/behaviors/Flip.js  |   2 +-
 .../src/main/scripts/behaviors/GraphBar.js      |   3 +-
 .../src/main/scripts/behaviors/TableX.js        |   5 +-
 .../src/main/scripts/behaviors/Viewer.js        |   4 +-
 .../src/main/scripts/dialog/Dialog.Selection.js |  41 +-
 jspwiki-war/src/main/scripts/dialog/Dialog.js   |  35 +-
 .../scripts/moo-extend/Array.NaturalSort.js     |   2 +-
 .../src/main/scripts/moo-extend/Behavior.js     |  25 +-
 .../src/main/scripts/moo-extend/Color.js        |  21 +-
 .../main/scripts/moo-extend/Element.Extend.js   |   2 +-
 .../main/scripts/moo-extend/String.Extend.js    |  15 +-
 .../src/main/scripts/moo-extend/Textarea.js     |   9 +
 .../main/scripts/wiki-edit/Snipe.Commands.js    |  16 +-
 .../main/scripts/wiki-edit/Snipe.Sections.js    | 150 ++-
 .../src/main/scripts/wiki-edit/Snipe.Snips.js   |  42 +-
 jspwiki-war/src/main/scripts/wiki-edit/Snipe.js | 317 +++---
 .../src/main/scripts/wiki-edit/Undoable.js      |   7 +-
 .../src/main/scripts/wiki-edit/Wiki.Edit.js     | 278 +++---
 .../src/main/scripts/wiki-edit/Wiki.Snips.js    | 962 +++++++++----------
 jspwiki-war/src/main/scripts/wiki/Category.js   |   4 +-
 jspwiki-war/src/main/scripts/wiki/Recents.js    |   2 +-
 .../src/main/scripts/wiki/Wiki.Behaviors.js     |  67 +-
 jspwiki-war/src/main/scripts/wiki/Wiki.js       | 130 ++-
 .../main/styles/haddock/bootstrap/.csscomb.json | 304 ++++++
 .../main/styles/haddock/bootstrap/.csslintrc    |  19 +
 .../main/styles/haddock/bootstrap/alerts.less   |  32 +-
 .../main/styles/haddock/bootstrap/badges.less   |  73 +-
 .../styles/haddock/bootstrap/bootstrap.less     |  31 +-
 .../styles/haddock/bootstrap/breadcrumbs.less   |  25 +-
 .../styles/haddock/bootstrap/button-groups.less |  91 +-
 .../main/styles/haddock/bootstrap/buttons.less  |  73 +-
 .../main/styles/haddock/bootstrap/carousel.less |  82 +-
 .../main/styles/haddock/bootstrap/close.less    |  21 +-
 .../src/main/styles/haddock/bootstrap/code.less |  38 +-
 .../haddock/bootstrap/component-animations.less |  34 +-
 .../styles/haddock/bootstrap/dropdowns.less     |  69 +-
 .../main/styles/haddock/bootstrap/forms.less    | 406 ++++++--
 .../styles/haddock/bootstrap/glyphicons.less    | 112 ++-
 .../src/main/styles/haddock/bootstrap/grid.less |  75 +-
 .../styles/haddock/bootstrap/input-groups.less  | 101 +-
 .../styles/haddock/bootstrap/jumbotron.less     |  46 +-
 .../main/styles/haddock/bootstrap/labels.less   |  22 +-
 .../styles/haddock/bootstrap/list-group.less    |  90 +-
 .../main/styles/haddock/bootstrap/media.less    |  66 ++
 .../main/styles/haddock/bootstrap/mixins.less   | 897 +----------------
 .../styles/haddock/bootstrap/mixins/alerts.less |  14 +
 .../bootstrap/mixins/background-variant.less    |   9 +
 .../haddock/bootstrap/mixins/border-radius.less |  18 +
 .../haddock/bootstrap/mixins/buttons.less       |  65 ++
 .../haddock/bootstrap/mixins/center-block.less  |   7 +
 .../haddock/bootstrap/mixins/clearfix.less      |  22 +
 .../styles/haddock/bootstrap/mixins/forms.less  |  85 ++
 .../haddock/bootstrap/mixins/gradients.less     |  59 ++
 .../bootstrap/mixins/grid-framework.less        |  91 ++
 .../styles/haddock/bootstrap/mixins/grid.less   | 122 +++
 .../haddock/bootstrap/mixins/hide-text.less     |  21 +
 .../styles/haddock/bootstrap/mixins/image.less  |  33 +
 .../styles/haddock/bootstrap/mixins/labels.less |  12 +
 .../haddock/bootstrap/mixins/list-group.less    |  30 +
 .../haddock/bootstrap/mixins/nav-divider.less   |  10 +
 .../bootstrap/mixins/nav-vertical-align.less    |   9 +
 .../haddock/bootstrap/mixins/opacity.less       |   8 +
 .../haddock/bootstrap/mixins/pagination.less    |  24 +
 .../styles/haddock/bootstrap/mixins/panels.less |  24 +
 .../haddock/bootstrap/mixins/progress-bar.less  |  10 +
 .../haddock/bootstrap/mixins/reset-filter.less  |   8 +
 .../haddock/bootstrap/mixins/reset-text.less    |  18 +
 .../styles/haddock/bootstrap/mixins/resize.less |   6 +
 .../bootstrap/mixins/responsive-visibility.less |  15 +
 .../styles/haddock/bootstrap/mixins/size.less   |  10 +
 .../haddock/bootstrap/mixins/tab-focus.less     |   9 +
 .../haddock/bootstrap/mixins/table-row.less     |  28 +
 .../haddock/bootstrap/mixins/text-emphasis.less |   9 +
 .../haddock/bootstrap/mixins/text-overflow.less |   8 +
 .../bootstrap/mixins/vendor-prefixes.less       | 227 +++++
 .../main/styles/haddock/bootstrap/modals.less   |  71 +-
 .../main/styles/haddock/bootstrap/navbar.less   | 154 +--
 .../src/main/styles/haddock/bootstrap/navs.less |  28 +-
 .../styles/haddock/bootstrap/normalize.less     | 318 +++---
 .../main/styles/haddock/bootstrap/pager.less    |  33 +-
 .../styles/haddock/bootstrap/pagination.less    |  38 +-
 .../main/styles/haddock/bootstrap/panels.less   | 217 +++--
 .../main/styles/haddock/bootstrap/popovers.less |  56 +-
 .../main/styles/haddock/bootstrap/print.less    | 216 ++---
 .../styles/haddock/bootstrap/progress-bars.less |  37 +-
 .../haddock/bootstrap/responsive-embed.less     |  35 +
 .../haddock/bootstrap/responsive-utilities.less | 253 +++--
 .../styles/haddock/bootstrap/scaffolding.less   |  72 +-
 .../main/styles/haddock/bootstrap/tables.less   |  55 +-
 .../main/styles/haddock/bootstrap/theme.less    |  90 +-
 .../styles/haddock/bootstrap/thumbnails.less    |  36 +
 .../main/styles/haddock/bootstrap/tooltip.less  |  42 +-
 .../src/main/styles/haddock/bootstrap/type.less | 213 ++--
 .../styles/haddock/bootstrap/utilities.less     |  21 -
 .../styles/haddock/bootstrap/variables.less     | 650 ++++++++-----
 .../main/styles/haddock/bootstrap/wells.less    |  29 +
 .../src/main/styles/haddock/default/.crunch     | 123 +++
 .../main/styles/haddock/default/Calendar.less   |  48 -
 .../src/main/styles/haddock/default/Dialog.less |  19 +-
 .../main/styles/haddock/default/Invisibles.less |   2 +-
 .../haddock/default/RecentChangesPlugin.less    |  10 +-
 .../main/styles/haddock/default/TOCPlugin.less  |  20 +-
 .../haddock/default/Template.Content.less       |   4 +-
 .../styles/haddock/default/Template.Edit.less   | 147 ++-
 .../src/main/styles/haddock/default/Tips.less   |   7 +-
 .../styles/haddock/default/WeblogPlugin.less    |  63 +-
 .../src/main/styles/haddock/default/build.less  |  13 +-
 .../src/main/styles/haddock/default/grid.less   |   2 +-
 .../main/styles/haddock/default/prettify.less   |  14 +-
 .../src/main/styles/haddock/default/type.less   | 145 ++-
 .../main/styles/haddock/default/variables.less  |   8 +-
 .../main/styles/haddock/fontjspwiki/core.less   |  13 +-
 .../main/styles/haddock/fontjspwiki/path.less   |  13 +-
 jspwiki-war/src/main/webapp/Comment.jsp         |   3 +-
 jspwiki-war/src/main/webapp/DeleteGroup.jsp     |  11 +-
 jspwiki-war/src/main/webapp/Install.jsp         |  62 +-
 .../src/main/webapp/XHRMarkup2Wysiwyg.jsp       |  84 ++
 .../webapp/templates/haddock/AttachmentTab.jsp  |   2 +-
 .../webapp/templates/haddock/CommentContent.jsp |  18 +-
 .../main/webapp/templates/haddock/DiffTab.jsp   |   2 +-
 .../webapp/templates/haddock/EditTemplate.jsp   |   2 +-
 .../main/webapp/templates/haddock/Header.jsp    |   2 +-
 .../webapp/templates/haddock/InfoContent.jsp    |   2 +-
 .../src/main/webapp/templates/haddock/Nav.jsp   |  15 +-
 .../main/webapp/templates/haddock/PageTab.jsp   |   2 -
 .../webapp/templates/haddock/PreferencesTab.jsp |  21 +-
 .../webapp/templates/haddock/ProfileTab.jsp     |  10 +-
 .../main/webapp/templates/haddock/Sidebar.jsp   |   8 +-
 .../webapp/templates/haddock/ViewTemplate.jsp   |   3 +-
 .../webapp/templates/haddock/commonheader.jsp   |  11 +-
 .../templates/haddock/editors/CKeditor.jsp      |  65 +-
 .../templates/haddock/editors/TinyMCE.jsp       |  64 +-
 .../webapp/templates/haddock/editors/plain.jsp  | 183 ++--
 .../templates/haddock/editors/wysiwyg.jsp       |  74 +-
 .../org/apache/wiki/rss/RSSGeneratorTest.java   |   8 +-
 146 files changed, 5854 insertions(+), 4139 deletions(-)
----------------------------------------------------------------------



Mime
View raw message