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: encode/django-rest-framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: encode/django-rest-framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: pr/6754
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 21, 2019

  1. Let AND and OR operators have multiple members 

    resolve permission AND(OR(a,b,c), d, e) with logic (a v b v c) ^ d ^ e
    @kerbaras
    kerbaras authored Jun 21, 2019
    Configuration menu
    Copy the full SHA
    74855ff View commit details
    Browse the repository at this point in the history

  2. Fix typo at OR constructor 

    OR members should be the constructors arguments
    @kerbaras
    kerbaras authored Jun 21, 2019
    Configuration menu
    Copy the full SHA
    db16bb3 View commit details
    Browse the repository at this point in the history

  3. Fix NameError

    @kerbaras
    kerbaras authored Jun 21, 2019
    Configuration menu
    Copy the full SHA
    88b6200 View commit details
    Browse the repository at this point in the history

  4. Fix tox E302 and E303

    @kerbaras
    kerbaras authored Jun 21, 2019
    Configuration menu
    Copy the full SHA
    9c3ea30 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2019

  1. Do not extend AND/OR/NOT from BasePermission 

    This can be done in a separate pull request, but it was reverted out of this one because it made it more difficult to review and increased its chances of not being accepted.
    @kevin-brown
    kevin-brown committed Nov 14, 2019
    Configuration menu
    Copy the full SHA
    e709378 View commit details
    Browse the repository at this point in the history
Loading