Commits · f59800d7a240b76d3c0298485038f33f56d7e249 · afi / opacce

Dec 04, 2015
- dev #25957 add new tri order in kiosque widget + fix panier order by clef_alpha [EXPLO no tests] · f59800d7
  Ghislain Loas authored 9 years ago
  
  f59800d7
- Merge branch 'dev#30973_pnb_backoffice_table' into 'master' · 29909c88
  Ghislain Loas authored 9 years ago
```
Dev#30973 pnb backoffice table

See merge request !1328
```
  29909c88
- dev #30973 fix test failure · 07e0c8ea
  Ghislain Loas authored 9 years ago
  
  07e0c8ea
- dev #30973 fix test failure using fixture · 6af5b93c
  Ghislain Loas authored 9 years ago
  
  6af5b93c
- dev #30973 add csv export · ffd0d509
  Ghislain Loas authored 9 years ago
  
  ffd0d509
- Merge branch... · a5d7e973
  Laurent authored 9 years ago
```
Merge branch 'dev#31762_workflow_notifications_2_notifications_aussi_pour_les_statuts_de_workflow_personnalises' into 'master'

Dev#31762 workflow notifications 2 notifications aussi pour les statuts de workflow personnalises

See merge request !1326
```
  a5d7e973
- Merge branch 'dev#33757_gestion_des_preferences_de_l_utilisateur' into 'master' · 1e97d9a5
  Ghislain Loas authored 9 years ago
```
Dev#33757 gestion des preferences de l utilisateur

See merge request !1325
```
  1e97d9a5
Dec 03, 2015
- Merge branch 'hotline-master' into 'master' · 818319a1
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !1323
```
  818319a1
- Merge branch 'master' into 'dev#33757_gestion_des_preferences_de_l_utilisateur' · af2a1a15
  Ghislain Loas authored 9 years ago
```
Master

See merge request !1322
```
  af2a1a15
- version 7.3.33 · 198a5dcf
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  7.3.33
  
  198a5dcf
- version 7.2.31 · 73a80e54
  Patrick Barroca authored 9 years ago
  
  7.2.31
  
  73a80e54
- Merge branch 'hotline#33948_statut_errone_de_la_disponibilite_des_documents' into 'hotline-master' · a0888d14
  Patrick Barroca authored 9 years ago
```
Hotline#33948 statut errone de la disponibilite des documents

See merge request !1320
```
  a0888d14
- dev #33757 fix url issu in chrome · ee625811
  Ghislain Loas authored 9 years ago
  
  ee625811
- rel #33948 : fix RT · a0204aef
  Patrick Barroca authored 9 years ago
  
  a0204aef
Dec 02, 2015
- rel #33948 : new ilsdi record reader, Koha is not SAX safe · fe480fd8
  Patrick Barroca authored 9 years ago
  
  fe480fd8
- dev #33757 fix syntax · 3382c35c
  Ghislain Loas authored 9 years ago
  
  3382c35c
- Merge branch 'master' into 'dev#30973_pnb_backoffice_table' · 5c97ffb4
  Ghislain Loas authored 9 years ago
```
Master

See merge request !1318
```
  5c97ffb4
- fix php 5.4 compatibility · fd9a5c66
  Ghislain Loas authored 9 years ago
  
  fd9a5c66
- add no-ci · 459a3bc1
  Ghislain Loas authored 9 years ago
  
  459a3bc1
- Merge branch 'master' into 'dev#30973_pnb_backoffice_table' · e19f8e0c
  Ghislain Loas authored 9 years ago
```
Master

See merge request !1316
```
  e19f8e0c
- fix php 5.4 compatibility · 9f316a97
  Ghislain Loas authored 9 years ago
  
  9f316a97
- Merge branch 'master' into 'dev#30973_pnb_backoffice_table' · 8bc5f17b
  Ghislain Loas authored 9 years ago
```
Master

See merge request !1314
```
  8bc5f17b
- fix php 5.4 compatibility · 08c43f1f
  Ghislain Loas authored 9 years ago
  
  08c43f1f
- add no-ci · ebffc890
  Ghislain Loas authored 9 years ago
  
  ebffc890
- dev #30973 fix tests failures · bf596de8
  Ghislain Loas authored 9 years ago
  
  bf596de8
- Merge branch 'master' into 'dev#30973_pnb_backoffice_table' · b08a5427
  Ghislain Loas authored 9 years ago
```
Master

See merge request !1312
```
  b08a5427
- dev #33757 fix test fixtrue · 479eace3
  Ghislain Loas authored 9 years ago
  
  479eace3
- remove empty rows · 0982953b
  Ghislain Loas authored 9 years ago
  
  0982953b
- Revert "remove f...g empty rows" · 45209407
  Ghislain Loas authored 9 years ago
```
This reverts commit f2e8d824.
```
  45209407
- dev #33757 fix rt comments · d820f3d3
  Ghislain Loas authored 9 years ago
  
  d820f3d3
Dec 01, 2015
- dev#30973 pnb_backoffice_table · e4545235
  Laurent authored 9 years ago
```
fix loan pnb fetch for a user
```
  e4545235
- dev #33757 fix rt comments · 523e9fdd
  Ghislain Loas authored 9 years ago
  
  523e9fdd
- remove f...g empty rows · f2e8d824
  Laurent authored 9 years ago
  
  f2e8d824
- Merge branch 'master' into origin-dev#33757_gestion_des_preferences_de_l_utilisateur · fefff312
  Ghislain Loas authored 9 years ago
```
Conflicts:
	tests/db/UpgradeDBTest.php
```
  fefff312
- Merge branch 'dev#10430_pick_day_agenda' into 'master' · 5117df83
  Laurent authored 9 years ago
```
Dev#10430 pick day agenda

See merge request !1311
```
  5117df83
- dev #33757 change label préférences to favoris · 22c0110c
  Ghislain Loas authored 9 years ago
  
  22c0110c
- dev #33757 fix tests failrues · 3dcead2e
  Ghislain Loas authored 9 years ago
  
  3dcead2e
- Merge branch... · 3dff75fb
  Patrick Barroca authored 9 years ago
```
Merge branch 'hotline#33614_sitotheque_site_non_sauvegarde_a_l_ajout_si_l_url_n_est_pas_valide' into 'hotline-master'

Hotline#33614 sitotheque site non sauvegarde a l ajout si l url n est pas valide

See merge request !1308
```
  3dff75fb
Nov 30, 2015
- rel #33614 : fix failures · 1e66daec
  Patrick Barroca authored 9 years ago
  
  1e66daec
- rel #33614 : add error message when url is not valid · 7fe5ae9a
  Patrick Barroca authored 9 years ago
  
  7fe5ae9a

Admin message