Code

Catch develop up with master#952

Code

Open

bgirardot wants to merge 41 commits intodevelophotosm/osm-tasking-manager2:developfrom masterhotosm/osm-tasking-manager2:masterCopy head branch name to clipboard

+1,924-589

Commits

Commits on Jan 18, 2017

• Use bitwize operators to check for roles

  

  Pierre GIRAUD

  committed
  5bff380

• Add validator role

  

  Pierre GIRAUD

  committed
  5e36d80

• Add filter options to users list

  

  Pierre GIRAUD

  committed
  5070100

• Only one update per task

  

  Pierre GIRAUD

  committed
  6c50f3d

• Optionaly require validator role for projects

  

  Pierre GIRAUD

  committed
  df20cc9

Commits on Jan 19, 2017

• Merge pull request #931 from pgiraud/validator_role

  Show description for b651514
  

  Pierre GIRAUD

  authored
  b651514

• We now have 6 users in the tests

  

  Pierre GIRAUD

  committed
  2d94c03

• Merge pull request #951 from pgiraud/tests_fix

  Show description for 13bdd08
  

  Pierre GIRAUD

  authored
  13bdd08

Commits on Jan 20, 2017

• Adding missing space after line break in error msg

  

  Pierre GIRAUD

  authored
  00ecc77

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

  Show description for 28301a3
  

  Pierre GIRAUD

  authored
  28301a3

Commits on Jan 25, 2017

• Fix broken private users list selection

  Show description for 0456d25
  

  Pierre GIRAUD

  committed
  0456d25

• Add support for labels for projects

  

  Pierre GIRAUD

  committed
  835ab6f

• Merge pull request #921 from pgiraud/project-labels

  Show description for c32a2ea
  

  Pierre GIRAUD

  authored
  c32a2ea

• Use bitwize comparison for the first logged user

  

  Pierre GIRAUD

  committed
  01986ee

• Fix wrong query with allowed users filter

  

  Pierre GIRAUD

  committed
  43049be

Commits on Jan 27, 2017

• Merge pull request #965 from pgiraud/first_user_login

  Show description for 0985cc8
  

  Pierre GIRAUD

  authored
  0985cc8

Commits on Feb 2, 2017

• Modify Overpass-turbo fullscreen queries

  Show description for bda6ffe
  ethan-nelson

  authored
  bda6ffe

Commits on Feb 7, 2017

• Merge pull request #966 from pgiraud/search_query_normal_user

  Show description for b582483
  

  Pierre GIRAUD

  authored
  b582483

• Merge pull request #963 from pgiraud/fix_private_users_list

  Show description for f20a97d
  

  Pierre GIRAUD

  authored
  f20a97d

Commits on Feb 10, 2017

• Adding experienced mapper role

  

  Pierre GIRAUD

  committed
  ebb214f

• Merge pull request #954 from pgiraud/experienced_mapper

  Show description for a331245
  

  Pierre GIRAUD

  authored
  a331245

Commits on Feb 12, 2017

• Typo

  

  Pierre GIRAUD

  committed
  2439e0f

Commits on Feb 13, 2017

• Use describe to get git version

  

  Pierre GIRAUD

  committed
  35c2aa6

Commits on Feb 14, 2017

• Improve projects tasks as json query

  

  Pierre GIRAUD

  committed
  13a7525

• Require postGIS 2.3

  

  Pierre GIRAUD

  committed
  ee5c45a

Commits on Mar 1, 2017

• Commented out josm test to display gpx file link

  Show description for d3a3b70
  bgirardot

  authored
  d3a3b70

Commits on Mar 2, 2017

• Use static_path instead of static_url

  Show description for d1b88a8
  

  Pierre GIRAUD

  committed
  d1b88a8

Commits on Mar 11, 2017

• Merge pull request #973 from pgiraud/git-version

  Show description for 15fdc58
  pgiraud

  authored
  15fdc58

• Merge pull request #974 from pgiraud/tasks-json

  Show description for ce5b870
  pgiraud

  authored
  ce5b870

Commits on May 16, 2017

• Adds security notice to README

  bgirardot

  authored
  a4efc1e

Commits on May 28, 2017

• update in readme file.

  baladkb

  authored
  bfe7e0d

Commits on Jun 15, 2017

• patch sql vulnerability and remove security warning

  

  David Neudorfer

  committed
  a18dcec

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

  Show description for cad2b82
  david-hotosm

  authored
  cad2b82

Commits on Jun 23, 2017

• Fix typo in views.py

  Show description for d5dc572
  

  jbelien

  authored and

  ethan-nelson

  committed
  d5dc572

Commits on Aug 23, 2017

• Merge pull request #978 from pgiraud/static_path_https

  Show description for 3f91465
  pgiraud

  authored
  3f91465

• Merge pull request #986 from baladkb/patch-1

  Show description for a9ab83d
  pgiraud

  authored
  a9ab83d

• Fix flake8 error

  pgiraud

  authored
  166f78a

Commits on Sep 10, 2017

• fix link (#994)

  

  harry-wood

  authored and

  pgiraud

  committed
  8b51531

Commits on Oct 17, 2017

• README version clarifications (#997)

  Show description for 819812c
  

  harry-wood

  authored and

  pgiraud

  committed
  819812c

Commits on Jun 15, 2018

• Don't use bare exception (#1006)

  Show description for ec44d51
  

  pgiraud

  authored and

  ethan-nelson

  committed
  ec44d51

• Switch OSM API to https (#1005)

  ethan-nelson

  authored
  281eb61