Commits · 7ba45fe36e397df7724bae291862cdae30885ca9 · afi / opacce

Jul 30, 2014
- 6.48.2 · 7ba45fe3
  Patrick Barroca authored 10 years ago
  
  6.48.2
  
  7ba45fe3
Jul 29, 2014
- Merge branch 'hotline#15192_fix_record_links_in_loans_and_holds_page' into 'hotline_6.48' · dae12fe1
  Patrick Barroca authored 10 years ago
```
Hotline#15192 fix record links in loans and holds page

See merge request !315
```
  dae12fe1
- rel #15192: fix syntax error and code format · 36915846
  Patrick Barroca authored 10 years ago
  
  36915846
- hotline#15192 - Fix record links in holds and loans pages. · ea98f186
  Alex Arnaud authored 10 years ago
  
  ea98f186
Jul 28, 2014
- rel #13648 : update VERSIONS · c435a58b
  Patrick Barroca authored 10 years ago
  
  c435a58b
- Merge branch 'hotline#13648-330_field_truncated' into 'hotline_6.48' · 8f65c110
  Patrick Barroca authored 10 years ago
```
Hotline#13648 330 field truncated

See merge request !314
```
  8f65c110
- hotline#13648 - Add special character handling for quotes and double · 4a869626
  Alex Arnaud authored 10 years ago
```
quotes.
```
  4a869626
Jul 24, 2014
- Merge branch 'hotline#14175_lastfm' into 'hotline_6.48' · 87f4b4bb
  Patrick Barroca authored 10 years ago
```
Hotline#14175 lastfm

See merge request !309
```
  87f4b4bb
- hotline#14175 - Use title to match album if nothing has been found in LastFm. · 2e313135
  Alex Arnaud authored 10 years ago
  
  2e313135
- Hotline#14175 - Update VERSION file. · cb56eaa7
  Alex Arnaud authored 10 years ago
  
  cb56eaa7
- Hotline#14175 - Improve artist name matching in lastfm photos searches. · ca3038e9
  Alex Arnaud authored 10 years ago
  
  ca3038e9
- 6.48.1 · 5601916b
  Patrick Barroca authored 10 years ago
  
  6.48.1
  
  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
- Merge branch 'hotline_6.47' · 756799df
  Ghislain Loas authored 10 years ago
```
Conflicts:
	VERSIONS
```
  6.48.0
  
  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
- Merge remote-tracking branch 'origin/dev/13872-orphee-allow-hold-available-items' · ca0c1731
  Alex Arnaud authored 10 years ago
  
  ca0c1731
- forgotten files · 9e788ab5
  Laurent authored 10 years ago
  
  9e788ab5
- Merge branch 'dev#13881-lekiosk' into 'master' · ce8c2edc
  Meusburger authored 10 years ago
```
Dev#13881 Lekiosk
```
  ce8c2edc
- Merge branch 'RF15122_champ_pseudo' into 'master' · 0cf1cfec
  Meusburger authored 10 years ago
```
Rf15122 Champ Pseudo
```
  0cf1cfec
- Fix failing test on gitlab · 99a98352
  Laurent authored 10 years ago
  
  99a98352
- dev #12521 #14569 · e45c321e
  Laurent authored 10 years ago
```
Fix CAS 1.0 compatibility
```
  e45c321e
Jul 17, 2014
- Merge remote-tracking branch 'origin/dev#12521_cyberlibris' · 3a2f1e75
  Matthias Meusburger authored 10 years ago
```
Conflicts:
	application/modules/admin/controllers/UsergroupController.php
	library/Class/AdminVar.php
	library/Class/UserGroup.php
	tests/application/modules/admin/controllers/UserGroupControllerTest.php
```
  3a2f1e75
- dev#15122: Sanitize output for user's pseudo, name and surname in authentication box. · e8305daa
  Matthias Meusburger authored 10 years ago
```
 - Use builtin escape function instead of htmlspecialchars
```
  e8305daa
- rel #14869 : update VERSIONS · 7788cbf3
  Patrick Barroca authored 10 years ago
  
  7788cbf3
- dev #12521 : update type list if id exists · 1e99cca2
  efalcy authored 10 years ago
  
  1e99cca2
- 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
- dev#15122: Sanitize output for user's pseudo, name and surname in authentication box. · c89e41e1
  Matthias Meusburger authored 10 years ago
  
  c89e41e1
- 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 'master' · 1971adba
  Ghislain Loas authored 10 years ago
```
Dev #15141 Merge Agenda From Bron To Opac
```
  1971adba
- Merge branch 'dev_#14883_multiple_fix_for_valence' into 'master' · 99e29341
  Ghislain Loas authored 10 years ago
```
Dev #14883 Multiple Fix For Valence
```
  99e29341

Admin message