Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: glpi-project/glpi
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: TECLIB/glpi
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 11 files changed
  • 4 contributors

Commits on Nov 23, 2016

  1. remove notification from fork

    @orthagh
    orthagh authored Nov 23, 2016
    Copy the full SHA
    47aa5c1 View commit details

Commits on Nov 24, 2016

  1. Fix display (tr) for templates / config / entity (#1305)

    @tsmr @trasher
    tsmr authored and trasher committed Nov 24, 2016
    Copy the full SHA
    5d97a28 View commit details

  2. fix force_purge passed as string (#1310) 

    * fix force_purge passed as string

* make force_purge case insensitive

* in tests, force_purge on query string should be a strung, not a bool

* revert aprtially previous commit

* in multiple delete items : force_purge may equals 1

* use filter_var instead if many lines of code
    @btry @trasher
    btry authored and trasher committed Nov 24, 2016
    Copy the full SHA
    2a9e8cb View commit details

  3. WIP : fix multi status answer for POST, PUT and DELETE (#1273) 

    * fix multi status answer for PUT and DELETE

* add unit test

* remove comments : documentation rules !

* update tests

* send messages for multiple add / update / delete

- fix a bug counting multiple failed adds
- fix message(*)Error not returning data when they should do

* update documentation

* Revert "update documentation"

This reverts commit 68596a2.

* Revert "send messages for multiple add / update / delete"

This reverts commit d582862.

* Revert "update tests"

This reverts commit 9702d3c.

* Revert "remove comments : documentation rules !"

This reverts commit 3e8d78c.

* Revert "add unit test"

This reverts commit 853f563.

* Revert "fix multi status answer for PUT and DELETE"

This reverts commit 536e336.

* update documentation

* add mesages for multiple add / update / delete

- fix bug in failed add count

* do not populate twice the collection of deleted items
    @btry @trasher
    btry authored and trasher committed Nov 24, 2016
    Copy the full SHA
    cdc3be8 View commit details

  4. fix tests (trailing spaces)

    @orthagh @trasher
    orthagh authored and trasher committed Nov 24, 2016
    Copy the full SHA
    ad2c468 View commit details

  5. Some improvements (#1338) 

    * Ensure entity is reset in session after each test

* improve recursivity detection in getEntitiesRestrictRequest
    @trasher
    trasher committed Nov 24, 2016
    Copy the full SHA
    97e220b View commit details

  6. more neutral color for info message_after_redirect; fix #1304 (#1331)

    @orthagh @trasher
    orthagh authored and trasher committed Nov 24, 2016
    Copy the full SHA
    80e00e6 View commit details
Loading