Commits · 60fee0834dd88465ceeeb87fe7489f0b64489813 · afi / opacce

Sep 20, 2016
- dev #47780 explo commit · 60fee083
  Ghislain Loas authored 8 years ago
  
  60fee083
Sep 19, 2016
- Merge branch 'hotline-master' · 6036584b
  Laurent authored 8 years ago
  
  6036584b
- 7.7.2 · dd8c5a1b
  Laurent authored 8 years ago
  
  7.7.2
  
  dd8c5a1b
- Merge branch 'stable' into hotline-master · faea488d
  Laurent authored 8 years ago
```
Conflicts:
	VERSIONS
	library/startup.php
```
  faea488d
- hotline #47973 fix unfocusable ckeditor dialog input · 2ba2b2df
  Laurent authored 8 years ago
  
  2ba2b2df
- 7.6.4 · 9848e1f2
  Laurent authored 8 years ago
  
  7.6.4
  
  9848e1f2
- Merge branch '47859' into 'stable' · 68088522
  Laurent authored 8 years ago
```
hotline #47859 fix tree view js that accidentally clicks on delete action in tree

See merge request !1819
```
  68088522
Sep 17, 2016
- hotline #47859 fix tree view js that accidentally clicks on delete action in tree · d6b314a7
  Laurent authored 8 years ago
  
  d6b314a7
Sep 16, 2016

Merge branch... · a060dc0e

Laurent authored 8 years ago

Merge branch 'dev#46812_contractuel_url_personnalisee_pour_les_fiches_bibliotheques_chambery' into 'master'

Dev#46812 contractuel url personnalisee pour les fiches bibliotheques chambery

See merge request !1817

a060dc0e

Sep 15, 2016
- Merge branch 'hotline-master' into 'master' · 5ca17bc4
  Patrick Barroca authored 8 years ago
```
Hotline master

See merge request !1815
```
  5ca17bc4
- version 7.7.1 · 20307681
  Patrick Barroca authored 8 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	library/startup.php
```
  7.7.1
  
  20307681
- version 7.6.3 · 9e146604
  Patrick Barroca authored 8 years ago
  
  7.6.3
  
  9e146604
- Merge branch 'hotline#47849_connexions_portail' into 'stable' · bd521581
  Patrick Barroca authored 8 years ago
```
Hotline#47849 connexions portail

See merge request !1813
```
  bd521581
- hotline #47849 : fix test compatibility · 67a21886
  Patrick Barroca authored 8 years ago
  
  67a21886
Sep 14, 2016
- hotline #47849 : fix test compatibility · 2e9c3001
  Patrick Barroca authored 8 years ago
  
  2e9c3001
- hotline #47849 : do not mass delete cache, change seed instead · e73e4cdf
  Patrick Barroca authored 8 years ago
  
  e73e4cdf
- dev #46812 library rewrite url: fix tests · 8980f990
  Laurent authored 8 years ago
  
  8980f990
- dev #46812 library rewrite url: fix profil validation · 04c3c719
  Laurent authored 8 years ago
  
  04c3c719
Sep 13, 2016
- replace patience.svg by patience.gif because animated svg is deprecated · 83c53613
  Ghislain Loas authored 8 years ago
  
  83c53613
- dev #46812 render library links with rewrite url when set · 67efd067
  Laurent authored 8 years ago
  
  67efd067
- dev #46812 validate rewrite_url field in profil form · 0b0ba19e
  Laurent authored 8 years ago
  
  0b0ba19e
- dev #46812 validate rewrite_url field in library form · 95d18742
  Laurent authored 8 years ago
  
  95d18742
- dev #46812 test fix · 5d68ce14
  Laurent authored 8 years ago
  
  5d68ce14
Sep 12, 2016
- dev #46812 library rewrite url: dispatch to bibview when custom url given · ff595316
  Laurent authored 8 years ago
  
  ff595316
- dev #46812 add rewrite url field · 18cf087c
  Laurent authored 8 years ago
  
  18cf087c
- 7.7.0 · 264b3ca9
  Laurent authored 8 years ago
  
  7.7.0
  
  264b3ca9
- update translation · 7b4cb9a5
  Laurent authored 8 years ago
  
  7b4cb9a5
- Merge branch 'stable' · aa2f1b65
  Laurent authored 8 years ago
  
  aa2f1b65
- 7.6.2 · a91eb5dd
  Laurent authored 8 years ago
  
  7.6.2
  
  a91eb5dd
- update translations · 68cdfd67
  Laurent authored 8 years ago
  
  68cdfd67
- refactor translation script · 21d6c5a7
  Laurent authored 8 years ago
  
  21d6c5a7
- Merge branch... · 1174a42a
  Ghislain Loas authored 8 years ago
```
Merge branch 'dev#47223_contractuel_module_de_preinscription_a_mettre_en_place_avec_les_web_services_koha_nanook_sans_paiement_en_ligne' into 'master'

Dev#47223 contractuel module de preinscription a mettre en place avec les web services koha nanook sans paiement en ligne

See merge request !1810
```
  1174a42a
- Merge branch 'hotline#28732_last_fm_attention_changement_d_api' into 'stable' · b4ff84c5
  Ghislain Loas authored 8 years ago
```
Hotline#28732 last fm attention changement d api

See merge request !1808
```
  b4ff84c5
- dev# 47223 fix rt comments · 44ea2359
  Ghislain Loas authored 8 years ago
  
  44ea2359
Sep 09, 2016
- dev #47223 fix rt comment · d846f2f5
  Ghislain Loas authored 8 years ago
  
  d846f2f5
- upgrade version file · e298bca6
  Ghislain Loas authored 8 years ago
  
  e298bca6
- Merge branch 'origin-master' into... · da89b01e
  Ghislain Loas authored 8 years ago
```
Merge branch 'origin-master' into dev#47223_contractuel_module_de_preinscription_a_mettre_en_place_avec_les_web_services_koha_nanook_sans_paiement_en_ligne

Conflicts:
	tests/application/modules/opac/controllers/AuthControllerTest.php
```
  da89b01e
- dev #47223 fix tests failures · 9b8f3b1f
  Ghislain Loas authored 8 years ago
  
  9b8f3b1f
- dev #47223 send mail when success · 223aa100
  Ghislain Loas authored 8 years ago
  
  223aa100
- hotline #28732 fix LastFM get photos · 55adc436
  Laurent authored 8 years ago
  
  55adc436

Admin message