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/f7d251cf
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f7d251cf
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f7d251cf

Branch: refs/heads/master
Commit: f7d251cf887cd54748182a5be7d26785c242d504
Parents: bffa563 2e74e97
Author: Michael Mosmann <[email protected]>
Authored: Tue Feb 19 13:18:41 2013 +0100
Committer: Michael Mosmann <[email protected]>
Committed: Tue Feb 19 13:18:41 2013 +0100

----------------------------------------------------------------------
 CHANGELOG-6.x                                      |   39 ++
 release-dashorst.sh                                |    9 +-
 .../src/main/java/org/apache/wicket/Session.java   |   26 +-
 .../apache/wicket/markup/html/form/CheckGroup.java |    3 +
 .../org/apache/wicket/markup/html/list/Loop.java   |   11 -
 .../parser/filter/StyleAndScriptIdentifier.java    |    4 +-
 .../protocol/http/servlet/WicketSessionFilter.java |   14 +-
 .../org/apache/wicket/util/tester/FormTester.java  |    8 +-
 .../wicket/util/tester/apps_3/ChoicePage.html      |    1 +
 .../wicket/util/tester/apps_3/ChoicePage.java      |   13 +
 .../wicket/util/tester/apps_3/FormTesterTest.java  |    6 +-
 .../apache/wicket/devutils/debugbar/DebugBar.java  |    7 +-
 .../wicket/examples/atmosphere/ReceiverFilter.java |    9 +-
 .../apache/wicket/atmosphere/AtmosphereEvent.java  |   54 +++
 .../atmosphere/AtmosphereRequestHandler.java       |    6 +-
 .../wicket/atmosphere/AtmosphereWebRequest.java    |    6 +-
 .../org/apache/wicket/atmosphere/EventBus.java     |    5 +-
 .../org/apache/wicket/atmosphere/EventFilter.java  |    4 +-
 .../wicket/atmosphere/EventSubscription.java       |   28 +-
 .../wicket/atmosphere/NoFilterPredicate.java       |    4 +-
 .../org/apache/wicket/atmosphere/Subscribe.java    |    4 +-
 .../atmosphere/config/AtmosphereLogLevel.java      |    6 +
 .../wicket/atmosphere/config/AtmosphereMethod.java |    6 +
 .../atmosphere/config/AtmosphereTransport.java     |    6 +
 .../wicket/bootstrap/css/bootstrap-responsive.css  |   31 +-
 .../bootstrap/css/bootstrap-responsive.min.css     |    4 +-
 .../org/apache/wicket/bootstrap/css/bootstrap.css  |  357 ++++++++++-----
 .../apache/wicket/bootstrap/css/bootstrap.min.css  |    4 +-
 .../org/apache/wicket/bootstrap/js/bootstrap.js    |  269 ++++++++----
 .../apache/wicket/bootstrap/js/bootstrap.min.js    |    2 +-
 .../autocomplete/AbstractAutoCompleteBehavior.java |   46 ++-
 .../html/autocomplete/AutoCompleteTextField.java   |   13 -
 .../markup/html/form/palette/Palette.java          |   23 +
 .../form/palette/component/AbstractOptions.java    |   19 +-
 34 files changed, 760 insertions(+), 287 deletions(-)
----------------------------------------------------------------------


Reply via email to