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

Mapentity permissions refactor #1017

Merged
merged 36 commits into from May 16, 2014
Merged

Mapentity permissions refactor #1017

merged 36 commits into from May 16, 2014

Commits on Apr 17, 2014

  1. Permission to bypass structure

    @leplatrem
    leplatrem committed Apr 17, 2014
    Copy the full SHA
    bce97ad View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2014

  1. WIP

    @leplatrem
    leplatrem committed Apr 18, 2014
    Copy the full SHA
    272d280 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Get rid of deprecated code

    @leplatrem
    leplatrem committed Apr 22, 2014
    Copy the full SHA
    03db2bd View commit details
    Browse the repository at this point in the history

  2. Permissions in tests fixtures

    @leplatrem
    leplatrem committed Apr 22, 2014
    Copy the full SHA
    a3c2b04 View commit details
    Browse the repository at this point in the history

  3. Redundant test with MapEntity

    @leplatrem
    leplatrem committed Apr 22, 2014
    Copy the full SHA
    25af88f View commit details
    Browse the repository at this point in the history

  4. Fix tests with fixtures and registry order

    @leplatrem
    leplatrem committed Apr 22, 2014
    Copy the full SHA
    47daf73 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. Go on fixing tests

    @leplatrem
    leplatrem committed Apr 23, 2014
    Copy the full SHA
    19cf9bc View commit details
    Browse the repository at this point in the history

  2. Get rid of useless templates with new mapentity

    @leplatrem
    leplatrem committed Apr 23, 2014
    Copy the full SHA
    7eeb67b View commit details
    Browse the repository at this point in the history

  3. Fix tourism tests

    @leplatrem
    leplatrem committed Apr 23, 2014
    Copy the full SHA
    731f7a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. Fixing more tests

    @leplatrem
    leplatrem committed Apr 24, 2014
    Copy the full SHA
    a3fa5a2 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2014

  1. Some more test fixing

    @leplatrem
    leplatrem committed Apr 25, 2014
    Copy the full SHA
    55ecc28 View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2014

  1. Merge branch 'develop' into mapentity_perms_refactor

    @leplatrem
    leplatrem committed Apr 28, 2014
    Copy the full SHA
    049db1a View commit details
    Browse the repository at this point in the history

Commits on May 5, 2014

  1. Last tests fixed

    @leplatrem
    leplatrem committed May 5, 2014
    Copy the full SHA
    427cf41 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2014

  1. Use published version of MapEntity

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    8c15eea View commit details
    Browse the repository at this point in the history

  2. Upgrade paperclip

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    261d5b8 View commit details
    Browse the repository at this point in the history

  3. Explicit fields from MapEntityForm when overriding fieldslayout

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    6d44eac View commit details
    Browse the repository at this point in the history

  4. Add mapentity templates folder to template_dirs

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    f908f47 View commit details
    Browse the repository at this point in the history

  5. Update changelog

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    50d6d7d View commit details
    Browse the repository at this point in the history

  6. Update mapentity

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    17b860d View commit details
    Browse the repository at this point in the history

  7. Update docs about user/groups

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    1b8e1c2 View commit details
    Browse the repository at this point in the history

  8. Update changelog

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    12c936c View commit details
    Browse the repository at this point in the history

  9. Update mapentity

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    92b2e25 View commit details
    Browse the repository at this point in the history

  10. Use omelette to get predictable mapentity source folder

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    0eb4402 View commit details
    Browse the repository at this point in the history

  11. Add mapentity to sources in dev mode

    @leplatrem
    leplatrem committed May 6, 2014
    Copy the full SHA
    e7912bc View commit details
    Browse the repository at this point in the history

Commits on May 7, 2014

  1. Ensure MapEntity permissions are created on syncdb

    @leplatrem
    leplatrem committed May 7, 2014
    Copy the full SHA
    ce6ef02 View commit details
    Browse the repository at this point in the history

  2. Update mapentity

    @leplatrem
    leplatrem committed May 7, 2014
    Copy the full SHA
    e936127 View commit details
    Browse the repository at this point in the history

  3. Fix paths to JavaScript since MapEntity uses submodules

    @leplatrem
    leplatrem committed May 7, 2014
    Copy the full SHA
    796ae40 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2014

  1. Update mapentity

    Gael UTARD committed May 12, 2014
    Copy the full SHA
    6052b55 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2014

  1. Update mapentity

    Gael UTARD committed May 13, 2014
    Copy the full SHA
    8df179e View commit details
    Browse the repository at this point in the history

Commits on May 14, 2014

  1. Update mapentity

    Gael UTARD committed May 14, 2014
    Copy the full SHA
    6274e47 View commit details
    Browse the repository at this point in the history

  2. Make sure debian packages list is up to date before install

    Gael UTARD committed May 14, 2014
    Copy the full SHA
    9dfd38e View commit details
    Browse the repository at this point in the history

Commits on May 15, 2014

  1. Update mapentity

    @leplatrem
    leplatrem committed May 15, 2014
    Copy the full SHA
    f9668d5 View commit details
    Browse the repository at this point in the history

  2. Do not overwrite __internal__ user by admin user

    Gael UTARD committed May 15, 2014
    Copy the full SHA
    df4b6d6 View commit details
    Browse the repository at this point in the history

  3. Fix host:port in requests sent to convertit

    Gael UTARD committed May 15, 2014
    Copy the full SHA
    4f60ccf View commit details
    Browse the repository at this point in the history

Commits on May 16, 2014

  1. Revert "Fix host:port in requests sent to convertit" 

    This reverts commit 4f60ccf.
    @leplatrem
    leplatrem committed May 16, 2014
    Copy the full SHA
    a0aeade View commit details
    Browse the repository at this point in the history

  2. Update mapentity. 

    Previous changes were reverted since integrated in MapEntity itself.

For example, on the frontend template, we don't passe the absolute URL, so
better to run the tests the same way:

https://github.com/makinacorpus/django-mapentity/blob/e7e296dc91f80a2d9fafaf4c8cf3cbd638486be8/mapentity/templates/mapentity/mapentity_detail.html#L13-L14
    @leplatrem
    leplatrem committed May 16, 2014
    Copy the full SHA
    0c229de View commit details
    Browse the repository at this point in the history