Hotline master (!975) · Merge requests · afi / opacce

Merged Patrick Barroca requested to merge hotline-master into master 9 years ago

Jul 02, 2015

Patrick Barroca authored 9 years ago

Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	application/modules/admin/controllers/AccueilController.php
#	application/modules/admin/controllers/SystemeController.php
#	library/Class/AvisNotice.php
#	library/Class/Systeme/ModulesAccueil/Kiosque.php
#	library/startup.php

c9459397

version 7.0.26 · 2175748c
Patrick Barroca authored 9 years ago

2175748c

Jul 01, 2015
- Merge branch 'hotline#26954-flash-kiosk-prefs-lost' into 'stable' · 00911407
  Patrick Barroca authored 9 years ago
```
Hotline#26954 flash kiosk prefs lost

See merge request !972
```
  00911407
- rel #26954 : version file · a236c69d
  Patrick Barroca authored 9 years ago
  
  a236c69d
- rel #26954 : clear profil_redirect when pref set to flash list style · 8bd8ecc0
  Patrick Barroca authored 9 years ago
  
  8bd8ecc0
Jun 30, 2015
- Merge branch 'hotline#26584-broken-avis-import' into 'stable' · 17802c69
  Patrick Barroca authored 9 years ago
```
Hotline#26584 broken avis import

See merge request !969
```
  17802c69
- rel #26584 : version file · 0702838e
  Patrick Barroca authored 9 years ago
  
  0702838e
- rel #26584 : test coverage · 87812c9d
  Patrick Barroca authored 9 years ago
  
  87812c9d
Jun 29, 2015
- rel #26584 : avis import refactoring · 9c8e0ee2
  Patrick Barroca authored 9 years ago
  
  9c8e0ee2

Admin message

Hotline master

Merge request reports

Activity