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

Catch develop up with master #952

Open
wants to merge 41 commits into
base: develop
Choose a base branch
from
Open

Catch develop up with master #952

wants to merge 41 commits into from

Commits on Jan 18, 2017

  1. Use bitwize operators to check for roles

    Pierre GIRAUD committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    5bff380 View commit details
    Browse the repository at this point in the history

  2. Add validator role

    Pierre GIRAUD committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    5e36d80 View commit details
    Browse the repository at this point in the history

  3. Add filter options to users list

    Pierre GIRAUD committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    5070100 View commit details
    Browse the repository at this point in the history

  4. Only one update per task

    Pierre GIRAUD committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    6c50f3d View commit details
    Browse the repository at this point in the history

  5. Optionaly require validator role for projects

    Pierre GIRAUD committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    df20cc9 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Merge pull request #931 from pgiraud/validator_role 

    Validator role
    Pierre GIRAUD authored Jan 19, 2017
    Configuration menu
    Copy the full SHA
    b651514 View commit details
    Browse the repository at this point in the history

  2. We now have 6 users in the tests

    Pierre GIRAUD committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    2d94c03 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #951 from pgiraud/tests_fix 

    We now have 6 users in the tests
    Pierre GIRAUD authored Jan 19, 2017
    Configuration menu
    Copy the full SHA
    13bdd08 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2017

  1. Adding missing space after line break in error msg

    Pierre GIRAUD authored Jan 20, 2017
    Configuration menu
    Copy the full SHA
    00ecc77 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #953 from hotosm/pgiraud-patch-1 

    Adding missing space after line break in error msg
    Pierre GIRAUD authored Jan 20, 2017
    Configuration menu
    Copy the full SHA
    28301a3 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2017

  1. Fix broken private users list selection 

    Query users.json only when required
    Pierre GIRAUD committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    0456d25 View commit details
    Browse the repository at this point in the history

  2. Add support for labels for projects

    Pierre GIRAUD committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    835ab6f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #921 from pgiraud/project-labels 

    Add support for labels for projects
    Pierre GIRAUD authored Jan 25, 2017
    Configuration menu
    Copy the full SHA
    c32a2ea View commit details
    Browse the repository at this point in the history

  4. Use bitwize comparison for the first logged user

    Pierre GIRAUD committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    01986ee View commit details
    Browse the repository at this point in the history

  5. Fix wrong query with allowed users filter

    Pierre GIRAUD committed Jan 25, 2017
    Configuration menu
    Copy the full SHA
    43049be View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. Merge pull request #965 from pgiraud/first_user_login 

    Use bitwize comparison for the first logged user
    Pierre GIRAUD authored Jan 27, 2017
    Configuration menu
    Copy the full SHA
    0985cc8 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2017

  1. Modify Overpass-turbo fullscreen queries 

    These changes alter the Overpass-turbo links to provide the typical Overpass interface instead of the fullscreen map.
    @ethan-nelson
    ethan-nelson authored Feb 2, 2017
    Configuration menu
    Copy the full SHA
    bda6ffe View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Merge pull request #966 from pgiraud/search_query_normal_user 

    Fix wrong query with allowed users filter
    Pierre GIRAUD authored Feb 7, 2017
    Configuration menu
    Copy the full SHA
    b582483 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #963 from pgiraud/fix_private_users_list 

    Fix broken private users list selection
    Pierre GIRAUD authored Feb 7, 2017
    Configuration menu
    Copy the full SHA
    f20a97d View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2017

  1. Adding experienced mapper role

    Pierre GIRAUD committed Feb 10, 2017
    1 Configuration menu
    Copy the full SHA
    ebb214f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #954 from pgiraud/experienced_mapper 

    Adding experienced mapper role
    Pierre GIRAUD authored Feb 10, 2017
    Configuration menu
    Copy the full SHA
    a331245 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Typo

    Pierre GIRAUD committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    2439e0f View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2017

  1. Use describe to get git version

    Pierre GIRAUD committed Feb 13, 2017
    1 Configuration menu
    Copy the full SHA
    35c2aa6 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Improve projects tasks as json query

    Pierre GIRAUD committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    13a7525 View commit details
    Browse the repository at this point in the history

  2. Require postGIS 2.3

    Pierre GIRAUD committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    ee5c45a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Commented out josm test to display gpx file link 

    This removes the if test that controls if the link to download the task's gpx file is displayed. It will always be displayed now. Eventually the text of the tip needs to be edited so it does not say "load in JOSM"
    @bgirardot
    bgirardot authored Mar 1, 2017
    Configuration menu
    Copy the full SHA
    d3a3b70 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. Use static_path instead of static_url 

    Prevents errors with scheme (https) not correctly set
    Pierre GIRAUD committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    d1b88a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2017

  1. Merge pull request #973 from pgiraud/git-version 

    Use 'describe' to get git version
    @pgiraud
    pgiraud authored Mar 11, 2017
    Configuration menu
    Copy the full SHA
    15fdc58 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #974 from pgiraud/tasks-json 

    Improve projects tasks as json query
    @pgiraud
    pgiraud authored Mar 11, 2017
    Configuration menu
    Copy the full SHA
    ce5b870 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2017

  1. Adds security notice to README

    @bgirardot
    bgirardot authored May 16, 2017
    Configuration menu
    Copy the full SHA
    a4efc1e View commit details
    Browse the repository at this point in the history

