You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/01/29 20:15:22 UTC
[18/18] isis git commit: Merge remote-tracking branch
'origin/ISIS-1012-date-patterns'
Merge remote-tracking branch 'origin/ISIS-1012-date-patterns'
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ebf5c5c1
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ebf5c5c1
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ebf5c5c1
Branch: refs/heads/master
Commit: ebf5c5c10968cbcd9351e0701f9ad6b824bf3f4b
Parents: 1db42b7 27dcb76
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Thu Jan 29 18:59:15 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Jan 29 18:59:15 2015 +0000
----------------------------------------------------------------------
.../wicket/model/isis/WicketViewerSettings.java | 6 +
.../scalars/IsisConverterLocator.java | 73 +
.../ScalarPanelTextFieldDatePickerAbstract.java | 8 +-
.../datepicker/css/bootstrap-datetimepicker.css | 129 +-
.../css/bootstrap-datetimepicker.min.css | 4 +-
.../datepicker/js/bootstrap-datetimepicker.js | 2602 +++++++++---------
.../js/bootstrap-datetimepicker.min.js | 2 +-
.../components/scalars/datepicker/js/moment.js | 379 ++-
.../scalars/datepicker/js/moment.min.js | 6 +-
.../isisapplib/DateConverterForApplibDate.java | 4 +-
.../DateConverterForApplibDateTime.java | 4 +-
.../jdkdates/DateConverterForJavaSqlDate.java | 4 +-
.../DateConverterForJavaSqlTimestamp.java | 14 +-
.../jdkdates/DateConverterForJavaUtilDate.java | 4 +-
.../scalars/jdkdates/JavaSqlTimestampPanel.java | 19 +-
.../jdkmath/BigDecimalConverterWithScale.java | 6 +-
.../jdkmath/JavaMathBigDecimalPanel.java | 2 +-
.../jdkmath/JavaMathBigDecimalPanelFactory.java | 4 +-
.../jodatime/DateConverterForJodaDateTime.java | 4 +-
.../jodatime/DateConverterForJodaLocalDate.java | 4 +-
.../DateConverterForJodaLocalDateTime.java | 4 +-
.../jodatime/JodaLocalDateTimePanel.java | 1 +
.../scalars/reference/ReferencePanel.java | 11 +-
.../ObjectAdapterMementoProviderAbstract.java | 26 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 12 +-
.../ValueChoicesSelect2PanelFactory.java | 2 -
.../DateConverterForApplibDateTest.java | 2 -
.../DateConverterForApplibDateTimeTest.java | 2 -
.../DateConverterForJavaUtilDateTest.java | 2 -
.../FixedObjectAdapterMementoProviderTest.java | 6 +-
.../metamodel/facets/value/JodaFunctions.java | 9 +-
...aDateTimeValueSemanticsProviderAbstract.java | 12 +-
...JodaLocalDateTimeValueSemanticsProvider.java | 2 +-
33 files changed, 1948 insertions(+), 1421 deletions(-)
----------------------------------------------------------------------