Commits · master · Maarch Labs / MaarchCourrier · GitLab

23 Jun, 2017 7 commits
- Merge branch 'develop' into 'master' · 1fd64e62
```
Develop

See merge request !43
```
  Giovannoni Laurent committed Jun 23, 2017
  1fd64e62 Browse Files
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · cc398b09
  Giovannoni Laurent committed Jun 23, 2017
  
  cc398b09 Browse Files
- FEAT new tag · 60b7a27b
  Giovannoni Laurent committed Jun 23, 2017
  
  60b7a27b
- FEAT #5661 start status administration MVC : disabled in service.xml · 872973f4
  Florian Azizian committed Jun 23, 2017
  
  872973f4 Browse Files
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · f2dbc512
  ORLUC committed Jun 23, 2017
  
  f2dbc512 Browse Files
- add css · 440fb0db
  ORLUC committed Jun 23, 2017
  
  440fb0db Browse Files
- FIX #5668 disabled change pass when CAS activated · 1df836b8
  Florian Azizian committed Jun 22, 2017
  
  1df836b8
22 Jun, 2017 15 commits
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 0ffd2222
  Florian Azizian committed Jun 22, 2017
  
  0ffd2222 Browse Files
- FIX #5667 wording in manage duplicate contact · c91cf518
  Florian Azizian committed Jun 22, 2017
  
  c91cf518
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 9ba4ea31
  ORLUC committed Jun 22, 2017
  
  9ba4ea31 Browse Files
- FEAT #5654 add css + lang admin user modif · b5f9bf09
  ORLUC committed Jun 22, 2017
  
  b5f9bf09 Browse Files
- FEAT #5661 start status administration MVC · 9fcd4157
  Florian Azizian committed Jun 22, 2017
  
  9fcd4157 Browse Files
- FEAT #5661 start status administration MVC · 307dabb9
  Florian Azizian committed Jun 22, 2017
  
  307dabb9 Browse Files
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · d582e5b2
```
Conflicts:
	core/Models/LangModelAbstract.php
```
  Florian Azizian committed Jun 22, 2017
  d582e5b2 Browse Files
- FEAT merge · 273309a1
  Florian Azizian committed Jun 22, 2017
  
  273309a1 Browse Files
- FIX #5639 faute de français · e74e740d
  Florian Azizian committed Jun 22, 2017
  
  e74e740d Browse Files
- FEAT #5654 administration user · b6727bee
  Damien committed Jun 22, 2017
  
  b6727bee Browse Files
- FEAT #5654 administration user · 6f9fe959
  Damien committed Jun 22, 2017
  
  6f9fe959
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 1debf9a7
  ORLUC committed Jun 22, 2017
  
  1debf9a7 Browse Files
- FEAT #5654 add css + lang admin users list · 10ddc0a9
  ORLUC committed Jun 22, 2017
  
  10ddc0a9 Browse Files
- vue status list admin · 2a8ce2f8
  Florian Azizian committed Jun 22, 2017
  
  2a8ce2f8 Browse Files
- mvc status administration · c07bb390
  Florian Azizian committed Jun 22, 2017
  
  c07bb390 Browse Files
21 Jun, 2017 2 commits
- FEAT #5661 start status administration MVC · cbef90ef
  Florian Azizian committed Jun 21, 2017
  
  cbef90ef Browse Files
- FIX #5660 cas connexion failed after user profile edited + security · 6a4c9536
  Florian Azizian committed Jun 21, 2017
  
  6a4c9536
20 Jun, 2017 10 commits
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 78c8157e
  Damien committed Jun 20, 2017
  
  78c8157e Browse Files
- FIX #5655 Remove converted pdf from xl files on signature book · cdc0ca90
  Damien committed Jun 20, 2017
  
  cdc0ca90 Browse Files
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 294e7e22
  ORLUC committed Jun 20, 2017
  
  294e7e22 Browse Files
- FIX #5653 change height modal · d74bb32d
  ORLUC committed Jun 20, 2017
  
  d74bb32d Browse Files
- FIX #5653 change height modal · bd5ce1fe
  ORLUC committed Jun 20, 2017
  
  bd5ce1fe Browse Files
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 963ee93f
  Damien committed Jun 20, 2017
  
  963ee93f Browse Files
- FEAT #5654 Users administration begining · 666c56e7
  Damien committed Jun 20, 2017
  
  666c56e7
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · b72eadf3
  ORLUC committed Jun 20, 2017
  
  b72eadf3 Browse Files
- FIX #5653 change height modal · 0488399e
  ORLUC committed Jun 20, 2017
  
  0488399e
- FIX #5652 new chosen list · d1893abb
  Florian Azizian committed Jun 20, 2017
  
  d1893abb Browse Files
19 Jun, 2017 6 commits
- FIX #5647 wrong revert · 20dc61e0
  Florian Azizian committed Jun 19, 2017
  
  20dc61e0
- Merge branch 'develop' of labs.maarch.org:maarch/MaarchCourrier into develop · 3a394f4e
  Damien committed Jun 19, 2017
  
  3a394f4e Browse Files
- FIX Load angular just once · caf4bce6
  Damien committed Jun 19, 2017
  
  caf4bce6 Browse Files
- FIX #5649 remove br · 6020dd97
  Florian Azizian committed Jun 19, 2017
  
  6020dd97 Browse Files
- Merge branch 'develop' into 'master' · 82b2cf87
```
Develop

See merge request !42
```
  Giovannoni Laurent committed Jun 19, 2017
  82b2cf87 Browse Files
- FIX #5635 get all scope in stat · dc7c4607
  Florian Azizian committed Jun 19, 2017
  
  dc7c4607 Browse Files