Commits · 7bb72d8a5bdaeddf839b007dd86ac023315cecce · afi / opacce

Jan 25, 2017
- Merge branch 'hotline-master' into 'master' · 7bb72d8a
  Ghislain Loas authored 8 years ago
```
Hotline master

See merge request !2013
```
  7bb72d8a
- Merge branch 'hotline_53250_bluga' into 'hotline-master' · 84f8ae70
  Ghislain Loas authored 8 years ago
```
hotline #53250 : websites webthumbs: fix parsing of new Bluga server

See merge request !2007
```
  84f8ae70
- Merge branch... · 75ee83fe
  Ghislain Loas authored 8 years ago
```
Merge branch 'dev#14141_contractuel_disponibilite_des_exemplaires_dans_la_liste_de_resultats_cavy' into 'hotline-master'

hotline #14141 fix availability display

See merge request !2012
```
  75ee83fe
- hotline #14141 fix availability display · 0389c69b
  Ghislain Loas authored 8 years ago
  
  0389c69b
- add inject bokeh url php script · 9e98ec5b
  Ghislain Loas authored 8 years ago
  
  9e98ec5b
Jan 24, 2017
- Merge branch 'hotline-master' into 'master' · f41e1165
  Patrick Barroca authored 8 years ago
```
Hotline master

See merge request !2008
```
  f41e1165
- hotline #53250 : websites webthumbs: fix parsing of new Bluga server · 809fe23f
  Laurent authored 8 years ago
  
  809fe23f
- version 7.7.29 · 10849d18
  Ghislain Loas authored 8 years ago
  
  7.7.29
  
  10849d18
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · d289d401
  Ghislain Loas authored 8 years ago
```
# Conflicts:
#	VERSIONS
#	library/startup.php
#	tests/application/modules/opac/controllers/BibControllerTest.php
```
  d289d401
- Merge branch 'hotline#50082_mixed_records_links_in_loans_list' into 'hotline-master' · b47fceb5
  Ghislain Loas authored 8 years ago
```
Hotline#50082 mixed records links in loans list

See merge request !2003
```
  b47fceb5
- hotline #50082 fix failures · 4e82564d
  Ghislain Loas authored 8 years ago
  
  4e82564d
- hotline #50082 fix MR · 6bc3317e
  Ghislain Loas authored 8 years ago
  
  6bc3317e
- hotline #51508 forgotten patch_level · 63126c5e
  Patrick Barroca authored 8 years ago
  
  63126c5e
- Merge branch... · bdfe6eb6
  Patrick Barroca authored 8 years ago
```
Merge branch 'hotline#51508_erreur_sql_en_creation_de_section_dans_cosmogramme' into 'hotline-master'

hotline #51508 fix sql error + cosmozendification

See merge request !2005
```
  bdfe6eb6
- Merge branch 'hotline#54111_show_full_openinghours_in_widget' into 'stable' · 8b096e6e
  Patrick Barroca authored 8 years ago
```
hotline #54111 add opening hours to library widget

See merge request !2004
```
  8b096e6e
- Merge branch 'php71fix' into 'hotline-master' · 18536ceb
  Ghislain Loas authored 8 years ago
```
Php71fix

See merge request !2006
```
  18536ceb
- hotline #51508 fix upgradeDb assertion · 5ce02c1d
  Ghislain Loas authored 8 years ago
  
  5ce02c1d
- Merge branch 'hotline#52287_probleme_flux_ical_bibliotheque_de_lille' into 'hotline-master' · 418d40ac
  Patrick Barroca authored 8 years ago
```
hotline #52287 : external agendas : ical parser can import Archimed Ermes feeds

See merge request !1999
```
  418d40ac
Jan 23, 2017
- fix php 7.1 compatibility · 5404e85c
  Laurent authored 8 years ago
  
  5404e85c
- fix php 7.1 compatibility · 7371dad9
  Laurent authored 8 years ago
  
  7371dad9
- fix php 7.1 compatibility · 56e84e14
  Laurent authored 8 years ago
  
  56e84e14
- hotline #52287 test fix · 06a11c39
  Laurent authored 8 years ago
  
  06a11c39
Jan 20, 2017
- hotline #51508 fix sql error + cosmozendification · bda8462b
  Ghislain Loas authored 8 years ago
  
  bda8462b
- hotline #54111 add opening hours to library widget · a8da78b4
  Ghislain Loas authored 8 years ago
  
  a8da78b4
- holtine #50082 revert adding user to reservation · 754b76f0
  Ghislain Loas authored 8 years ago
  
  754b76f0
- holtine #50082 revert adding user to view · f62e0487
  Ghislain Loas authored 8 years ago
  
  f62e0487
- holtine #50082 fix orphee fixtures · 74477ed9
  Ghislain Loas authored 8 years ago
  
  74477ed9
- holtine #50082 continu reverting passing user to helpers · 17400cc1
  Ghislain Loas authored 8 years ago
  
  17400cc1
- holtine #50082 revert passing user to helpers · 7cf489db
  Ghislain Loas authored 8 years ago
  
  7cf489db
- holtine #50082 fix PretsTest · 123dcd17
  Ghislain Loas authored 8 years ago
  
  123dcd17
- holtine #50082 fix AbonneControllerPretsTest · ec40b122
  Ghislain Loas authored 8 years ago
  
  ec40b122
- holtine #50082 fix reservationsTableTest · b59adb8a
  Ghislain Loas authored 8 years ago
  
  b59adb8a
- holtine #50082 fix carthame fixtures · fb2adf18
  Ghislain Loas authored 8 years ago
  
  fb2adf18
- Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into... · b8a72a9f
  Ghislain Loas authored 8 years ago
```
Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into hotline#50082_mixed_records_links_in_loans_list
```
  b8a72a9f
Jan 19, 2017
- Merge remote-tracking branch 'refs/remotes/origin/hotline-master' into origin-master · ed116b34
  Ghislain Loas authored 8 years ago
  
  ed116b34
- version 7.6.20 · 1a35beca
  Ghislain Loas authored 8 years ago
  
  7.6.20
  
  1a35beca
- version 7.7.28 · d3aa1abb
  Ghislain Loas authored 8 years ago
  
  7.7.28
  
  d3aa1abb
- Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master · a1ef6d76
  Ghislain Loas authored 8 years ago
  
  a1ef6d76
- hotline #50082 fix test failures · a246b5b0
  Ghislain Loas authored 8 years ago
  
  a246b5b0
- hotline #50082 fix test failures · 26bd31f9
  Ghislain Loas authored 8 years ago
  
  26bd31f9

Admin message