Merge branch 'wicket-6.x' into 5435-ajax-browser-info
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dd5de0e5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dd5de0e5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dd5de0e5 Branch: refs/heads/wicket-6.x Commit: dd5de0e554d6b0e33f8221b4c34c608c7b8e4046 Parents: c84f0c2 94c0c84 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Sat Dec 14 22:59:56 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Sat Dec 14 22:59:56 2013 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- .../wicket/page/PageAccessSynchronizerTest.java | 12 +- .../ajax/markup/html/modal/res/modal.js | 6 +- .../html/captcha/CaptchaImageResource.java | 190 ++++++++++++++----- .../html/captcha/CaptchaImageResourceTest.java | 84 ++++++++ .../java/org/apache/wicket/util/time/Time.java | 2 +- .../apache/wicket/util/time/TimeOfDayTest.java | 1 + .../org/apache/wicket/util/time/TimeTest.java | 13 +- 8 files changed, 253 insertions(+), 57 deletions(-) ----------------------------------------------------------------------
