Commits · a6a05db099a16271406b6bb43d02470ad67666d9 · afi / opacce

Jun 16, 2014

Merge remote-tracking branch 'refs/remotes/origin/master' into... · a6a05db0

Laurent authored 10 years ago

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev_#13657_newsletter_pagination_batch_mail

Conflicts:
	library/startup.php

a6a05db0

Jun 13, 2014
- Reactivate cosmozend application and add direct download link in integrations log screen · f2461e6b
  Patrick Barroca authored 10 years ago
  
  f2461e6b
- Merge remote-tracking branch 'refs/remotes/origin/hotline_6.45' · 631768d6
  Laurent authored 10 years ago
  
  631768d6
- fix git.afi-sa.fr broken link · c29fda38
  Laurent authored 10 years ago
  
  c29fda38
Jun 12, 2014
- 6.45.2 · 3d7e7df0
  Patrick Barroca authored 10 years ago
  
  6.45.2
  
  3d7e7df0
- Fix type · 8191edbe
  Laurent authored 10 years ago
  
  8191edbe
- Add main title · 0649e924
  Laurent authored 10 years ago
  
  0649e924
- Fix rendering with gitlab engine · a78477d9
  Laurent authored 10 years ago
  
  a78477d9
- Merge branch 'hotline#14209-cosmograme-does-not-import-koha-magazines' into 'hotline_6.45' · 9ed0c17c
  Patrick Barroca authored 10 years ago
```
Hotline#14209 Cosmograme Does Not Import Koha Magazines
```
  9ed0c17c
- CONTRIB.fr fix merge · efd2f560
  Laurent authored 10 years ago
  
  efd2f560
- More contrib doc · ebffdf30
  Laurent authored 10 years ago
  
  ebffdf30
- fix #14209 : fix regression in tome detection · 8d13bb50
  Patrick Barroca authored 10 years ago
  
  8d13bb50
- More contrib doc · f7dc0c08
  Laurent authored 10 years ago
  
  f7dc0c08
- Add fr contribution doc · 1732c852
  Laurent authored 10 years ago
  
  1732c852
Jun 11, 2014
- fix #14209 : fix regression in koha magazines items detection · 70ad7aae
  Patrick Barroca authored 10 years ago
  
  70ad7aae
- Merge branch 'master' into origin-dev_#13657_newsletter_pagination_batch_mail · 7b834ea9
  gloas authored 10 years ago
```
Conflicts:
	cosmogramme/php/_init.php
	library/Class/SessionFormation.php
	library/startup.php
	tests/application/modules/admin/controllers/FormationControllerTest.php
```
  7b834ea9
- dev #13657 fix test failire and sql dependents · 3a4e3594
  gloas authored 10 years ago
  
  3a4e3594
- dev #13657 fix test fixture for mocking UserGroupCategorie::topCategories · b796e2d9
  gloas authored 10 years ago
  
  b796e2d9
- Merge branch 'RF13906_Fix_items_locations' into 'hotline_6.45' · 0d3f2ebe
  Patrick Barroca authored 10 years ago
```
Rf13906 Fix Items Locations
```
  0d3f2ebe
- fix #13906 : No longer apply first found item location to all record items · 468d10c6
  Patrick Barroca authored 10 years ago
  
  468d10c6
Jun 10, 2014
- Merge branch 'hotline_#14170' into 'hotline_6.45' · 47293b67
  Patrick Barroca authored 10 years ago
```
Hotline #14170
```
  47293b67
- Merge branch 'hotline_6.45' into 'master' · b5a50cc3
  Patrick Barroca authored 10 years ago
```
Hotline 6.45
```
  b5a50cc3
- 6.45.1 · 31b548ce
  Patrick Barroca authored 10 years ago
  
  6.45.1
  
  31b548ce
- fix regression in 6.45 default module preferences loading · f109b1a3
  Patrick Barroca authored 10 years ago
  
  f109b1a3
- rel #13906 : code formatting · 92d98a89
  Patrick Barroca authored 10 years ago
  
  92d98a89
- hotline # 14170 fix use of a local variable not needed · 6eb190a8
  gloas authored 10 years ago
  
  6eb190a8
- hotline # 14170 adding delete button on your own rating comments as · 4d63126c
  gloas authored 10 years ago
```
admin in front
```
  4d63126c
- Merge branch 'dev#1278_autoupdate_cosmogramme_script' into 'master' · 578c507a
  Laurent authored 10 years ago
```
Dev#1278 Autoupdate Cosmogramme Script
```
  6.45
  
  578c507a
- dev #14278 : add script to update cosmogramme from server · 449a353f
  efalcy authored 10 years ago
  
  449a353f
- Update VERSIONS 6.45 · 6b32a016
  Laurent authored 10 years ago
  
  6b32a016
- When testing, catptcha behavior is switched to production one on tearDown · 2102d9cb
  Laurent authored 10 years ago
  
  2102d9cb
- rel #13906 : add forgotten unimarc fixture · 1c542267
  Laurent authored 10 years ago
  
  1c542267
- Merge branch 'hotline#12422_cas_ticket_format' · 3acc0828
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
	application/modules/opac/controllers/AuthController.php
```
  3acc0828
- Merge branch 'origin-hotline#13776_close_ws_aloes_session' · 2bc67813
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
```
  2bc67813
- Add infos to check for failing test on gitlab · 86993984
  Laurent authored 10 years ago
  
  86993984
- dev #13906: Fix items location · 7d4efed8
  Laurent authored 10 years ago
```
 - Add tests
```
  7d4efed8
- hotline #13776 add tests for Opsys/Aloes disconnect · 255f2798
  Laurent authored 10 years ago
  
  255f2798
- 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

Admin message