You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/03/11 13:32:55 UTC
[5/22] git commit: Merge remote-tracking branch 'upstream/master'
into trunk
Merge remote-tracking branch 'upstream/master' into trunk
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2965b1b6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2965b1b6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2965b1b6
Branch: refs/heads/master
Commit: 2965b1b698f1c08eb07a15a60336a6e7ecce4135
Parents: b4645c4 2fc7641
Author: Michael Mosmann <mi...@mosmann.de>
Authored: Tue Oct 9 21:34:17 2012 +0200
Committer: Michael Mosmann <mi...@mosmann.de>
Committed: Tue Oct 9 21:34:17 2012 +0200
----------------------------------------------------------------------
CHANGELOG-6.x | 8 +
grunt.js | 3 +-
.../AjaxFormChoiceComponentUpdatingBehavior.java | 71 +-
.../AjaxFormChoiceComponentUpdatingBehavior.js | 85 +
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 2 +-
.../wicket/core/util/string/JavaScriptUtils.java | 4 +-
.../wicket/markup/head/JavaScriptHeaderItem.java | 47 +-
.../markup/parser/filter/OpenCloseTagExpander.java | 4 +-
.../wicket/request/resource/AbstractResource.java | 28 +-
.../util/iterator/ComponentHierarchyIterator.java | 4 +-
.../GenericComponentHierarchyIterator.java | 4 +-
.../wicket/util/iterator/IteratorFilter.java | 2 +-
.../wicket/util/tester/BaseWicketTester.java | 22 +-
.../wicket/util/tester/WicketTesterHelper.java | 29 +-
.../core/util/string/JavaScriptUtilsTest.java | 2 +-
.../wicket/markup/html/form/TextFieldTest.java | 19 +
.../util/iterator/ComponentIteratorTest.java | 10 +-
.../extensions/yui/calendar/DatePickerTest.java | 7 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 48 +-
.../wicket/atmosphere/AtmosphereWebRequest.java | 6 +
.../wicket-examples-jar/pom.xml | 5 +
.../wicket/examples/base/AbstractBasePage.java | 33 +-
.../wicket/examples/base/ExamplesApplication.java | 2 +
.../wicket/examples/base/MarkdownArticleModel.java | 59 +
.../examples/base/components/AnchorLink.java | 93 ++
.../java/org/apache/wicket/examples/base/docs.css | 1200 +--------------
.../org/apache/wicket/examples/base/examples.js | 185 +---
.../wicket/examples/base/markdown/Markdown.java | 117 ++
.../examples/base/markdown/MarkdownLabel.java | 72 +
.../wicket/examples/base/markup/ClassValue.java | 50 +-
.../wicket/examples/base/navbar/TopNavbar.html | 4 +-
.../wicket/examples/base/navbar/TopNavbar.java | 27 +-
.../examples/base/navbar/TopNavbarMenuItem.html | 3 +
.../examples/base/navbar/TopNavbarMenuItem.java | 51 +
.../wicket/examples/base/prettify/Prettify.java | 22 +-
.../examples/components/ComponentExamplesPage.html | 146 +--
.../examples/components/ComponentExamplesPage.java | 45 +-
.../apache/wicket/examples/components/Feedback.md | 4 +
.../org/apache/wicket/examples/components/Forms.md | 4 +
.../examples/components/Internationalization.md | 4 +
.../apache/wicket/examples/components/Labels.md | 99 ++
.../apache/wicket/examples/components/Layout.md | 4 +
.../org/apache/wicket/examples/components/Links.md | 230 +++
.../org/apache/wicket/examples/components/Lists.md | 4 +
.../wicket/examples/components/Pagination.md | 3 +
.../examples/base/markdown/MarkdownTest.java | 63 +
.../apache/wicket/examples/base/markdown/alert3.md | 11 +
.../wicket/examples/base/markdown/expected3.html | 13 +
wicket-extensions/src/changes/changes.xml | 68 -
.../wicket/extensions/Initializer.properties | 4 +-
.../wicket/extensions/Initializer_de.properties | 4 +-
.../wicket/extensions/Initializer_es.properties | 2 +
.../extensions/Initializer_fr.properties.xml | 1 +
.../wicket/extensions/Initializer_hu.properties | 2 +
.../ajax/markup/html/AjaxEditableChoiceLabel.java | 28 +-
.../autocomplete/AbstractAutoCompleteRenderer.java | 6 +-
.../breadcrumb/BreadCrumbModelListenerSupport.java | 10 +-
.../markup/html/repeater/data/table/DataTable.java | 32 +
.../repeater/data/table/filter/FilterForm.java | 14 +-
.../main/java/org/apache/wicket/request/Url.java | 77 +-
.../java/org/apache/wicket/request/UrlTest.java | 29 +-
.../apache/wicket/util/encoding/UrlEncoder.java | 2 +-
62 files changed, 1463 insertions(+), 1774 deletions(-)
----------------------------------------------------------------------