Commits · b451849911ebfea6aa7333169b9bb3fba8e8396c · afi / opacce

Jun 09, 2015
- Merge branch 'hotline-master' into 'master' · b4518499
  Laurent authored 9 years ago
```
Hotline master

See merge request !926
```
  b4518499
- hotline #25874 : test fix · c6e9bcbe
  Laurent authored 9 years ago
  
  7.1.38
  
  c6e9bcbe
- Version 7.1.38 · d0873f93
  Laurent authored 9 years ago
  
  d0873f93
- hotline #25874 : add page_size parametres in search · 74df26ac
  Laurent authored 9 years ago
  
  74df26ac
- Merge branch 'master' into 'master' · 1c500de7
  Patrick Barroca authored 9 years ago
```
Corrections de l'install

Ajout du chemin vers le fichier de conf du site Apache et correction de la phrase décrivant la config de MySql

See merge request !924
```
  1c500de7
- Ajout du fichier de conf d'Apache et petite correction sur la conf de MySql · e6e33712
  Damien Robillard authored 9 years ago
  
  e6e33712
- hotline #25978 fix integration path on several files with [DATE] · 44aa48d3
  Laurent authored 9 years ago
  
  44aa48d3
- hotline #25978 fix crash on record without title integration · a6010050
  Laurent authored 9 years ago
  
  a6010050
Jun 08, 2015
- Add PNB icon · 4b4be009
  Laurent authored 9 years ago
  
  4b4be009
- version 7.1.37 · 78f61fc5
  Patrick Barroca authored 9 years ago
  
  7.1.37
  
  78f61fc5
- Merge branch 'hotline-master' into 'master' · 11c9e355
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !921
```
  11c9e355
- Merge remote-tracking branch 'refs/remotes/afi/community_slider_navigation_percent' into afi-master · 1d7576ec
  Patrick Barroca authored 9 years ago
```
# Conflicts:
#	tests/application/modules/admin/controllers/AccueilControllerCmsTest.php
```
  1d7576ec
- version file · ffa6a616
  Ghislain Loas authored 9 years ago
  
  ffa6a616
Jun 06, 2015
- Merge branch 'master' of http://git.afi-sa.fr/afi/opacce · 84ccc057
  Damien Robillard authored 9 years ago
  
  84ccc057
Jun 05, 2015
- Merge branch 'hotline#25855-default-to-pubdate-sorting-in-domain-result' into 'hotline-master' · 0f329afa
  Patrick Barroca authored 9 years ago
```
Hotline#25855 default to pubdate sorting in domain result

See merge request !920
```
  0f329afa
- rel #25855 : fix tests · 119ea816
  Patrick Barroca authored 9 years ago
  
  119ea816
- rel #25855 : domain results default sort by publication · 9e90264b
  Patrick Barroca authored 9 years ago
  
  9e90264b
- community slider_navigation fix next-previous behaviour + add test · 38bf8ba0
  Ghislain Loas authored 9 years ago
  
  38bf8ba0
- Merge branch 'dev#17871_oaista_la_vista' into 'master' · e0380da6
  Alex Arnaud authored 9 years ago
```
Dev#17871 oaista la vista

See merge request !917
```
  e0380da6
- Merge branch 'dev_articles_order' into 'master' · 6082c686
  Laurent authored 9 years ago
```
Dev articles order

See merge request !916
```
  6082c686
- Merge branch 'hotline-master' into 'master' · 1da45f1f
  Patrick Barroca authored 9 years ago
```
Hotline master

See merge request !914
```
  1da45f1f
- version 7.1.36 - fix test · 7f3c546e
  Patrick Barroca authored 9 years ago
  
  7.1.36
  
  7f3c546e
- version 7.1.36 · 042c5e5f
  Patrick Barroca authored 9 years ago
```
Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-hotline-master

# Conflicts:
#	VERSIONS
#	application/modules/admin/controllers/IndexController.php
#	library/Class/WebService/BibNumerique/Numilog/LivreNumerique.php
#	library/Class/WebService/BibNumerique/RessourceNumerique.php
#	library/Class/WebService/OAI.php
#	library/ZendAfi/View/Helper/Accueil/Kiosque.php
#	library/startup.php
#	tests/application/modules/admin/controllers/AdminIndexControllerTest.php
#	tests/library/ZendAfi/View/Helper/Accueil/KiosqueTest.php
```
  042c5e5f
- community slider_navigation fix test failures · 356235be
  Ghislain Loas authored 9 years ago
  
  356235be
- community slider_navigation add unit to defaults.ini · 07bcb3ba
  Ghislain Loas authored 9 years ago
  
  07bcb3ba
- fix test failrues · 898261bb
  Ghislain Loas authored 9 years ago
  
  898261bb
- Merge branch 'master' into origin-dev#17871_oaista_la_vista · 89b9af4e
  Laurent authored 9 years ago
```
Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_257.php
```
  89b9af4e
- community_dev start adding percent param to slider_navigation · 43c2499f
  Ghislain Loas authored 9 years ago
  
  43c2499f
- version 1.0.22 · 585e60cd
  Patrick Barroca authored 9 years ago
  
  7.0.22
  
  585e60cd
Jun 04, 2015
- Merge branch 'hotline_#25433_moissonnage_numilog' into 'stable' · 1ff6af3b
  Patrick Barroca authored 9 years ago
```
Hotline #25433 moissonnage numilog

See merge request !912
```
  1ff6af3b
- dev #17871 oaista la vista · 976f8476
  Alex Arnaud authored 9 years ago
```
test fix
```
  976f8476
- hotline #25433 : numilog remove unusable methods · 843281ac
  efalcy authored 9 years ago
  
  843281ac
- Merge branch 'hotline_#25724_rss_broken_link' into 'stable' · a7671f21
  Patrick Barroca authored 9 years ago
```
Hotline #25724 rss broken link

See merge request !911
```
  a7671f21
- dev #17871 oaista la vista · 2e6f655e
  Alex Arnaud authored 9 years ago
```
RT comments
```
  2e6f655e
- dev #17871 oaista la vista · 284c1544
  Alex Arnaud authored 9 years ago
```
fix tests

add VERSIONS
```
  284c1544
- hotline #25433 : add version file · 3b579316
  efalcy authored 9 years ago
  
  3b579316
- hotline #25724 : add version file · 2b813aae
  efalcy authored 9 years ago
  
  2b813aae
- hotline #25724: forward viewselection on Rss link · 1e297f02
  efalcy authored 9 years ago
  
  1e297f02
- dev #17871 oaista la vista · db5c32a7
  Alex Arnaud authored 9 years ago
```
Display external URL in availability column in items table
```
  db5c32a7
- dev #17871 oaista la vista · 1f9239ed
  Alex Arnaud authored 9 years ago
```
Add external URLs in items
```
  1f9239ed

Admin message