Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

MaarchCourrier
- Activity
- Members
- Labels
- Incidents

Snippets Groups Projects

4234e3a4

Commit 4234e3a4 authored 7 years ago by Florian Azizian

Downloads
- Plain Diff

Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop

parents 1bd64c09 4abedf48

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

apps/maarch_entreprise/cas_connect.php 1 addition, 2 deletions

apps/maarch_entreprise/cas_connect.php
apps/maarch_entreprise/log.php 4 additions, 7 deletions

apps/maarch_entreprise/log.php
apps/maarch_entreprise/smartphone/log.php 3 additions, 5 deletions

apps/maarch_entreprise/smartphone/log.php
apps/maarch_entreprise/sso_connect.php 1 addition, 2 deletions

apps/maarch_entreprise/sso_connect.php
apps/maarch_entreprise/standard_connect.php 1 addition, 2 deletions

apps/maarch_entreprise/standard_connect.php
core/Controllers/UserController.php 2 additions, 1 deletion

core/Controllers/UserController.php
core/Models/SecurityModelAbstract.php 8 additions, 4 deletions

core/Models/SecurityModelAbstract.php
core/Models/UserModelAbstract.php 0 additions, 19 deletions

core/Models/UserModelAbstract.php
core/class/class_security.php 11 additions, 9 deletions

core/class/class_security.php
core/class/web_service/class_web_service.php 1 addition, 9 deletions

core/class/web_service/class_web_service.php
install/class/Class_Install.php 3 additions, 6 deletions

install/class/Class_Install.php
sql/17_xx.sql 15 additions, 6 deletions

sql/17_xx.sql

with 50 additions and 72 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