]> git.koha-community.org Git - koha.git/commit
Revert "Merge branch 'bug_7688' into 3.12-master"
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 04:36:37 +0000 (00:36 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 04:36:37 +0000 (00:36 -0400)
commitb9db6ae0f75b68b0788fd079589f30620fc0ff63
tree388172813b238fdb750ee6026434d8da79a9e044
parent8a97ab05a8923f81d88f209a74aa88b9d466dca8
Revert "Merge branch 'bug_7688' into 3.12-master"

This reverts commit 60508cb03d825f515461c1898361ac0eb3cffb2b, reversing
changes made to 8579d07f1474a2393e518b66e9aa6c3464ab2e81.

The patches for bug 7688 caused a failure in t/db_dependent/Serials.t:
not ok 8 - test getting history from sub-scription

Conflicts:

installer/data/mysql/kohastructure.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
60 files changed:
C4/Serials.pm
C4/Serials/Frequency.pm [deleted file]
C4/Serials/Numberpattern.pm [deleted file]
installer/data/mysql/de-DE/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/de-DE/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/de-DE/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/de-DE/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/en/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/en/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/en/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/en/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/es-ES/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/es-ES/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/es-ES/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/es-ES/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.sql [deleted file]
installer/data/mysql/fr-FR/2-Optionel/sample_frequencies.txt [deleted file]
installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.sql [deleted file]
installer/data/mysql/fr-FR/2-Optionel/sample_numberpatterns.txt [deleted file]
installer/data/mysql/it-IT/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/it-IT/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/it-IT/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/it-IT/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/kohastructure.sql
installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.sql [deleted file]
installer/data/mysql/nb-NO/2-Valgfritt/sample_frequencies.txt [deleted file]
installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.sql [deleted file]
installer/data/mysql/nb-NO/2-Valgfritt/sample_numberpatterns.txt [deleted file]
installer/data/mysql/pl-PL/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/pl-PL/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/pl-PL/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/pl-PL/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/ru-RU/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/ru-RU/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/ru-RU/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/ru-RU/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/uk-UA/optional/sample_frequencies.sql [deleted file]
installer/data/mysql/uk-UA/optional/sample_frequencies.txt [deleted file]
installer/data/mysql/uk-UA/optional/sample_numberpatterns.sql [deleted file]
installer/data/mysql/uk-UA/optional/sample_numberpatterns.txt [deleted file]
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/includes/serials-menu.inc
koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
koha-tmpl/intranet-tmpl/prog/en/modules/serials/showpredictionpattern.tt [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-frequencies.tt [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-numberpatterns.tt [deleted file]
serials/create-numberpattern.pl [deleted file]
serials/serials-collection.pl
serials/serials-recieve.pl
serials/showpredictionpattern.pl [deleted file]
serials/subscription-add.pl
serials/subscription-detail.pl
serials/subscription-frequencies.pl [deleted file]
serials/subscription-frequency.pl [deleted file]
serials/subscription-history.pl [deleted file]
serials/subscription-numberpattern.pl [deleted file]
serials/subscription-numberpatterns.pl [deleted file]