Dev/15524 (!344) · Merge requests · afi / opacce

Merged Dev/15524

dev/15524 into WIP

Merged Laurent requested to merge dev/15524 into WIP 10 years ago

Aug 26, 2014
- Merge branch 'origin-master' into origin-dev-15524 · 0b87eccf
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_notice_integration.php
	cosmogramme/php/classes/classe_unimarc.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
```
  0b87eccf
- Merge branch 'master' into origin-dev-15524 · d0db1db7
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
	cosmogramme/php/classes/classe_unimarc.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
```
  d0db1db7
- dev #15524 Update VERSIONS · 6cafcbb8
  Laurent authored 10 years ago
  
  6cafcbb8
- Merge branch 'dev#14279_integrations_exemplaires' into 'master' · c8bd3fa8
  Laurent authored 10 years ago
```
Dev#14279 integrations exemplaires

See merge request !343
```
  c8bd3fa8
- Merge remote-tracking branch 'refs/remotes/origin/master' into dev#14279_integrations_exemplaires · 001dc165
  Laurent authored 10 years ago
```
Conflicts:
	VERSIONS
```
  001dc165
Aug 23, 2014
- dev #15524 Koha: serial number complement put in 461$o so bokeh will be · f9af11c9
  Laurent authored 10 years ago
```
able to show it as a subtitle
```
  f9af11c9
Aug 22, 2014
- Merge branch 'hotline_6.50' into 'master' · 959d9f6b
  Laurent authored 10 years ago
```
Hotline 6.50

See merge request !339
```
  959d9f6b
- Update VERSIONS for 6.50.1 · 3ff19ff2
  Laurent authored 10 years ago
  
  3ff19ff2
- hotline #15519 add Cyberlibris helper · 2f843839
  Laurent authored 10 years ago
  
  2f843839
- hotline #15519 add Cyberlibris ID for SSO · 172f429f
  Laurent authored 10 years ago
  
  172f429f
- Update VERSIONS · 05c31eb7
  Laurent authored 10 years ago
  
  05c31eb7
Aug 13, 2014
- dev #15524 forgot fixture · 39809fee
  Laurent authored 10 years ago
  
  39809fee
- dev #15524 fix crash when type doc not recognized · 1458e976
  Laurent authored 10 years ago
  
  1458e976
Aug 12, 2014
- Revert "dev #15524 move methods from class to loader in Class_Catalogue" · ed0c4785
  Ghislain Loas authored 10 years ago
```
This reverts commit f3f88ae5.
```
  ed0c4785
- dev #15524 move methods from class to loader in Class_Catalogue · f3f88ae5
  Ghislain Loas authored 10 years ago
  
  f3f88ae5
Aug 08, 2014
- dev #15524 Use the entire value of 995$v for Koha serials integration · 9e3f735a
  Julian Maurice authored 10 years ago
  
  9e3f735a

Admin message

Dev/15524

Merge request reports

Activity