Koha/koha-tmpl/intranet-tmpl/prog/en/includes
Chris Cormack b3feb54ee0 Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

Conflicts:

	installer/data/mysql/en/mandatory/userpermissions.sql
	installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
	installer/data/mysql/updatedatabase30.pl
	koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
	koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tmpl
	serials/member-search.pl
	serials/serials-edit.pl
	serials/subscription-add.pl
	serials/subscription-bib-search.pl
	serials/subscription-detail.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 07:23:46 -04:00
..
virtualshelves/merge Adding Merge of two biblios from a virtualshelf 2009-09-30 11:22:23 +02:00
acquisitions-history-search.inc
acquisitions-menu.inc MT1203: don't display menus if the user don't has the permission 2010-02-17 07:46:31 -05:00
acquisitions-search.inc
acquisitions-toolbar.inc Added "ordered" column in acqui-home budget display 2010-04-29 23:47:31 -04:00
additem-menu.inc
admin-menu.inc bug 4168 add keyword to marc mapping to menu 2010-02-11 19:39:50 -05:00
auth-finder-search.inc
authorities-search.inc
authorities-toolbar.inc
background-job.inc bug 4027 fix testStatus typo to textStatus 2010-06-03 07:52:29 -04:00
biblio-view-menu.inc
budgetperiods-admin.inc follow-up to bug 3854: resolve budget period language issues 2010-02-03 15:11:19 -05:00
budgets-admin-search.inc [biblibre-newacq](bug #3611) fix user interface and others 2009-09-30 11:30:34 +02:00
budgets-admin-toolbar.inc bug 4205 remove extra 'plan by' option 2010-06-03 20:04:23 -04:00
calendar.inc
cat-menu.inc
cat-search.inc
cat-toolbar.inc bug 4396: remove reerences to bi_notforloan 2010-05-03 07:45:19 -04:00
cataloging-search.inc Puts focus in search box on page load. 2009-12-20 14:31:37 +01:00
cataloging-toolbar.inc Fix for Bug 4302, shouldn't have to scroll left to right on z search results 2010-04-23 07:10:35 -04:00
checkin-search.inc
circ-menu.inc Revert "bug 3765: move road type after address" 2010-02-18 14:03:22 -05:00
circ-search.inc
circ-toolbar.inc MT2582: Fix user deletion without permission 2010-05-11 08:39:19 -04:00
cities-admin-search.inc
contracts-admin-search.inc contract admin search 2009-09-30 11:30:21 +02:00
currencies-admin-search.inc
date-format.inc Fixes for Bug 3089, Date entry fields should indicate required date format 2010-02-03 15:12:18 -05:00
dictionary-toolbar.inc
doc-head-close-receipt.inc
doc-head-close.inc Use CSS3 box-shadow property for Cart tooltip 2010-05-04 11:19:03 -04:00
doc-head-open.inc
error-bottom.inc
error-messages.inc Bugfix: Adding error trapping for missing or invalid branch code 2010-02-04 10:28:40 -05:00
error-top.inc
facets.inc Fix for Bug 4251 in the staff client 2010-04-16 00:00:54 -04:00
favicon.ico
file-upload.inc
greybox.inc
guided-reports-view.inc MT 2051, Follow-up : Fixing typo in granular permissions for guided reports 2009-11-19 23:22:55 +01:00
header.inc Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module 2010-06-19 07:23:46 -04:00
help-bottom.inc
help-top.inc Fix file permissions: if it is not a script, it should not be executable. 2010-04-16 00:40:34 -04:00
hold-menu.inc
installer-doc-head-close.inc bug 3465: enhance DB update reporting by web installer 2009-08-04 06:15:40 -04:00
intranet-bottom.inc
label-status.inc
labels-batches-toolbar.inc Markup corrections and other minor changes. 2009-09-29 19:21:00 -04:00
labels-menu.inc [14/40] Work on batch management interface. 2009-09-01 15:50:05 -04:00
labels-new-toolbar.inc [9/40] Work on template interface. 2009-09-01 15:48:50 -04:00
labels-toolbar.inc [31/40] Misc bugfixes and cosmetic cleanup. 2009-09-01 15:53:18 -04:00
letters-search.inc
mainmenu.inc Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module 2010-06-19 07:23:46 -04:00
members-menu.inc Revert "MT2232 : members/notices.pl and members/messaging.pl are doing the same thing" 2010-01-28 15:11:57 +01:00
members-toolbar.inc Whitespace removal, removal of U+FEFF character 2010-05-26 14:52:37 -04:00
messaging-preference-form.inc
page-numbers.inc
patron-search-box.inc Fix for Bug 3991, Circulation search submit button wrapping in WebKit browsers 2009-12-31 10:57:22 +01:00
patron-search.inc Fixing members order when string searched 2010-04-29 22:59:02 -04:00
patron-toolbar.inc Fix for Bug 4086, categorycode on patron search confusing 2010-02-03 15:11:49 -05:00
patroncards-batches-toolbar.inc [19/30] Patron Card Creator batch toolbar 2010-01-11 18:21:14 -05:00
patroncards-menu.inc bug 4101 patroncards changed to patron card creator 2010-02-03 15:10:05 -05:00
patroncards-toolbar.inc [18/30] Patron Card Creator toolbar 2010-01-11 18:21:14 -05:00
patrons-admin-search.inc
popup-bottom.inc
prefs-admin-search.inc Add new system preferences editor 2009-09-06 23:02:47 -06:00
prefs-menu.inc Fix for Bug 3992 - New Sys Prefs Branch - Local Use Tab not Highlighted 2010-06-03 20:25:43 -04:00
printers-admin-search.inc
reports-menu.inc
resort_form.inc
roadtype-admin-search.inc
search_indexes.inc bug 4425: reorder search options on staff advanced search 2010-04-29 20:59:31 -04:00
serials-menu.inc Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module 2010-06-19 07:23:46 -04:00
serials-search.inc Adding some fields in GetSubscriptions 2009-09-30 11:30:33 +02:00
serials-toolbar.inc Cherry-picked onto master, fixing conflicts: MT 1816: Granular permissions for the serials module 2010-06-19 07:23:46 -04:00
stopwords-admin-search.inc
subtypes_unimarc.inc
suggestions-add-search.inc
sysprefs-admin-search.inc
sysprefs-menu.inc [22/30] Adding a syspref to limit the number of images which can be stored in the db at any one time by the Patron Card image managera 2010-01-11 18:21:16 -05:00
tools-item-action.inc
tools-menu.inc bug 4442 rename batch edit tools 2010-05-03 14:00:17 -04:00
tools-nomatch-action.inc
tools-overlay-action.inc
virtualshelves-toolbar.inc Moving some list functions into the standard toolbar. 2010-01-05 13:54:08 +01:00
z3950-admin-search.inc