# Conflicts:
#	build.xml
#	composer.json
#	config/vufind/config.ini
#	packages/DEBIAN/changelog
#	packages/DEBIAN/control

- As discussed on https://sourceforge.net/p/vufind/mailman/message/35002108/
- These changes won't break the previous behaviour, they will just introduce new alternative dependencies based on virtual packages that can either provide php5 or php7 / mysql or mariadb
- Note that explicit apache2 php module dependency is needed because currently the virtual package php5 depends on libapache2-mod-php5 but the virtual package php uses php7-fpm by default, so by making the libapache2-mod-php package need explicit we won't run into cases where the user installed php7-fpm or the virtual package php choose php7-fpm instead of the apache's one.
- Note: Installing vufind without libapache2-mod-php or libapache2-mod-php5 fails with an apache errors as it doesn't recognize vufind.conf, which uses php keywords.
- Please also note that the first package in the precedence order [libapache2-mod-php5] is already a dependency from php5, so this won't break previous functionality.

- Resolves VUFIND-1167 (OpenUrl-Resolver in HoldingsTab not embedded when loadInitialTabWithAjax=true)
- Includes refactoring of openurl.js to use new "VuFind namespace object plug-in" format.
- Includes test

- Do not register the same object multiple times, or create duplicate objects.
- Make sure objects are initialized even if register() is called after init().

- Selenium sometimes failed to click "log out" because it was behind the lightbox.

- Added settings to turn off random renewal-related failures in Demo driver
- Added setting to fix value of transactions in Demo driver
- Added IDs to renewal-related buttons to allow automated test to click them

Conflicts:
	themes/bootstrap3/js/record.js
	themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml

- Thanks to Ere Maijala for the catch.

Conflicts:
	themes/bootstrap3/js/record.js

Add consortial support to Renew and Cancel requests.

- This was likely broken by formatting logic introduced by hidden filter persistence logic.