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

Merge remote-tracking branch 'origin/2.2' #3807

Merged
merged 14 commits into from
Apr 26, 2018
Merged

Merge remote-tracking branch 'origin/2.2' #3807

merged 14 commits into from
Apr 26, 2018

Commits on Apr 23, 2018

  1. Fix the minDate and maxDate initialization in the datepicker option o… 

    …bject
    @fredj
    fredj committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    6540b2f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3790 from camptocamp/f_3419 

    Fix the minDate and maxDate initialization in the datepicker option object
    @sbrunner
    sbrunner committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    bafa6f8 View commit details
    Browse the repository at this point in the history

  3. Fix rules operator translation

    @fredj
    fredj committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    95682a5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3794 from camptocamp/f_3520 

    Fix rules operator translation
    @fredj
    fredj committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    2da3f1a View commit details
    Browse the repository at this point in the history

  5. Translate the disclaimer

    @sbrunner
    sbrunner committed Apr 23, 2018
    Configuration menu
    Copy the full SHA
    c0197dc View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2018

  1. Merge pull request #3793 from camptocamp/disclamer-i18n 

    Translate the disclaimer
    @sbrunner
    sbrunner committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    cfad21b View commit details
    Browse the repository at this point in the history

  2. Better 'no result' display in search

    @fredj
    fredj committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    381e959 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3799 from camptocamp/search_no_result 

    Better 'no result' display in search
    @fredj
    fredj committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    944487f View commit details
    Browse the repository at this point in the history

  4. Add missing double support

    @sbrunner
    sbrunner committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    a3b3d8a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3803 from camptocamp/attribute-double 

    Add missing double support
    @sbrunner
    sbrunner committed Apr 24, 2018
    Configuration menu
    Copy the full SHA
    80f296a View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. Use jQuery to synchronize rotation inputs

    @fredj
    fredj committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    aa8d2b7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3802 from camptocamp/f_3755 

    Use jQuery to synchronize rotation inputs
    @fredj
    fredj committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    9b3f870 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2018

  1. Merge remote-tracking branch 'origin/2.2'

    @sbrunner
    sbrunner committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    5f0a621 View commit details
    Browse the repository at this point in the history

  2. Display disk space after failue

    @sbrunner
    sbrunner committed Apr 26, 2018
    Configuration menu
    Copy the full SHA
    720d5a8 View commit details
    Browse the repository at this point in the history