You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2016/01/17 11:10:56 UTC
[2/3] wicket git commit: Merge branch 'wicket-7.x' of
https://git-wip-us.apache.org/repos/asf/wicket into wicket-7.x
Merge branch 'wicket-7.x' of https://git-wip-us.apache.org/repos/asf/wicket into wicket-7.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a9816fae
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a9816fae
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a9816fae
Branch: refs/heads/wicket-7.x
Commit: a9816fae35f8707f1b31cef324d3e508cdfb8835
Parents: ecddd9d f429876
Author: Martijn Dashorst <da...@apache.org>
Authored: Sun Jan 17 11:09:07 2016 +0100
Committer: Martijn Dashorst <da...@apache.org>
Committed: Sun Jan 17 11:09:07 2016 +0100
----------------------------------------------------------------------
.../main/resources/archetype-resources/pom.xml | 22 +-
.../src/test/java/Start.java | 5 +
testing/wicket-common-tests/pom.xml | 5 +
testing/wicket-js-tests/pom.xml | 11 +-
testing/wicket-threadtest/pom.xml | 7 +-
.../java/org/apache/wicket/Application.java | 7 +-
.../java/org/apache/wicket/MarkupContainer.java | 5 +-
.../wicket/ajax/AjaxPreventSubmitBehavior.java | 66 +
...AjaxFormChoiceComponentUpdatingBehavior.java | 1 +
.../wicket/markup/html/border/Border.java | 12 +
.../DynamicJQueryResourceReference.java | 2 +-
.../resource/JQueryResourceReference.java | 2 +-
.../wicket/resource/jquery/jquery-1.11.3.js | 10351 ----------
.../wicket/resource/jquery/jquery-1.11.3.min.js | 5 -
.../wicket/resource/jquery/jquery-1.12.0.js | 11027 +++++++++++
.../wicket/resource/jquery/jquery-1.12.0.min.js | 5 +
.../wicket/resource/jquery/jquery-2.1.4.js | 9210 ---------
.../wicket/resource/jquery/jquery-2.1.4.min.js | 4 -
.../wicket/resource/jquery/jquery-2.2.0.js | 9831 ++++++++++
.../wicket/resource/jquery/jquery-2.2.0.min.js | 4 +
.../apache/wicket/TestDetachPageAjaxResult.html | 2 +-
.../wicket/TestDetachPageExpectedResult.html | 2 +-
.../ajax/AjaxBehaviorEnabled_expected.html | 2 +-
...axHeaderContributionPage2_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage2_expected.html | 2 +-
...jaxHeaderContributionPage_ajax_expected.html | 2 +-
.../AjaxHeaderContributionPage_expected.html | 2 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 2 +-
.../wicket/ajax/DomReadyOrderPage_expected.html | 2 +-
.../form/AjaxFormSubmitTestPage_expected.html | 2 +-
.../OnChangeAjaxBehaviorTestPage_expected.html | 2 +-
.../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../SimpleTestPageExpectedResult-1.html | 2 +-
.../SimpleTestPageExpectedResult.html | 2 +-
.../head/filter/FilteredHeaderPageExpected.html | 2 +-
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../HideableBorderPage_ExpectedResult.html | 2 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../wicket/queueing/ComponentQueueingTest.java | 43 +
.../queueing/bodyisachild/BodyIsAChildPage.html | 22 +
.../queueing/bodyisachild/BodyIsAChildPage.java | 41 +
.../wicket/queueing/bodyisachild/FormGroup.html | 15 +
.../wicket/queueing/bodyisachild/FormGroup.java | 262 +
.../queueing/bodyisachild/LoginPanel.html | 21 +
.../queueing/bodyisachild/LoginPanel.java | 62 +
.../ResourceAggregatorTest1Page_results.html | 2 +-
.../ResourceAggregatorTest2Page_results.html | 2 +-
wicket-core/src/test/js/all.html | 2 +-
wicket-core/src/test/js/amd.html | 2 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 2 +-
.../wicket/examples/ajax/builtin/FormPage.html | 19 +-
.../wicket/examples/ajax/builtin/FormPage.java | 51 +-
.../src/main/webapp/js-test/lib/gym.js | 6 +-
.../src/main/webapp/js-test/lib/jquery.js | 17166 +++++++++--------
.../src/main/webapp/js-test/tests/ajax/form.js | 42 +-
.../extensions/wizard/WizardButtonBar.java | 11 +
.../protocol/ws/api/ServletRequestCopy.java | 95 +-
.../protocol/ws/api/WebSocketRequest.java | 72 +-
.../protocol/ws/api/WebSocketResponse.java | 19 +-
wicket-user-guide/pom.xml | 5 +
63 files changed, 30597 insertions(+), 27989 deletions(-)
----------------------------------------------------------------------