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/07/20 08:02:33 UTC

[5/5] wicket git commit: Merge remote-tracking branch 'origin/wicket-7.x' into wicket-7.x

Merge remote-tracking branch 'origin/wicket-7.x' 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/b13979dd
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b13979dd
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b13979dd

Branch: refs/heads/wicket-7.x
Commit: b13979ddfec1e3c9b9a8639be86fff45dcb9e0f8
Parents: 4a8e3a8 9abdbbd
Author: Martijn Dashorst <da...@apache.org>
Authored: Wed Jul 20 10:02:21 2016 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Wed Jul 20 10:02:21 2016 +0200

----------------------------------------------------------------------
 .../wicket/ajax/res/js/wicket-ajax-jquery.js    |  47 +-
 .../wicket/core/util/lang/PropertyResolver.java | 849 ++++++++++---------
 .../markup/html/form/PasswordTextField.java     |  50 +-
 .../apache/wicket/markup/html/image/Image.java  |   2 +-
 .../markup/html/form/PasswordTextFieldTest.java |  97 +++
 .../wicket/protocol/http/WicketFilterTest.java  |   4 +
 .../org/apache/wicket/util/lang/Document.java   |  44 +
 .../wicket/util/lang/PropertyResolverTest.java  |  71 +-
 .../src/docs/guide/urls/urls_6.gdoc             |   2 +-
 .../apache/wicket/util/io/ConnectionsTest.java  |   3 +
 10 files changed, 740 insertions(+), 429 deletions(-)
----------------------------------------------------------------------