Commits · f0ce202879d0700947a6f5b0388f3c7bfa5433af · afi / opacce

Apr 25, 2014
- Merge remote-tracking branch 'origin/RF13038' · f0ce2028
  Julian Maurice authored 10 years ago
```
Conflicts:
	tests/application/modules/admin/controllers/ModoControllerTest.php
```
  f0ce2028
- Merge branch 'ft/R13039' into 'master' · 9f586677
  Meusburger authored 10 years ago
```
Ft/R13039
```
  9f586677
- Merge remote-tracking branch 'origin/ft/RF12880' · 73f4b0fe
  Julian Maurice authored 10 years ago
  
  73f4b0fe
- Merge remote-tracking branch 'origin/ft/RF12808' · e07e5742
  Julian Maurice authored 10 years ago
  
  e07e5742
Apr 24, 2014
- Merge branch 'hotline_6.41' into 'master' · 29ebee2f
  Patrick Barroca authored 10 years ago
```
Hotline 6.41
```
  29ebee2f
- v6.41.2 · 8dc674ec
  Ghislain Loas authored 10 years ago
  
  6.41.2
  
  8dc674ec
- Merge branch 'hotline#13248-auth-with-blowfish-password' into 'hotline_6.41' · 9c65f3d1
  Patrick Barroca authored 10 years ago
```
Hotline#13248 Auth With Blowfish Password
```
  9c65f3d1
- rel #13248 : fix test failure · 82e45837
  Ghislain Loas authored 10 years ago
  
  82e45837
- rel #13248 : Adding try harder authentication and blowfish password format · 2c213466
  Ghislain Loas authored 10 years ago
  
  2c213466
- hotline #13248 adding findBlowfish in UsersLoader · 75484d65
  Ghislain Loas authored 10 years ago
  
  75484d65
- RF#13039: Add logout button to user profile. · 8e69a208
  Matthias Meusburger authored 10 years ago
```
 - Change icon
```
  8e69a208
Apr 23, 2014
- Merge branch 'hotline/13164' into 'hotline_6.41' · 2958426c
  Patrick Barroca authored 10 years ago
```
Hotline/13164
```
  2958426c
- hotline #13164 ckEditor: Allow style attribute on all elements · d6e3401e
  Julian Maurice authored 10 years ago
  
  d6e3401e
- Merge branch 'hotline/13167' into 'hotline_6.41' · a750a688
  Julian Maurice authored 10 years ago
```
Hotline/13167
```
  a750a688
- hotline #13167 Add copyright notice in new test file · d843c6c0
  Julian Maurice authored 10 years ago
  
  d843c6c0
- hotline #13167 OPDS: Do not consider <link> with rel="start" · 0ef3b0c4
  Julian Maurice authored 10 years ago
```
Atramenta OPDS catalogue entries have two links. The one with
rel="start" links to the root element so we have to ignore it.
```
  0ef3b0c4
- hotline #13167 Add tests for Class_WebService_OPDS_CatalogReader · a3446d92
  Julian Maurice authored 10 years ago
  
  a3446d92
- Merge branch 'ft/R13039' into 'master' · c78647ad
  efalcy authored 10 years ago
```
Ft/R13039
```
  c78647ad
Apr 22, 2014
- rel #13106 : Added common trait to users comments on records and articles · 47a785ae
  Patrick Barroca authored 10 years ago
```
ZendAfi_View_Helper_Avis can now accept cms comments and is used in backoffice view
```
  47a785ae
- Adding reset update date on authors and maters codifications in case we want... · 8b197233
  jgaimard authored 10 years ago
```
Adding reset update date on authors and maters codifications in case we want to fully reindex cross-references
```
  8b197233
- RF#13039: Add logout button to user profile. · b03a4ef7
  Matthias Meusburger authored 10 years ago
  
  b03a4ef7
- rel #13106 : Create and use Class_Notice::findByUrl in LocalRecordUrl validator and Class_FRBR_Link · 45b0bebc
  Patrick Barroca authored 10 years ago
  
  45b0bebc
- Version 6.41.1 · bdc5fa05
  Julian Maurice authored 10 years ago
  
  6.41.1
  
  bdc5fa05
- Merge branch 'hotline#13126_emplacements_exemplaires' into 'hotline_6.41' · 3b7fb95c
  Julian Maurice authored 10 years ago
```
Hotline#13126 Emplacements Exemplaires
```
  3b7fb95c
- hotline#13126 · 21b42902
  Laurent authored 10 years ago and Julian Maurice committed 10 years ago
```
mise à jour VERSIONS
```
  21b42902
- Fix location recognition rules when reading from unimarc · ecfeb0b7
  Laurent authored 10 years ago and Julian Maurice committed 10 years ago
  
  ecfeb0b7
Apr 19, 2014
- Merge branch 'hotline_6.41' into 'master' · 7129e00c
  Laurent authored 10 years ago
```
Hotline 6.41
```
  7129e00c
- Merge branch 'hotline#12742_affichage_reservations' into 'hotline_6.41' · 77122aea
  Laurent authored 10 years ago
```
Hotline#12742 Affichage Reservations
```
  77122aea
- hotline #12742 · f7909d1d
  Laurent authored 10 years ago
```
SIGB Pergame: affichage de la bibliothèque dans la liste des réservations
```
  f7909d1d
- Merge branch 'hotline#13072_newsletter_affichage_abonnes' into 'hotline_6.41' · 1908b576
  Laurent authored 10 years ago
```
Hotline#13072 Newsletter Affichage Abonnes
```
  1908b576
- hotline #13072 · 90c970f0
  Laurent authored 10 years ago
```
Correction de l'affichage de la liste des abonnés à une lettre d'information lorsque les nom, prenom, identifiant, mail sont trés longs
```
  90c970f0
- fix notifications #13038 · 847459f6
  Laurent authored 10 years ago
```
Now multiple notifications are concateneted in one string.
Add notifications test
```
  847459f6
- Merge remote-tracking branch 'refs/remotes/origin/RF13038-front' into origin-RF13038 · 72d6141d
  Laurent authored 10 years ago
  
  72d6141d
- Merge branch 'hotline_6.41' into 'master' · 149e361b
  Laurent authored 10 years ago
```
Hotline 6.41
```
  149e361b
- Merge branch 'origin-hotline#13113_show_expired_subscription_in_login_widget' into 'hotline_6.41' · 632704e3
  Laurent authored 10 years ago
```
Origin Hotline#13113 Show Expired Subscription In Login Widget
```
  632704e3
- Merge branch 'hotline_6.41' into 'master' · 1ee82768
  Laurent authored 10 years ago
```
Hotline 6.41
```
  1ee82768
- Merge branch 'hotline#13140-fix-user-key-reattach-to-comments' into 'hotline_6.41' · 7b07e146
  Laurent authored 10 years ago
```
Hotline#13140 Fix User Key Reattach To Comments
```
  7b07e146
- MAJ VERSIONS · 86a0582e
  Laurent authored 10 years ago
  
  86a0582e
- Merge branch 'origin-hotline_6.41' into origin-hotline#13140-fix-user-key-reattach-to-comments · b1c9c809
  Laurent authored 10 years ago
  
  b1c9c809
- Merge branch 'origin-hotline_6.41' into origin-hotline#13140-fix-user-key-reattach-to-comments · ff6a9c16
  Laurent authored 10 years ago
  
  ff6a9c16

Admin message