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

Fix the ngeo migration #4073

Merged
merged 3 commits into from
Aug 31, 2018
Merged

Fix the ngeo migration #4073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b6e503
Fix the ngeo migration
sbrunner Aug 31, 2018
781d99f
Add Docker version
sbrunner Aug 31, 2018
8ecbba2
Add missing jscodeshift
sbrunner Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ npm-packages: ngeo package.json
coveralls gaze jasmine-core jsdoc jsdom karma karma-chrome-launcher karma-coverage \
karma-jasmine karma-sourcemap-loader karma-webpack \
--src=ngeo/package.json --dst=$@
echo googshift eslint-plugin-googshift >> $@
echo jscodeshift googshift eslint-plugin-googshift >> $@

admin/npm-packages: ngeo package.json
$(PRERULE_CMD)
Expand Down
3 changes: 2 additions & 1 deletion doc/developer/debugging.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Add in your makefile ``<user>.mk`` (Each developer should have a different port,

FINALISE=TRUE make --makefile=<user>.mk serve-<interface>

Open in the browser an URL like: ``https://<host>/<instanceid>/wsgi/dev/<interface>.html``.
Open in the browser an URL like: ``https://<host>/<instanceid>/wsgi/dev/<interface>.html``,
for Docker version: ``https://<host>/<instanceid>/dev/<interface>.html``.

Browser
-------
Expand Down
4 changes: 4 additions & 0 deletions doc/integrator/upgrade_application.rst.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ Upgrading a GeoMapFish application
From a version 2.2
~~~~~~~~~~~~~~~~~~

If you have some custom Angular components you should first follow these instructions:
`Migration from ngeo 2.2 to ngeo 2.3
<https://github.com/camptocamp/ngeo/blob/2.3/docs/how_to_migrate_from_2.2_to_2.3.md>`_

Add a section ``managed_files:`` in the file ``project.yaml.mako``.
In this section, you must select by a regular expression the project files you need to keep, and that are
not handled by the GeoMapFish upgrade process. You can see in the GeoMapFish upgrade configuration, section
Expand Down
3 changes: 0 additions & 3 deletions geoportal/c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ Changes to apply
2. Move all your components from `geoportal/{{package}}_geoportal/static-ngeo/components/<name>`
to `geoportal/{{package}}_geoportal/static-ngeo/js/<name>`.

3. If you have some custom Angular components you should follow these instructions:
https://github.com/camptocamp/ngeo/blob/master/docs/how_to_migrate_from_2.2_to_2.3.md


Changes to apply on Docker version
----------------------------------
Expand Down