Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

co2
- Activity
- Members
- Labels
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

8c2e4a58

Commit 8c2e4a58 authored 5 years ago by Raph El

Downloads
- Plain Diff

Merge branch 'qa' into development

parents e63a4d7a 4078b3d6

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

assets/js/co.js 1 addition, 1 deletion

assets/js/co.js
assets/js/default/calendar.js 64 additions, 17 deletions

assets/js/default/calendar.js
assets/js/default/loginRegister.js 6 additions, 6 deletions

assets/js/default/loginRegister.js
assets/js/dynForm/event.js 16 additions, 91 deletions

assets/js/dynForm/event.js
assets/js/dynForm/proposal.js 13 additions, 4 deletions

assets/js/dynForm/proposal.js
controllers/DatamigrationController.php 35 additions, 1 deletion

controllers/DatamigrationController.php
docs/new_dev_doc.org 3 additions, 1 deletion

docs/new_dev_doc.org
docs/process/cms.org 7 additions, 0 deletions

docs/process/cms.org
docs/process/documentation.org 33 additions, 0 deletions

docs/process/documentation.org
docs/process/settings.org 5 additions, 0 deletions

docs/process/settings.org
views/element/banner.php 16 additions, 8 deletions

views/element/banner.php
views/translation/trad.php 11 additions, 0 deletions

views/translation/trad.php

with 210 additions and 129 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