Commits · 1d99abd8c30cfdd4bd7a67f0e6cfc3fbbbaf588b · afi / opacce

Mar 11, 2016

Merge branch 'dev#38670_favoris_libraries' · 1d99abd8
lbrun authored 9 years ago
```
Conflicts:
	library/ZendAfi/View/Helper/Bouton.php
```
1d99abd8
Merge branch 'dev#38655_2440_agrandissement_champ_custom_fields' · 4b809fac
lbrun authored 9 years ago
```
Conflicts:
	cosmogramme/sql/patch/patch_290.php
	tests/db/UpgradeDBTest.php
```
4b809fac
Merge branch 'pairing-multicheckbox-facets' into 'master' · d5342e60
Ghislain Loas authored 9 years ago
```
Pairing multicheckbox facets

See merge request !1565
```
d5342e60

Ghislain Loas authored 9 years ago

Merge branch 'dev#37779_bonus_webservice_koha_authentification_user_mpd_depuis_bokeh_pour_recuperation_des_adherents_de_facon_incrementielle' into 'master'

Dev#37779 bonus webservice koha authentification user mpd depuis bokeh pour recuperation des adherents de facon incrementielle

See merge request !1564

c44dcad2

Merge branch 'dev#33108_implementation_sigb_pmb_dans_bokeh' into 'master' · ebcf478f
Ghislain Loas authored 9 years ago
```
Dev#33108 implementation sigb pmb dans bokeh

See merge request !1563
```
ebcf478f

Mar 09, 2016
- dev #38670 fix test failure · e17b7c06
  Ghislain Loas authored 9 years ago
  
  e17b7c06
Mar 08, 2016
- fix test comments on treeSealect Search · 3b75fb15
  Ghislain Loas authored 9 years ago
  
  3b75fb15
- fix test comments on default user lib · c44b4c5c
  Ghislain Loas authored 9 years ago
  
  c44b4c5c
- dev #38670 match on expression that is a beginning of word contains in string · dfb2e2c6
  Ghislain Loas authored 9 years ago
  
  dfb2e2c6
- dev #38670 fix failure · 88e0e947
  Ghislain Loas authored 9 years ago
  
  88e0e947
- dev #38670 fix indent · eed63bfd
  Ghislain Loas authored 9 years ago
  
  eed63bfd
- dev #38670 add missing files · c4f0d663
  Ghislain Loas authored 9 years ago
  
  c4f0d663
- dev #38670 fix rt comments · fe9561cf
  Ghislain Loas authored 9 years ago
  
  fe9561cf
- dev #38670 fix rt comments · b230afec
  Ghislain Loas authored 9 years ago
  
  b230afec
- dev #38670 fix rt comments · 608b71bd
  Ghislain Loas authored 9 years ago
  
  608b71bd
Mar 07, 2016
- dev #33108 : fix RT · 9f03a82a
  efalcy authored 9 years ago
  
  9f03a82a
- Merge branch 'hotline-master' into 'master' · 54c65b79
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !1557
```
  54c65b79
- update storm · 7875f926
  Laurent authored 9 years ago
  
  7.5.16
  
  7875f926
- 7.5.16 · e53cf61a
  Laurent authored 9 years ago
```
Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
```
  e53cf61a
- 7.4.15 · 3f74fe27
  Laurent authored 9 years ago
  
  7.4.15
  
  3f74fe27
- Merge branch 'hotline#38468_version_mobile_clic_sur_rebond_mediatheque_inactif' into 'stable' · 2e552f6d
  Laurent authored 9 years ago
```
Hotline#38468 version mobile clic sur rebond mediatheque inactif

See merge request !1540
```
  2e552f6d
- hotline #38468: fix RT comments · efbd932c
  Laurent authored 9 years ago
  
  efbd932c
- pairing-multicheckbox-facets: fix HTML5Valid · 68d976a3
  lbrun authored 9 years ago
  
  68d976a3
- Merge branch 'hotline#39780_creation_de_compte_bug_page_confirmation' into 'hotline-master' · 40b6a0e6
  Ghislain Loas authored 9 years ago
```
Hotline#39780 creation de compte bug page confirmation

See merge request !1555
```
  40b6a0e6
Mar 05, 2016
- hotline #38468: phone article views refactoring · 4fc81c9a
  Laurent authored 9 years ago
  
  4fc81c9a
- hotline #38468: adapt article views to phone · 540fcc89
  Laurent authored 9 years ago
  
  540fcc89
- hotline #39780 fix error display when register new account and mail transport fail · 66e938a5
  Laurent authored 9 years ago
  
  66e938a5
Mar 04, 2016
- hotline #39280 : fix user register action · c0c7156f
  Laurent authored 9 years ago
  
  c0c7156f
- Merge branch... · acb5af39
  Ghislain Loas authored 9 years ago
```
Merge branch 'hotline#36324_valence_pb_toutapprendrearte_vod_1dtouch_sur_profil_smartphone' into 'stable'

Hotline#36324 valence pb toutapprendrearte vod 1dtouch sur profil smartphone

See merge request !1551
```
  acb5af39
- hotline #36324 : add type doc info as class in phone record page · 6b557c42
  Laurent authored 9 years ago
  
  6b557c42
- hotline #36324 : update VERSION · 23d5fbc2
  Laurent authored 9 years ago
  
  23d5fbc2
- dev #38671 fix html5 failures + add default attrib to class_codifAnnexe · 7a0d3bf5
  Ghislain Loas authored 9 years ago
  
  7a0d3bf5
- hotline #36324 : fix error messages display on smartphone login page · 79b6a1db
  Laurent authored 9 years ago
  
  79b6a1db
- dev #38671 fix fatal error · 10153c1c
  Ghislain Loas authored 9 years ago
  
  10153c1c
- dev #38671 add strategy to know what we use between bib and codif · acda3ce8
  Ghislain Loas authored 9 years ago
  
  acda3ce8
- hotline #36324 : digital resources display on phone refactoring · 733165fe
  Laurent authored 9 years ago
  
  733165fe
- dev #38671 fix test failure + add annexe in bookmarklibready · 13f8e5eb
  Ghislain Loas authored 9 years ago
  
  13f8e5eb
Mar 03, 2016
- dev #38670 : fix test · d59e3121
  efalcy authored 9 years ago
  
  d59e3121
- dev #38670 : fix tests · 04967951
  efalcy authored 9 years ago
  
  04967951
- Merge branch 'master' into 'dev#33108_implementation_sigb_pmb_dans_bokeh' · 1bc36869
  Ghislain Loas authored 9 years ago
```
Master

See merge request !1550
```
  1bc36869

Admin message