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

pull commits from base repo to fork #3

Merged
merged 141 commits into from
Mar 1, 2019
Merged

pull commits from base repo to fork #3

merged 141 commits into from
Mar 1, 2019

Conversation

gannebamm
Copy link
Owner

No description provided.

giohappy and others added 30 commits January 29, 2019 18:12
@giohappy
introduce new GEOSERVER_WEB_UI_LOCATION options
8a1c0c6
@capooti
Added chinese to ALL_LANGUAGES enumeration
76bbbba
improve layer_thumbnail view
9ca3957
improve map_thumbnail view
e03d14b
fix map_thumbnail returned None instead.
b3e9359
fix layer_thumbnail returned None instead.
05f49e5
@giohappy
proxy auth refactoring with extended checks
bdde3b1
use requests retry to improve geonode/geoserver connection
7d07b84
fix import
8596bc4
fix force list status code
4ea657e
@capooti
Related to fix for #4178
1aeefe0
- fix pavemenet cmdopts options
92ffdc6
Merge pull request #4192 from gannebamm/master
6a1692f 
Update PostgreSQL to v10.x
Merge branch 'master' into geoserver_web_ui_location
ef455ac
Merge pull request #4194 from GeoNode/geoserver_web_ui_location
8e4871a 
introduce new GEOSERVER_WEB_UI_LOCATION options
Merge branch 'master' into add-chinese-in-languages-enum
2c4b116
Merge pull request #4203 from capooti/related-to-fix-4178
9cddea9 
Related to fix for #4178
Merge pull request #4195 from capooti/add-chinese-in-languages-enum
174eadc 
Added chinese to ALL_LANGUAGES enumeration
Merge branch 'master' into thumbnail_views
25241fb
Merge branch 'master' into request_retry
ab89a2f
fix flake8
6125d2f
fix flake8
2bb0b9b
Merge pull request #4202 from hishamkaram/request_retry
8486711 
add a retry mechanism to geoserver package
Merge pull request #4200 from hishamkaram/thumbnail_views
315fabc 
improve Thumbnail views
@giohappy
fixed mixing of token object and string in login/logout
2ccaece
@giohappy
Merge branch 'master' into proxy_auth_refactoring
80397b8
@giohappy
Merge remote-tracking branch 'origin/master' into proxy_auth_refactoring
1a8f1f6
@giohappy
fixed pep8 issues
d20c9db
@giohappy
Merge branch 'proxy_auth_refactoring' of https://github.com/GeoNode/g…
1635d81 
…eonode into proxy_auth_refactoring
@giohappy
fixed another pep8 issue
d6d9849
frafra and others added 29 commits February 20, 2019 16:18
@frafra
Import SSL Certificate for GeoServer
44ef8dc
Merge pull request #4245 from frafra/spc-geoserver-trusted-ssl-cert
125aac0 
Import SSL Certificate for GeoServer
[Fixes #4247] 404 error on CSV upload
68c59de
Fixes Travis geonode-selenium build
d8b05a3
Merge branch 'master' of https://github.com/GeoNode/geonode into geon…
32aab87 
…ode-selenium
Fixes Travis geonode-selenium build
79a4da9
Fixes Travis geonode-selenium build
04ce54c
Merge pull request #4248 from GeoNode/ISSUE_4247
d9e8d7a 
[Fixes #4247] 404 error on CSV upload
Fixes Travis geonode-selenium build
09cc694
Merge branch 'master' of https://github.com/GeoNode/geonode into geon…
c4ae963 
…ode-selenium
Fixes Travis geonode-selenium build
fca593a
Fixes Travis geonode-selenium build
9ae8535
[Closes #4249] Contribute back upstream menu management from IGAD
b60e26b
- Fix smoke test cases
09e3cb8
- Fix smoke test cases
968f9d4
@capooti
Bump django-geoexplorer-worldmap==4.0.63
83734d8
@frafra
Disable system_site_packages for geonode-selenium
6f1bb7d
Merge pull request #4240 from frafra/geonode-selenium
d75b1bf 
Test with geonode-selenium
@Coop56
Removes unnecessary dependencies from the requirements.txt and settin…
f8b07c5 
…gs.py files.
@Coop56
Merge branch 'master' into audit-python-requirements
5e0c0b3
@Coop56
Adds back pyopenssl to requirements.txt.
c669c18
Merge pull request #4256 from Coop56/audit-python-requirements
418f62f 
Removes Old Python Dependencies
Merge branch 'master' into GNIP_4249
84caef4
Merge branch 'master' into bump-worldmap-4.0.63
bbbd127
[Fixes #4254] Pavement YAMLLoadWarning
b2d6f0e
Merge pull request #4252 from capooti/bump-worldmap-4.0.63
25a7e96 
Bump django-geoexplorer-worldmap 4.0.63
Merge pull request #4250 from GeoNode/GNIP_4249
9292659 
[Closes #4249] Contribute back upstream menu management from IGAD
Merge pull request #4257 from GeoNode/ISSUE_4254
6328f75 
[Fixes #4254] Pavement YAMLLoadWarning
[minor] removing redoundant middleware class from settings
b9298f0
@gannebamm gannebamm merged commit b9a23d5 into gannebamm:master Mar 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@gannebamm @giohappy @capooti @ahmednoureldeen @frafra @hishamkaram @francbartoli @drnextgis @Coop56