Commits · 9e68244384a20bd30dcaa36d57368690f7205ef4 · afi / opacce

Jun 18, 2015
- dev #24867 : display pnb button if user is not logged and add authentication popup to login · 9e682443
  efalcy authored 9 years ago
  
  9e682443
- #24867 : remove give back button for PNB loans · 8fae930e
  efalcy authored 9 years ago
  
  8fae930e
Jun 17, 2015
- Merge remote-tracking branch 'refs/remotes/afi/dev#25987_maj_po_et_traduction_en' into afi-master · 934e0730
  Patrick Barroca authored 9 years ago
  
  934e0730
Jun 11, 2015
- Merge branch 'hotline-master' · b16effc1
  Laurent authored 9 years ago
  
  b16effc1
- Version 7.1.39 · f073ca09
  Laurent authored 9 years ago
```
Merge branch 'stable' into hotline-master
```
  7.1.39
  
  f073ca09
- Version 7.0.23 · 84b4d62d
  Laurent authored 9 years ago
  
  7.0.23
  
  84b4d62d
- Merge branch 'hotline#25853' into 'stable' · dcf5ad33
  Laurent authored 9 years ago
```
Hotline#25853

See merge request !932
```
  dcf5ad33
- Merge branch 'hotline#24365-bad-encoded-degree' into 'hotline-master' · 20ffb353
  Laurent authored 9 years ago
```
Hotline#24365 bad encoded degree

See merge request !929
```
  20ffb353
- hotline #25853 handle microbib soap fault · acf37da3
  Laurent authored 9 years ago
  
  acf37da3
Jun 10, 2015
- Merge branch 'hotline#26089-fix-broken-transfert-date' into 'hotline-master' · 299713a2
  Patrick Barroca authored 9 years ago
```
Hotline#26089 fix broken transfert date

See merge request !930
```
  299713a2
- rel #26089 : fix broken transfert date · 178919ef
  Patrick Barroca authored 9 years ago
  
  178919ef
- rel #24365 : fix bad encoded degree in utf8 · 5b4f4db2
  Patrick Barroca authored 9 years ago
  
  5b4f4db2
- Merge branch 'hotline#24562_localization_popup' into 'hotline-master' · d81c3918
  Patrick Barroca authored 9 years ago
```
Hotline#24562 localization popup

See merge request !928
```
  d81c3918
Jun 09, 2015
- Some new translation strings · c508511e
  Claire Hernandez authored 9 years ago
  
  c508511e
- hotline #24562 fix item localization map · 78928a5f
  Laurent authored 9 years ago
  
  78928a5f
- Translation scripts permissions and new po generated · cb540bd6
  Claire Hernandez authored 9 years ago
  
  cb540bd6
- 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

Admin message