Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix so datetime combo field respects date-format and time format a set up by the user #446

Merged
merged 31 commits into from
Nov 23, 2015
Merged

fix so datetime combo field respects date-format and time format a set up by the user #446

merged 31 commits into from
Nov 23, 2015

Commits on May 8, 2015

  1. updated Spanish translations

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    afb4069 View commit details
    Browse the repository at this point in the history

  2. Fixes text_date_timestamp validation so it uses 'date_format', instea… 

    …d of just trying strtotime directly
    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    a286f03 View commit details
    Browse the repository at this point in the history

  3. Outputs data-datepicker into date_text, so each datepicker can be ini… 

    …tialized with its own date-format

The js initializer reads data-datepicker to set each datepicker properly
    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    26a9b73 View commit details
    Browse the repository at this point in the history

  4. function to convert between php date-format options, and js date-form… 

    …at options for the datepickers
    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    128cecb View commit details
    Browse the repository at this point in the history

  5. stripslashes in format_timestamp made it so you couldn't insert escap… 

    …e characters into your date-format string
    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    dddc86d View commit details
    Browse the repository at this point in the history

  6. Aditional options to convert time formats from php to js

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    d3d8c23 View commit details
    Browse the repository at this point in the history

  7. time-format options are recognized by the time-picker (using a data a… 

    …ttribute as in date-picker)
    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    35bb37f View commit details
    Browse the repository at this point in the history

  8. @return missing in some phpdoc blocks

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    e0331f5 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/trunk' into trunk 

    Conflicts:
	includes/CMB2_Sanitize.php
	includes/CMB2_Types.php
	js/cmb2.min.js
	languages/cmb2-es_ES.mo
	languages/cmb2-es_ES.po
    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    f44be5f View commit details
    Browse the repository at this point in the history

  10. old style array declaration, to make Travis happy.

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    4edf1f1 View commit details
    Browse the repository at this point in the history

  11. Removed anoymous function to satisfy Travis (PHP 5.2)

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    b068a3f View commit details
    Browse the repository at this point in the history

  12. Another old style array declaration to satisfy Travis

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    4df29b4 View commit details
    Browse the repository at this point in the history

  13. Updating tests. Crossing fingers.

    yivi committed May 8, 2015
    Configuration menu
    Copy the full SHA
    70e3b50 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2015

  1. yet another new style to old style array declaration

    yivi committed May 9, 2015
    Configuration menu
    Copy the full SHA
    0e36e09 View commit details
    Browse the repository at this point in the history

  2. yet another new style to old style array declaration...

    yivi committed May 9, 2015
    Configuration menu
    Copy the full SHA
    7d5421e View commit details
    Browse the repository at this point in the history

  3. a couple more new style array declarations to 5.2 style

    yivi committed May 9, 2015
    Configuration menu
    Copy the full SHA
    65ca940 View commit details
    Browse the repository at this point in the history

  4. and an array declaration in a return statement

    yivi committed May 9, 2015
    Configuration menu
    Copy the full SHA
    ed17942 View commit details
    Browse the repository at this point in the history

  5. hopefully the last > 5.2 array declaration. :(

    yivi committed May 9, 2015
    Configuration menu
    Copy the full SHA
    3be00da View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2015

  1. Merge remote-tracking branch 'upstream/trunk' into trunk 

    Conflicts:
	js/cmb2.min.js
	languages/cmb2-es_ES.mo
	languages/cmb2-es_ES.po
    yivi committed Jun 10, 2015
    Configuration menu
    Copy the full SHA
    7087f8d View commit details
    Browse the repository at this point in the history

  2. proper doc-type for phpdoc in text_date_timestamp

    yivi committed Jun 10, 2015
    Configuration menu
    Copy the full SHA
    3098d59 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2015

  1. Merge remote-tracking branch 'upstream/trunk' into trunk

    yivi committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    7a03730 View commit details
    Browse the repository at this point in the history

  2. removed formatting/docblock changes

    yivi committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    af4f02a View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2015

  1. Workaround for create_date_from_format not existing in PHP < 5.3

    yivi committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    fe72981 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2015

  1. Merge branch 'trunk' of https://github.com/yivi/CMB2 into yivi-date-t… 

    …ime-picker-fixes
    @jtsternberg
    jtsternberg committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    4c6e93e View commit details
    Browse the repository at this point in the history

  2. Clean up

    @jtsternberg
    jtsternberg committed Jul 29, 2015
    Configuration menu
    Copy the full SHA
    e775e2a View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2015

  1. fix so datetime combo field respects date-format and time format as s… 

    …et up by the user
    yivi committed Aug 29, 2015
    Configuration menu
    Copy the full SHA
    e81b6ae View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2015

  1. fixes so datetime/tiemzone also respects user defined time/date formats

    @yivi
    yivi committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    295d5f1 View commit details
    Browse the repository at this point in the history

  2. going back to serialized datetime object, although it ends up seriali… 

    …zed twice.
    @yivi
    yivi committed Aug 30, 2015
    Configuration menu
    Copy the full SHA
    99e82fe View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2015

  1. Merge branch 'trunk' into yivi-date-time-picker-fixes 

    Conflicts:
	includes/CMB2_Types.php
	includes/CMB2_Utils.php
	js/cmb2.min.js
    @yivi
    yivi committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    ef25e15 View commit details
    Browse the repository at this point in the history

  2. minified js with date/time fixes

    @yivi
    yivi committed Oct 8, 2015
    Configuration menu
    Copy the full SHA
    641e7b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

  1. Merge branch 'trunk' into yivi-date-time-picker-fixes 

    Conflicts:
	js/cmb2.min.js
    @yivi
    yivi committed Oct 20, 2015
    Configuration menu
    Copy the full SHA
    f6be281 View commit details
    Browse the repository at this point in the history