Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

GoGoCarto
- Activity
- Members
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

e228a5cd

Commit e228a5cd authored 4 years ago by Adrien Pavie

Downloads
- Plain Diff

Merge from master

parents 8df3b2e6 5679c97a

No related branches found

No related tags found

No related merge requests found

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 3 additions, 3 deletions

Makefile
assets/scss/admin.scss 6 additions, 0 deletions

assets/scss/admin.scss
bin/execute_custom_domain.sh 18 additions, 12 deletions

bin/execute_custom_domain.sh
config/parameters.yaml 1 addition, 1 deletion

config/parameters.yaml
config/services.yaml 6 additions, 0 deletions

config/services.yaml
docs/installation.md 1 addition, 1 deletion

docs/installation.md
src/Admin/ConfigurationAdmin.php 1 addition, 1 deletion

src/Admin/ConfigurationAdmin.php
src/Admin/ConfigurationCustomJsCssAdmin.php 28 additions, 0 deletions

src/Admin/ConfigurationCustomJsCssAdmin.php
src/Admin/ConfigurationStyleAdmin.php 32 additions, 49 deletions

src/Admin/ConfigurationStyleAdmin.php
src/Command/MigrationCommand.php 32 additions, 17 deletions

src/Command/MigrationCommand.php
src/Document/Element.php 1 addition, 3 deletions

src/Document/Element.php
src/Services/GoGoCartoJsService.php 4 additions, 3 deletions

src/Services/GoGoCartoJsService.php
src/Services/UrlService.php 3 additions, 3 deletions

src/Services/UrlService.php
templates/admin/core_custom/custom-fields/color-picker.html.twig 1 addition, 1 deletion

...es/admin/core_custom/custom-fields/color-picker.html.twig
templates/admin/core_custom/custom-fields/element-data.html.twig 4 additions, 4 deletions

...es/admin/core_custom/custom-fields/element-data.html.twig

with 141 additions and 98 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment