Master (!310) · Merge requests · afi / opacce

Merged Master

master into speed_trap_on_test

Merged Ghislain Loas requested to merge master into speed_trap_on_test 10 years ago

Jul 24, 2014
- Merge branch 'hotline_6.48' into 'master' · 9e6d9b62
  Patrick Barroca authored 10 years ago
```
Hotline 6.48

See merge request !307
```
  9e6d9b62
- 6.48.1 · 5601916b
  Patrick Barroca authored 10 years ago
  
  5601916b
Jul 23, 2014
- Merge branch... · b6624463
  Laurent authored 10 years ago
```
Merge branch 'hotline_#14920_return_complete_url_when_selecting_item_from_core_five_filemanager' into 'hotline_6.48'

Hotline #14920 return complete url when selecting item from core five filemanager

See merge request !304
```
  b6624463
- upgrade version file · f079c0a1
  Ghislain Loas authored 10 years ago
  
  f079c0a1
- hotline_#14920_url of image switch to absolute when render for RSS (using class CmsUrlTransformer · 81ee02a3
  Ghislain Loas authored 10 years ago
  
  81ee02a3
- Merge branch 'dev#15293_cas_cyberlibris' into 'hotline_6.48' · 7302d2cd
  Laurent authored 10 years ago
```
Dev#15293 cas cyberlibris

See merge request !306
```
  7302d2cd
- dev #15293 add data to cas server 1.0 validate · aeb29778
  Laurent authored 10 years ago
  
  aeb29778
- hotline #14920 fix relative url of image in article to full url · 97543eac
  Ghislain Loas authored 10 years ago
  
  97543eac
Jul 22, 2014
- Merge branch 'hotline#14919_album_annee_edition' into 'hotline_6.48' · b1a0c0c2
  Laurent authored 10 years ago
```
Hotline#14919 Album Annee Edition
```
  b1a0c0c2
- Update VERSIONS · c09a077e
  Laurent authored 10 years ago
  
  c09a077e
Jul 21, 2014
- hotline #14919 edition year · 51caf12a
  Laurent authored 10 years ago
```
edition year should only be the one set in album data, not update date
```
  51caf12a
- Update VERSIONS · 969eb62e
  Laurent authored 10 years ago
  
  969eb62e
- Merge branch 'hotline_6.47' · 756799df
  Ghislain Loas authored 10 years ago
```
Conflicts:
	VERSIONS
```
  756799df
- 6.48.0 · 9883e619
  Laurent authored 10 years ago
  
  9883e619
- Merge branch 'demo_wip_valence' into 'master' · 935575d3
  Ghislain Loas authored 10 years ago
```
Demo Wip Valence
```
  935575d3
Jul 18, 2014
- Merge branch 'dev#14569-cas-1-cyberlibris' · 69fb76a5
  Laurent authored 10 years ago
  
  69fb76a5
- forgotten files · 9e788ab5
  Laurent authored 10 years ago
  
  9e788ab5
- dev #12521 #14569 · e45c321e
  Laurent authored 10 years ago
```
Fix CAS 1.0 compatibility
```
  e45c321e
Jul 17, 2014
- rel #14869 : update VERSIONS · 7788cbf3
  Patrick Barroca authored 10 years ago
  
  7788cbf3
- Merge branch 'hotline#14869-location-rule-forbid-value-equals-zero' into 'hotline_6.47' · 607e86ad
  Patrick Barroca authored 10 years ago
```
Hotline#14869 Location Rule Forbid Value Equals Zero
```
  607e86ad
- rel #14869 : unimarc reader accepts fields with '0' value, reading emplacement... · 4a4d88d1
  Patrick Barroca authored 10 years ago
```
rel #14869 : unimarc reader accepts fields with '0' value, reading emplacement with rule 995$6=0 under test
```
  4a4d88d1
- Merge branch 'dev_#15141_merge_agenda_from_bron_to_opac' into demo_wip_valence · fd37efe2
  Ghislain Loas authored 10 years ago
```
Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
```
  fd37efe2
Jul 16, 2014
- rel #14869 : location screen under tests, cosmozend tests bootstrap fixed · b95f14f1
  Patrick Barroca authored 10 years ago
  
  b95f14f1
- Merge branch 'dev_#15141_merge_agenda_from_bron_to_opac' into 'demo_wip_valence' · c960c6e2
  Ghislain Loas authored 10 years ago
```
Dev #15141 Merge Agenda From Bron To Opac
```
  c960c6e2
- Merge branch 'master' into 'demo_wip_valence' · 2456d9d4
  Ghislain Loas authored 10 years ago
```
Master
```
  2456d9d4
- Merge branch 'dev_#15141_merge_agenda_from_bron_to_opac' into demo_wip_valence · ae8b5be3
  Ghislain Loas authored 10 years ago
```
Conflicts:
	tests/application/modules/opac/controllers/ProfilOptionsControllerTest.php
```
  ae8b5be3
Jul 15, 2014
- rel #14869 : cosmogramme location screen ported in cosmozend · 26544d7c
  Patrick Barroca authored 10 years ago
  
  26544d7c
Jul 11, 2014
- Merge branch 'dev_#15091_upgrade_menu_vertical_dom_html' into 'demo_wip_valence' · e306e5dd
  Ghislain Loas authored 10 years ago
```
Dev #15091 Upgrade Menu Vertical Dom Html
```
  e306e5dd
- dev #15091 fix label for parameter · 2b1bb94f
  Ghislain Loas authored 10 years ago
  
  2b1bb94f
Jul 10, 2014
- Merge branch 'demo_wip_valence' into 'dev_#15091_upgrade_menu_vertical_dom_html' · b997ec47
  Ghislain Loas authored 10 years ago
```
Dev #15091 Upgrade Menu Vertical Dom Html
```
  b997ec47
- dev #15091 upgrade menu vertical html with parameter · ae1d57e0
  Ghislain Loas authored 10 years ago
  
  ae1d57e0
- Merge branch 'dev_#14883_multiple_fix_for_valence' into 'demo_wip_valence' · 6c111ed0
  Ghislain Loas authored 10 years ago
```
Dev #14883 Multiple Fix For Valence
```
  6c111ed0
Jul 08, 2014
- Merge branch 'dev_#14882_last_and_first_name' into 'demo_wip_valence' · c83f080d
  Ghislain Loas authored 10 years ago
```
Demo Wip Valence
```
  c83f080d
- Merge branch 'dex_#14979_add_to_cart_in_search_result_list' into 'demo_wip_valence' · 1250bb25
  Ghislain Loas authored 10 years ago
```
Dex #14979 Add To Cart In Search Result List
```
  1250bb25
- Merge branch 'dex_#14979_add_to_cart_in_search_result_list' into 'demo_wip_valence' · 6ab2bae3
  Ghislain Loas authored 10 years ago
```
Dex #14979 Add To Cart In Search Result List
```
  6ab2bae3
- Merge branch 'dev_#14893_Arina_go_to_profil_1' into 'demo_wip_valence' · ee701566
  Ghislain Loas authored 10 years ago
```
Dev #14893 Arina Go To Profil 1
```
  ee701566
- Merge branch 'dev_#14883_multiple_fix_for_valence' into 'demo_wip_valence' · 114d1a99
  Ghislain Loas authored 10 years ago
```
Demo Wip Valence
```
  114d1a99

Admin message

Master

Merge request reports

Activity