Commits on May 28, 2017

  1. update in readme file.

    @baladkb
    baladkb authored May 28, 2017
    Configuration menu
    Copy the full SHA
    bfe7e0d View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. patch sql vulnerability and remove security warning

    David Neudorfer committed Jun 15, 2017
    1 Configuration menu
    Copy the full SHA
    a18dcec View commit details
    Browse the repository at this point in the history

  2. Merge pull request #987 from david-hotosm/sql-fix 

    patch sql vulnerability and remove security warning
    @david-hotosm
    david-hotosm authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    cad2b82 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2017

  1. Fix typo in views.py 

    Fix error `SyntaxError: EOL while scanning string literal`
    @jbelien @ethan-nelson
    jbelien authored and ethan-nelson committed Jun 23, 2017
    Configuration menu
    Copy the full SHA
    d5dc572 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2017

  1. Merge pull request #978 from pgiraud/static_path_https 

    Use static_path instead of static_url
    @pgiraud
    pgiraud authored Aug 23, 2017
    Configuration menu
    Copy the full SHA
    3f91465 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #986 from baladkb/patch-1 

    update in readme file.
    @pgiraud
    pgiraud authored Aug 23, 2017
    Configuration menu
    Copy the full SHA
    a9ab83d View commit details
    Browse the repository at this point in the history

  3. Fix flake8 error

    @pgiraud
    pgiraud authored Aug 23, 2017
    Configuration menu
    Copy the full SHA
    166f78a View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2017

  1. fix link (#994)

    @harry-wood @pgiraud
    harry-wood authored and pgiraud committed Sep 10, 2017
    Configuration menu
    Copy the full SHA
    8b51531 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2017

  1. README version clarifications (#997) 

    Make it clearer most development work is not in this repo, and other formatting tweaks
    @harry-wood @pgiraud
    harry-wood authored and pgiraud committed Oct 17, 2017
    Configuration menu
    Copy the full SHA
    819812c View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. Don't use bare exception (#1006) 

    * Don't use bare exception

* Fix httpretty version
    @pgiraud @ethan-nelson
    pgiraud authored and ethan-nelson committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    ec44d51 View commit details
    Browse the repository at this point in the history

  2. Switch OSM API to https (#1005)

    @ethan-nelson
    ethan-nelson authored Jun 15, 2018
    Configuration menu
    Copy the full SHA
    281eb61 View commit details
    Browse the repository at this point in the history