Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

b1a3f225

Commit b1a3f225 authored 8 years ago by Damien

Downloads
- Plain Diff

Merge branch 'develop' into lgi-feat-create-angular2

parents 33e64262 d3fe8241

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/indexing_searching/search_contacts.php 1 addition, 1 deletion

.../maarch_entreprise/indexing_searching/search_contacts.php
apps/maarch_entreprise/js/functions.js 37 additions, 26 deletions

apps/maarch_entreprise/js/functions.js
core/Controllers/ResController.php 479 additions, 0 deletions

core/Controllers/ResController.php
core/Test/ResControllerTest.php 75 additions, 0 deletions

core/Test/ResControllerTest.php
modules/templates/templates_management.php 3 additions, 3 deletions

modules/templates/templates_management.php
modules/visa/Views/signatureBook.html 12 additions, 13 deletions

modules/visa/Views/signatureBook.html
modules/visa/css/module.css 12 additions, 12 deletions

modules/visa/css/module.css
modules/visa/js/aController.js 161 additions, 159 deletions

modules/visa/js/aController.js

with 780 additions and 214 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