Commits · f4b982c5fc62cc1c2a0aaa23a7aa3ae4e445c51c · open-source / OSE

06 Mar, 2019 5 commits
- Ajout de l'IHM de gestion des motifs de modif de service · f4b982c5
  Laurent Lécluse authored Mar 06, 2019
  
  f4b982c5
- Merge branch 'MotifModificationService' into 'b8.1' · 21a8ba76
  Laurent Lécluse authored Mar 06, 2019
```
Motif modification service

See merge request !30
```
  21a8ba76
- Merge branch 'b8.1' of https://git.unicaen.fr/open-source/OSE into domaine_fonctionnel · e6d5c92b
  Alexandre Zvenigorosky authored Mar 06, 2019
```
# Conflicts:
#	module/Application/src/Application/Exception/DbException.php
```
  e6d5c92b
- Merge branch 'b8.1' of https://git.unicaen.fr/open-source/OSE into domaine_fonctionnel · 512394ac
  Alexandre Zvenigorosky authored Mar 06, 2019
```
# Conflicts:
#	module/Application/src/Application/Exception/DbException.php
```
  512394ac
- Merge branch 'b8.1' of https://git.unicaen.fr/open-source/OSE into MotifModificationService · 2ef16e17
  Alexandre Zvenigorosky authored Mar 06, 2019
  
  2ef16e17
05 Mar, 2019 2 commits
- MAJ Changelog · b6173d9d
  Laurent Lécluse authored Mar 05, 2019
  
  b6173d9d
- Finalisation de l'interface de test de la formule de calcul : gestion des fractions · c8812dc2
  Laurent Lécluse authored Mar 05, 2019
  
  c8812dc2
04 Mar, 2019 1 commit
- Finalisation de l'interface de test de la formule de calcul · e9e27d03
  Laurent Lécluse authored Mar 04, 2019
  
  e9e27d03
27 Feb, 2019 1 commit
- Finalisation de l'interface de test de la formule de calcul · 1c8ebed5
  Laurent Lécluse authored Feb 27, 2019
  
  1c8ebed5
26 Feb, 2019 1 commit
- Bug #20054 · 81b8518c
  Laurent Lécluse authored Feb 26, 2019
  
  81b8518c
20 Feb, 2019 2 commits

Merge branches 'Modulateurs-Statuts' and 'v8' of... · a5b8a0b9

Alexandre Zvenigorosky authored Feb 20, 2019

Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml

a5b8a0b9

Merge branches 'Modulateurs-Statuts' and 'v8' of... · 6f61fa4a

Alexandre Zvenigorosky authored Feb 20, 2019

Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml

6f61fa4a

19 Feb, 2019 8 commits
- Mise en place du nouveau système de translation (suite) · f9ac0c87
  Laurent Lécluse authored Feb 19, 2019
  
  f9ac0c87
- Mise en place du nouveau système de translation (suite) · a9aa9341
  Laurent Lécluse authored Feb 19, 2019
```
refactoring de l'usage des exceptions de BDD
```
  a9aa9341
- Mise en place du système de tests pour la formule · 17462691
  Laurent Lécluse authored Feb 19, 2019
  
  17462691
- Mise en place du nouveau système de translation (suite) · b8ed96f1
  Laurent Lécluse authored Feb 19, 2019
  
  b8ed96f1
- Custom : message de debug à retirer · 755163c1
  Laurent Lécluse authored Feb 19, 2019
  
  755163c1
- Customisation messages · 7e182c03
  Laurent Lécluse authored Feb 19, 2019
  
  7e182c03
- Fichiers de traduction de l'appli · 4d76d644
  Laurent Lécluse authored Feb 19, 2019
  
  4d76d644
- Possibilité de customiser les textes de l'appli · 2fc0bd37
  Laurent Lécluse authored Feb 19, 2019
  
  2fc0bd37
13 Feb, 2019 1 commit
- Nouveaux privilèges liés aux interfaces d'admin en cours de développement · 64c2ad5d
  Laurent Lécluse authored Feb 13, 2019
  
  64c2ad5d
11 Feb, 2019 1 commit
- Mise en place de la nouvelle config pour les formules de calcul · bbc60722
  Laurent Lécluse authored Feb 11, 2019
  
  bbc60722
07 Feb, 2019 4 commits
- Merge branch 'master' into b8.1 · c4198f55
  Laurent Lécluse authored Feb 07, 2019
  
  c4198f55
- Oubli de changement... · 501c0b2f
  Laurent Lécluse authored Feb 07, 2019
  
  501c0b2f
- Finalisation v8.0.3 · 64a94f3c
  Laurent Lécluse authored Feb 07, 2019
  
  64a94f3c
- Début infra test formule · c29137ba
  Laurent Lécluse authored Feb 07, 2019
  
  c29137ba
06 Feb, 2019 14 commits
- Oups, 8.0.3 pas 8.0.2 · dec2dce1
  Laurent Lécluse authored Feb 06, 2019
  
  dec2dce1
- MAJ 8.0.2 : bug de tri des états de paiement · 710ef4dc
  Laurent Lécluse authored Feb 06, 2019
  
  710ef4dc
- Corrections de bugs de tri lié aux états de paiement · bdead455
  Laurent Lécluse authored Feb 06, 2019
  
  bdead455
- Merge branch 'v8' into 'master' · 97550fc4
  Laurent Lécluse authored Feb 06, 2019
```
V8

See merge request !23
```
  97550fc4
- Merge remote-tracking branch 'origin/v8' into v8 · 53d20791
  Alexandre Zvenigorosky authored Feb 06, 2019
  
  53d20791
- Merge branches 'Modulateurs-Statuts' and 'v8' of... · 722bf863
  Alexandre Zvenigorosky authored Feb 06, 2019
```
Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml
```
  722bf863
- MAJ état de paiement · 0198d7f8
  Laurent Lécluse authored Feb 06, 2019
  
  0198d7f8
- Merge remote-tracking branch 'origin/v8' into v8 · d23d3254
  Laurent Lécluse authored Feb 06, 2019
  
  d23d3254
- Correction de bug : bouton mal stylé · 406ed04c
  Laurent Lécluse authored Feb 06, 2019
  
  406ed04c
- Merge remote-tracking branch 'origin/v8' into v8 · 57bb34b0
  Alexandre Zvenigorosky authored Feb 06, 2019
  
  57bb34b0
- Merge branches 'Modulateurs-Statuts' and 'v8' of... · e96be378
  Alexandre Zvenigorosky authored Feb 06, 2019
```
Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml
```
  e96be378
- Merge branch 'Modulateurs-structures-2' into 'v8' · 20bef2dc
  Laurent Lécluse authored Feb 06, 2019
```
Modulateurs structures 2

See merge request !22
```
  20bef2dc
- Suppression du champ Unité budgataire · 23429782
  Laurent Lécluse authored Feb 06, 2019
  
  23429782
- Merge branches 'Modulateurs-Statuts' and 'v8' of... · 9a8fd007
  Alexandre Zvenigorosky authored Feb 06, 2019
```
Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml
```
  9a8fd007