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

Update geonode master #249

Merged
merged 19 commits into from
Jun 6, 2017
Merged

Update geonode master #249

merged 19 commits into from
Jun 6, 2017

Commits on May 29, 2017

  1. Fix for ISSUE GeoNode#3095: Make freetext keywords readonly settable (G… 

    …eoNode#3096)
    @mekanix @simod
    mekanix authored and simod committed May 29, 2017
    Configuration menu
    Copy the full SHA
    55558b4 View commit details
    Browse the repository at this point in the history

  2. Fix for ISSUE GeoNode#3097: Display date of group creating

    @mekanix
    mekanix committed May 29, 2017
    Configuration menu
    Copy the full SHA
    c309fdd View commit details
    Browse the repository at this point in the history

  3. do not create email twice when user signs up GeoNode#3099

    @cezio
    cezio committed May 29, 2017
    Configuration menu
    Copy the full SHA
    ec1d65b View commit details
    Browse the repository at this point in the history

  4. Merge pull request GeoNode#3098 from mekanix/feature/group-creation-date 

    Fix for ISSUE GeoNode#3097: Display date of group creating
    Alessio Fabiani committed May 29, 2017
    Configuration menu
    Copy the full SHA
    354d41b View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into 3099_account_email

    Alessio Fabiani committed May 29, 2017
    Configuration menu
    Copy the full SHA
    84c2ec0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request GeoNode#3100 from cezio/3099_account_email 

    do not create email twice when user signs up
    Alessio Fabiani committed May 29, 2017
    Configuration menu
    Copy the full SHA
    3dd9a60 View commit details
    Browse the repository at this point in the history

  7. - Add sample FREETEXT_KEYWORDS_READONLY on settings py

    GeoSolutions committed May 29, 2017
    Configuration menu
    Copy the full SHA
    6c61da5 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2017

  1. - update requirements.txt

    @allyoucanmap
    allyoucanmap committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    0388779 View commit details
    Browse the repository at this point in the history

  2. - Minor alignments on settings.py

    afabiani committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    0bbeba0 View commit details
    Browse the repository at this point in the history

  3. - Few more checks on sld_url: making absolute_url method a bit more … 

    …resilient
    afabiani committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    112a4e6 View commit details
    Browse the repository at this point in the history

  4. Flake8 constraints

    Alessio Fabiani committed Jun 1, 2017
    Configuration menu
    Copy the full SHA
    7419b50 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. Merge branch 'master' of https://github.com/geonode/geonode into mast… 

    …er-merged-2
    @lucernae
    lucernae committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    7d4c9ce View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master-qgis_server' of github.com:kartoza/geonode into … 

    …master-merged-2
    @lucernae
    lucernae committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    82eb3e8 View commit details
    Browse the repository at this point in the history

  3. - Fix quick install doc

    afabiani committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    93f11a3 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into SLD_URL

    Alessio Fabiani committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    6b96089 View commit details
    Browse the repository at this point in the history

  5. Merge pull request GeoNode#3104 from GeoNode/SLD_URL 

     - Few more checks on sld_url: making absolute_url method a bit more …
    Alessio Fabiani committed Jun 5, 2017
    Configuration menu
    Copy the full SHA
    aca964c View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2017

  1. fix build querystring with links (GeoNode#3108)

    @Gustry @simod
    Gustry authored and simod committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    ed7be5b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master-qgis_server' of github.com:kartoza/geonode into … 

    …master-merged-2
    @lucernae
    lucernae committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    eef3759 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/GeoNode/geonode into mast… 

    …er-merged-2
    @lucernae
    lucernae committed Jun 6, 2017
    Configuration menu
    Copy the full SHA
    37d10fe View commit details
    Browse the repository at this point in the history