Commits · eaba2aa53fb8885ad695f40c14a1765f892b571a · afi / opacce

Jun 10, 2014
- dev #14278 : add script to update cosmogramme from server : refactoring in progress (! broken) · eaba2aa5
  efalcy authored 10 years ago
  
  eaba2aa5
- dev #14278 : add script to update cosmogramme from server · 449a353f
  efalcy authored 10 years ago
  
  449a353f
- Merge branch 'dev#14199_bots_killer' into 'master' · da92f27f
  Laurent authored 10 years ago
```
Dev#14199 Bots Killer
```
  da92f27f
Jun 06, 2014
- rel #13060 : update VERSIONS · 66db0966
  Patrick Barroca authored 10 years ago
  
  66db0966
- Merge branch 'afi-dev#13060_amelioration_formulaire_inscription' into afi-master · e08372ca
  Patrick Barroca authored 10 years ago
```
Conflicts:
	application/modules/opac/controllers/AuthController.php
	tests/library/Class/ProfilTest.php
```
  e08372ca
- rel #13582 : update VERSION · cdb5626a
  Patrick Barroca authored 10 years ago
  
  cdb5626a
- Merge branch 'dev#13582_change_profil_deco' into 'master' · 7786bfe7
  Patrick Barroca authored 10 years ago
```
Dev#13582 Change Profil Deco
```
  7786bfe7
Jun 05, 2014
- dev #14199 exclude bot SISTRIX and VoilaBot · 95cba53b
  Laurent authored 10 years ago
  
  95cba53b
Jun 04, 2014
- Merge branch 'afi-master' into afi-dev#13582_change_profil_deco · 69b15520
  Patrick Barroca authored 10 years ago
  
  69b15520
- rel #13582 : getting and setting banner box configuration of a profil is forwarded to its parent · 76f7fe5d
  Patrick Barroca authored 10 years ago
  
  76f7fe5d
- 6.45.beta · 6bdd2616
  gloas authored 10 years ago
  
  6bdd2616
- Merge branch 'dev#13931-add-end-date-to-users-export' into 'master' · 493f2ace
  Patrick Barroca authored 10 years ago
```
Dev#13931 Add End Date To Users Export
```
  493f2ace
- Merge branch 'afi-master' into afi-dev#13060_amelioration_formulaire_inscription · a7cf1443
  Patrick Barroca authored 10 years ago
  
  a7cf1443
- Merge remote-tracking branch 'origin/hotline_6.44' · 41dd2a9f
  gloas authored 10 years ago
```
Conflicts:
	VERSIONS
	library/startup.php

* VERSIONS:
```
  41dd2a9f
- hotline 6.44.7 · e7d8e10f
  gloas authored 10 years ago
  
  6.44.7
  
  e7d8e10f
- Merge branch 'hotline_#14019_export_unimarc' into 'hotline_6.44' · 831ba30f
  Ghislain Loas authored 10 years ago
```
Hotline #14019 Export Unimarc
```
  831ba30f
- hotline 14019 fix export unimarc · bfdf065b
  gloas authored 10 years ago
  
  bfdf065b
- Merge branch 'afi-master' into afi-dev#13060_amelioration_formulaire_inscription · d20c7c3f
  Patrick Barroca authored 10 years ago
  
  d20c7c3f
Jun 03, 2014
- Merge branch 'hotline_#14019_export_unimarc' into 'master' · a69cb984
  Ghislain Loas authored 10 years ago
```
Hotline #14019 Export Unimarc
```
  a69cb984
- adding missing ?> at the end of file · 3cf69140
  Ghislain Loas authored 10 years ago
  
  3cf69140
- Merge branch 'hotline_#14019_export_unimarc' into 'master' · 652f8b98
  Ghislain Loas authored 10 years ago
```
Hotline #14019 Export Unimarc
```
  652f8b98
- hotline 6.44.6 · d07f8d3b
  Ghislain Loas authored 10 years ago
  
  6.44.6
  
  d07f8d3b
- Merge branch 'hotline_#14019_export_unimarc' into 'hotline_6.44' · b54bc1ef
  Ghislain Loas authored 10 years ago
```
Hotline #14019 Export Unimarc
```
  b54bc1ef
- hotline 14019 fix test failures + remove xdebug · 29d6707a
  Ghislain Loas authored 10 years ago
  
  29d6707a
- hotline 14019 fix export unimarc · 10604e3e
  Ghislain Loas authored 10 years ago
  
  10604e3e
- dev #13060 page preferences in profil portal are the default values for other profil · d9d8b119
  Alex Arnaud authored 10 years ago
  
  d9d8b119
- dev #13060 send registration mail to admin + format message · 524c2b88
  Alex Arnaud authored 10 years ago
  
  524c2b88
- dev #13060 add post registration message configuration · cf10855f
  Alex Arnaud authored 10 years ago
  
  cf10855f
- Merge tag 'refs/tags/6.44.5' · 1fff8999
  Ghislain Loas authored 10 years ago
```
Conflicts:
	VERSIONS
	library/startup.php
```
  1fff8999
- hotline 6.44.5 · 4f79936f
  Ghislain Loas authored 10 years ago
  
  6.44.5
  
  4f79936f
- Merge branch 'hotline#13776_close_ws_aloes_session' into 'hotline_6.44' · 0aec9230
  efalcy authored 10 years ago
```
Hotline#13776 Close Ws Aloes Session
```
  0aec9230
- hotline#13776 : close session with value 'INTERNET' · 59a954e6
  efalcy authored 10 years ago
  
  59a954e6
- V6.45.alpha · 623e4952
  Laurent authored 10 years ago
  
  623e4952
- dev #13041 documentation in release note · 1f995a4b
  Laurent authored 10 years ago
  
  1f995a4b
- Merge branch 'hotline_6.44.5' into 'hotline_6.44' · 2e427a98
  Ghislain Loas authored 10 years ago
```
Hotline 6.44.5

fix unimarc loans export
```
  2e427a98
- Merge branch 'origin-RF13041' · 349ed124
  Laurent authored 10 years ago
  
  349ed124
- Merge branch 'master' of git.afi-sa.fr:afi/opacce · c4a93f33
  Laurent authored 10 years ago
  
  c4a93f33
- hotline #14019 fix test failures · 9002212f
  Ghislain Loas authored 10 years ago
  
  9002212f
- Merge remote-tracking branch 'refs/remotes/origin/RF13041' · a1d292d9
  Laurent authored 10 years ago
  
  a1d292d9
Jun 02, 2014

dev #13060 · ba11196c

Alex Arnaud authored 10 years ago

fix send activation key for user registration + better tests

ba11196c

Admin message