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

Merge remote-tracking branch 'origin/2.4' #5073

Merged
merged 25 commits into from
Aug 21, 2019
Merged

Merge remote-tracking branch 'origin/2.4' #5073

merged 25 commits into from
Aug 21, 2019

Commits on Jul 12, 2019

  1. Shorter floor selector

    @sbrunner
    sbrunner committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    c70bd26 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. Merge pull request #5006 from camptocamp/floorselector-height 

    Shorter floor selector
    @sbrunner
    sbrunner committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    7aa562c View commit details
    Browse the repository at this point in the history

  2. Explicitly set the marker's style

    @fredj
    fredj committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    7fef3a9 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5015 from camptocamp/GSGMF-1061 

    Explicitly set the marker's style
    @fredj
    fredj committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    6d970e0 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2019

  1. Fix triangle in object editing

    @sbrunner
    sbrunner committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    01846fa View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5026 from camptocamp/fix-triangle 

    Fix triangle in object editing
    @sbrunner
    sbrunner committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    be7a65f View commit details
    Browse the repository at this point in the history

  3. Fix object editing interface on ie

    @sbrunner
    sbrunner committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    f930fc0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5027 from camptocamp/ie 

    Fix object editing interface on ie
    @sbrunner
    sbrunner committed Jul 18, 2019
    Configuration menu
    Copy the full SHA
    2d42608 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2019

  1. Add orthogonality to linestring drawing

    @llienher
    llienher committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    3eb0d06 View commit details
    Browse the repository at this point in the history

  2. Rename tolerance value

    @llienher
    llienher committed Jul 22, 2019
    Configuration menu
    Copy the full SHA
    9d4d193 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2019

  1. Clean GeometryFunction

    @llienher
    llienher committed Jul 23, 2019
    Configuration menu
    Copy the full SHA
    8bbb7d3 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2019

  1. Fix intersection calculation

    @llienher
    llienher committed Jul 24, 2019
    Configuration menu
    Copy the full SHA
    851613e View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2019

  1. Add example in desktop interface and fix issue with snapping

    @llienher
    llienher committed Jul 25, 2019
    1 Configuration menu
    Copy the full SHA
    eabe6c7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #5023 from camptocamp/add_orthogonality_lines 

    GSEPF-150: Add orthogonality to line drawing
    @llienher
    llienher committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    2cff32e View commit details
    Browse the repository at this point in the history

  3. Fix bad offline import

    @gberaudo
    gberaudo committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    81ab841 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5037 from camptocamp/fix_offline_with_wms_source 

    Fix bad offline import
    @gberaudo
    gberaudo committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    12538bd View commit details
    Browse the repository at this point in the history

  5. Remove snap interaction hack

    @llienher
    llienher committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    bc2971d View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5038 from camptocamp/remove_snapping_hack 

    Remove snap interaction hack
    @llienher
    llienher committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    7880e49 View commit details
    Browse the repository at this point in the history

  7. Fix injector ngeoSnappingSource

    @llienher
    llienher committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    1f1ac64 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #5039 from camptocamp/fix_injector_snapping 

    Fix injector ngeoSnappingSource
    @llienher
    llienher committed Jul 25, 2019
    Configuration menu
    Copy the full SHA
    05e1254 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2019

  1. Exclude the_geom property from query result

    @llienher
    llienher committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    1c5525b View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/2.3' into 2.4

    @sbrunner
    sbrunner committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    64ac8ff View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5071 from llienher/GSGMF-1085_api-query-fix 

    GSGMF-1085: api query fix
    @llienher
    llienher committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    e9280f5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5072 from camptocamp/merge23 

    Merge remote-tracking branch 'origin/2.3' into 2.4
    @sbrunner
    sbrunner committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    9f4e0da View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/2.4'

    @sbrunner
    sbrunner committed Aug 20, 2019
    Configuration menu
    Copy the full SHA
    fda5a77 View commit details
    Browse the repository at this point in the history