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.3' #3878

Merged
merged 164 commits into from
Jun 28, 2018
Merged

Merge remote-tracking branch 'origin/2.3' #3878

merged 164 commits into from
Jun 28, 2018

Conversation

sbrunner
Copy link
Member

No description provided.

arnaud-morvan and others added 30 commits June 5, 2018 14:35
@arnaud-morvan
Upgrade c2cgeoform to remove All from grid page sizes
f08694e
@sbrunner
Upgrade for the new version of python:2
ae293e8
@sbrunner
Merge pull request #3796 from camptocamp/fix
dd9fdcb 
Upgrade for the new version of python:2
@sbrunner
Fix tow variable with the same name
2df3e8e
@sbrunner
Merge pull request #3797 from camptocamp/fix223
50d7077 
Fix tow variable with the same name
@sbrunner
Fix travis CI on Docker project
cc254d0
@sbrunner
Merge pull request #3799 from camptocamp/project-travis-docker
749a67a 
Fix travis CI on Docker project
@sbrunner
Update the upgrade documentation
923482c
@llienher
Add printNativeAngle metadata
350437c
@llienher
Merge pull request #3800 from camptocamp/printNativeAngle
085bf8e 
Add printNativeAngle to available_metadata
@sbrunner
Use faster pgp key server
b019486
@sbrunner
Be able to get the local and S3 tile in Docker compose mode
8bdcea9
@sbrunner
Print the diff files
63ff0bf
@sbrunner
Merge pull request #3798 from camptocamp/tiles-docker
fc2a2d2 
Be able to get the local and s3 tile in Docker compose mode
@arnaud-morvan
Merge pull request #3793 from camptocamp/upgrade_c2cgeoform_remove_all
dcb0012 
Upgrade c2cgeoform to remove All from grid page sizes
@sbrunner
Add the missing update path in the doc, and schema fix
dcdf0b3
Fix check collector
0db4b00 
By default it was trying to access:
http://localhost///c2c/health_check?max_level=1
Revert "Fix check collector"
f97f2c9 
This reverts commit 0db4b00.
Fix check collector
763c90a 
By default it was trying to access:
http://localhost///c2c/health_check?max_level=1
@sbrunner
Merge pull request #3802 from camptocamp/22docfix
10e1b6e 
Add the missing update path in the doc
Merge pull request #3804 from camptocamp/fix_check_collector
000c73b 
Fix check collector
@arnaud-morvan
Set is_password_changed to False when log in with temp_password
2d8bff1 
Relate https://jira.camptocamp.com/browse/GEO-712
@arnaud-morvan
Merge pull request #3805 from camptocamp/fix_is_password_changed
a4fd360 
Set is_password_changed to False when log in with temp_password
@sbrunner
Some Docker litle improvements
b953086
@sbrunner
Phandomjs check to level 3, activate missing, cleanup
ec3f4ce
@sbrunner
Fix the list
f446367
@sbrunner
Merge pull request #3806 from camptocamp/fix-docker
78b9c98 
Some Docker litle improvements
@sbrunner
Merge pull request #3807 from camptocamp/phantomjs-check
47a183d 
Phandomjs check to level 3, activate missing, cleanup
@sbrunner
Merge pull request #3808 from camptocamp/doc-fix
fb06ea3 
Fix the list
@sbrunner
Fix the foreign key that don't ends with '_id'
31b1751
sbrunner added 21 commits June 27, 2018 08:52
@sbrunner
Merge pull request #3862 from camptocamp/msg
8e2d629 
Don't use devserver on build, add logs
@sbrunner
Merge pull request #3865 from camptocamp/nonroot-tinyows
7a49814 
Tinyows as non root
@sbrunner
Merge pull request #3867 from camptocamp/missing
d54227d 
Add missing docker ignore file
@sbrunner
Don't use the tinyows entrypoint
01ad2d5
@sbrunner
Merge pull request #3870 from camptocamp/noentypoint-tinyows
02c7e6c 
Don't use the tinyows entrypoint
@sbrunner
Mapserver as nonroot
c802867
@sbrunner
Use the c2c.template 2.1.0 final version
abaea22
@sbrunner
Merge pull request #3866 from camptocamp/nonroot-mapserver
a105553 
Mapserver as nonroot
@sbrunner
Merge pull request #3872 from camptocamp/update-c2ctemplate
45cbe64 
Use the c2c.template 2.1.0 final version
@sbrunner
Integrate GeoMapFish QGIS server image in the build
fc5d32a
@sbrunner
Add some logs
c9facfb
@sbrunner
Creates a folder for the plugin
f534950
@sbrunner
Removes the exception handler
0965276
@sbrunner
Some backport from ADL
7c0f5b9
@sbrunner
Integrate the QGIS plugin with the config and in the Docker composition
bdc41fd
@sbrunner
Use QGIS server as nonroot
01c0cd8
@sbrunner
Use requirements install
9adf9bc
@sbrunner
Solve some conflict with test upgrades
e2b1191
@sbrunner
Merge pull request #3868 from camptocamp/inegrate-qgis-plugin
1ad61ed 
Integrate qgis plugin
@sbrunner
Fix the srid
47335db
@sbrunner
Merge pull request #3875 from camptocamp/qgis-config
53c61ea 
Fix the srid
@sbrunner sbrunner added this to the dummy milestone Jun 27, 2018
@sbrunner sbrunner requested a review from pvalsecc June 27, 2018 14:41
@sbrunner sbrunner merged commit 2611379 into master Jun 28, 2018
@sbrunner sbrunner deleted the merge23 branch June 28, 2018 08:23
@sbrunner sbrunner modified the milestone: dummy Aug 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pvalsecc pvalsecc pvalsecc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
dummy
Development

Successfully merging this pull request may close these issues.
6 participants
@sbrunner @pvalsecc @arnaud-morvan @llienher @jwkaltz @kalbermattenm