sitka/doc/acquisitions.git
3 years agoClaiming section commented out. sitka_2_10
Jennifer Pringle [Mon, 30 Jan 2017 23:28:48 +0000 (15:28 -0800)]
Claiming section commented out.

3 years agoMenu text and screenshots updated in Providers section.
Jennifer Pringle [Mon, 23 Jan 2017 21:32:47 +0000 (13:32 -0800)]
Menu text and screenshots updated in Providers section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoMenu text and screenshots updated in Funds section.
Jennifer Pringle [Mon, 23 Jan 2017 21:32:32 +0000 (13:32 -0800)]
Menu text and screenshots updated in Funds section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoNotes removed from Funding Sources section.
Jennifer Pringle [Mon, 23 Jan 2017 21:32:00 +0000 (13:32 -0800)]
Notes removed from Funding Sources section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoYear End checklist updated in Year End section.
Jennifer Pringle [Mon, 23 Jan 2017 21:30:29 +0000 (13:30 -0800)]
Year End checklist updated in Year End section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoDates updated to 2017 in Root.
Jennifer Pringle [Mon, 23 Jan 2017 21:30:01 +0000 (13:30 -0800)]
Dates updated to 2017 in Root.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoClaiming section added to root.
Jennifer Pringle [Sat, 21 Jan 2017 02:00:31 +0000 (18:00 -0800)]
Claiming section added to root.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoClaiming section updated.
Jennifer Pringle [Sat, 21 Jan 2017 01:59:51 +0000 (17:59 -0800)]
Claiming section updated.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoNote regarding negative balances in funding sources added to Funding Sources and...
Jennifer Pringle [Sat, 21 Jan 2017 01:52:53 +0000 (17:52 -0800)]
Note regarding negative balances in funding sources added to Funding Sources and Funds sections.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoYear End section updated.
Jennifer Pringle [Sat, 21 Jan 2017 01:50:42 +0000 (17:50 -0800)]
Year End section updated.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
3 years agoadding video link - acq admin
Christine Burns [Wed, 11 Jan 2017 21:58:39 +0000 (13:58 -0800)]
adding video link - acq admin

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
3 years agoadding video links - brief record, EDI account, holding subfields
Christine Burns [Wed, 11 Jan 2017 21:33:04 +0000 (13:33 -0800)]
adding video links - brief record, EDI account, holding subfields

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
3 years agoadding video links - year end
Christine Burns [Wed, 11 Jan 2017 19:15:25 +0000 (11:15 -0800)]
adding video links - year end

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
3 years agoadding video link - acq admin
Christine Burns [Wed, 11 Jan 2017 19:12:05 +0000 (11:12 -0800)]
adding video link - acq admin

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
3 years agoadding video links - create PO
Christine Burns [Wed, 11 Jan 2017 19:08:58 +0000 (11:08 -0800)]
adding video links - create PO

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
3 years agoadding video links - load MARC
Christine Burns [Wed, 11 Jan 2017 19:06:14 +0000 (11:06 -0800)]
adding video links - load MARC

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
3 years agoMerge branch 'master' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisition...
Jennifer Pringle [Tue, 15 Nov 2016 00:33:55 +0000 (16:33 -0800)]
Merge branch 'master' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisitions.git

3 years agoNote removed from Permissions section.
Jennifer Pringle [Tue, 15 Nov 2016 00:33:42 +0000 (16:33 -0800)]
Note removed from Permissions section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
4 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Thu, 30 Jun 2016 18:04:42 +0000 (11:04 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot
Christine Burns [Tue, 17 May 2016 17:03:47 +0000 (10:03 -0700)]
replace screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Tue, 17 May 2016 16:40:38 +0000 (09:40 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Tue, 17 May 2016 16:15:16 +0000 (09:15 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Tue, 17 May 2016 16:08:41 +0000 (09:08 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Tue, 17 May 2016 16:00:50 +0000 (09:00 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Tue, 17 May 2016 15:43:41 +0000 (08:43 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadding spaces, correcting typos
Christine Burns [Tue, 17 May 2016 02:08:16 +0000 (19:08 -0700)]
adding spaces, correcting typos

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadding screenshots -> finalize blanket order
Christine Burns [Tue, 17 May 2016 01:53:57 +0000 (18:53 -0700)]
adding screenshots -> finalize blanket order

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot
Christine Burns [Mon, 16 May 2016 23:44:46 +0000 (16:44 -0700)]
replace screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Mon, 16 May 2016 23:41:53 +0000 (16:41 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot (real lib vs ZSP)
Christine Burns [Mon, 16 May 2016 23:31:52 +0000 (16:31 -0700)]
replace screenshot (real lib vs ZSP)

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadd section for invoice blanket order items
Christine Burns [Mon, 16 May 2016 23:24:19 +0000 (16:24 -0700)]
add section for invoice blanket order items

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot
Christine Burns [Mon, 16 May 2016 22:20:23 +0000 (15:20 -0700)]
replace screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Mon, 16 May 2016 22:16:50 +0000 (15:16 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot -> remove "button" from all steps where it said click close button
Christine Burns [Mon, 16 May 2016 22:02:52 +0000 (15:02 -0700)]
replace screenshot -> remove "button" from all steps where it said click close button

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agofix typo
Christine Burns [Mon, 16 May 2016 21:29:49 +0000 (14:29 -0700)]
fix typo

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agomerge pay / complete invoice sections -> emphasize need to close an invoice -> replac...
Christine Burns [Mon, 16 May 2016 21:23:59 +0000 (14:23 -0700)]
merge pay / complete invoice sections -> emphasize need to close an invoice -> replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoedit note -> funds spent when invoice closed
Christine Burns [Mon, 16 May 2016 20:43:29 +0000 (13:43 -0700)]
edit note -> funds spent when invoice closed

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot -> update received & paid
Christine Burns [Mon, 16 May 2016 19:19:29 +0000 (12:19 -0700)]
replace screenshot -> update received & paid

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots -> add received & paid
Christine Burns [Mon, 16 May 2016 18:50:59 +0000 (11:50 -0700)]
replace screenshots -> add received & paid

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Thu, 12 May 2016 21:53:07 +0000 (14:53 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots -> add step to activate order without loading items
Christine Burns [Thu, 12 May 2016 17:53:40 +0000 (10:53 -0700)]
replace screenshots -> add step to activate order without loading items

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Thu, 12 May 2016 17:40:41 +0000 (10:40 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Thu, 12 May 2016 17:30:21 +0000 (10:30 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadd missing tag
Christine Burns [Wed, 11 May 2016 00:07:36 +0000 (17:07 -0700)]
add missing tag

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadding content & screenshots to Blanket Order section
Christine Burns [Tue, 10 May 2016 23:53:04 +0000 (16:53 -0700)]
adding content & screenshots to Blanket Order section

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadd "owning branch" as required for activation / replace screenshots
Christine Burns [Mon, 9 May 2016 23:26:04 +0000 (16:26 -0700)]
add "owning branch" as required for activation / replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Mon, 9 May 2016 21:52:30 +0000 (14:52 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadjust size
Christine Burns [Mon, 9 May 2016 20:54:23 +0000 (13:54 -0700)]
adjust size

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Mon, 9 May 2016 20:31:01 +0000 (13:31 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadjust size
Christine Burns [Mon, 9 May 2016 20:19:15 +0000 (13:19 -0700)]
adjust size

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoReplace screenshots
Christine Burns [Mon, 9 May 2016 20:13:12 +0000 (13:13 -0700)]
Replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshots
Christine Burns [Mon, 9 May 2016 19:35:11 +0000 (12:35 -0700)]
replace screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot
Christine Burns [Mon, 9 May 2016 18:18:56 +0000 (11:18 -0700)]
replace screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot
Christine Burns [Mon, 9 May 2016 18:15:06 +0000 (11:15 -0700)]
replace screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace printscreen
Christine Burns [Mon, 9 May 2016 17:49:29 +0000 (10:49 -0700)]
replace printscreen

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoremove quotations from all instances of blanket orders
Christine Burns [Wed, 4 May 2016 21:35:56 +0000 (14:35 -0700)]
remove quotations from all instances of blanket orders

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoOpt out claiming section - Claiming should be setup at org unit
Christine Burns [Wed, 27 Apr 2016 21:55:31 +0000 (14:55 -0700)]
Opt out claiming section - Claiming should be setup at org unit
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agofixing screenshot size
Christine Burns [Thu, 21 Apr 2016 23:29:33 +0000 (16:29 -0700)]
fixing screenshot size

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Thu, 21 Apr 2016 23:24:12 +0000 (16:24 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadding bullet points
Christine Burns [Thu, 21 Apr 2016 22:47:41 +0000 (15:47 -0700)]
adding bullet points

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agofixing screenshot width
Christine Burns [Thu, 21 Apr 2016 21:49:29 +0000 (14:49 -0700)]
fixing screenshot width

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years ago2.10 Acq new features
Christine Burns [Thu, 21 Apr 2016 21:31:47 +0000 (14:31 -0700)]
2.10 Acq new features

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadding 2.10 new features -rough draft
Christine Burns [Thu, 21 Apr 2016 20:33:42 +0000 (13:33 -0700)]
adding 2.10 new features -rough draft

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoAdd new section + new simple sections for Blanket order - rough draft outline
Christine Burns [Tue, 19 Apr 2016 21:52:10 +0000 (14:52 -0700)]
Add new section + new simple sections for Blanket order - rough draft outline

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Tue, 19 Apr 2016 18:19:04 +0000 (11:19 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoUpdate screenshot & labels for Acquisitions Administration
Christine Burns [Tue, 19 Apr 2016 17:45:09 +0000 (10:45 -0700)]
Update screenshot & labels for Acquisitions Administration

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agodefault copy location is required setting
Christine Burns [Fri, 1 Apr 2016 21:40:02 +0000 (14:40 -0700)]
default copy location is required setting

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoRemove duplicate selection list search
Christine Burns [Fri, 1 Apr 2016 18:31:57 +0000 (11:31 -0700)]
Remove duplicate selection list search

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoreplace screenshot - include list title
Christine Burns [Fri, 1 Apr 2016 18:12:20 +0000 (11:12 -0700)]
replace screenshot - include list title

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoadd Blanket Order + update screenshot
Christine Burns [Fri, 1 Apr 2016 18:00:06 +0000 (11:00 -0700)]
add Blanket Order + update screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoupdate screenshot for exchanges rates (list has been ordered by alpha)
Christine Burns [Fri, 1 Apr 2016 17:55:15 +0000 (10:55 -0700)]
update screenshot for exchanges rates (list has been ordered by alpha)

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoRemove German -> add Swiss -> update screenshot
Christine Burns [Fri, 1 Apr 2016 17:48:33 +0000 (10:48 -0700)]
Remove German -> add Swiss -> update screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
4 years agoUpdated to 2.10
Jennifer Pringle [Wed, 10 Feb 2016 22:43:08 +0000 (14:43 -0800)]
Updated to 2.10

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
4 years agoFurther adjustment to Introduction section.
Jennifer Pringle [Thu, 19 Nov 2015 07:24:48 +0000 (23:24 -0800)]
Further adjustment to Introduction section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
4 years agoLink to acquisitions overview video added to Introduction section.
Jennifer Pringle [Thu, 19 Nov 2015 07:18:42 +0000 (23:18 -0800)]
Link to acquisitions overview video added to Introduction section.

Signed-off-by: Jennifer Pringle <jennifer.pringle@bc.libraries.coop>
5 years agoLast Updated Date updated in root.
Jennifer Pringle [Mon, 13 Jul 2015 07:26:50 +0000 (00:26 -0700)]
Last Updated Date updated in root.

Signed-off-by: Jennifer Pringle <jpringle@sitka.bclibraries.ca>
5 years agoadjusting size sitka_2_8
Christine Burns [Mon, 13 Jul 2015 04:40:41 +0000 (21:40 -0700)]
adjusting size

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadjusting size
Christine Burns [Mon, 13 Jul 2015 04:38:45 +0000 (21:38 -0700)]
adjusting size

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadjusting size
Christine Burns [Mon, 13 Jul 2015 04:18:37 +0000 (21:18 -0700)]
adjusting size

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadding screenshots
Christine Burns [Mon, 13 Jul 2015 04:16:43 +0000 (21:16 -0700)]
adding screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoset "split orders by line items" to not display
Christine Burns [Fri, 10 Jul 2015 20:27:02 +0000 (13:27 -0700)]
set "split orders by line items" to not display

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadjusting size of screenshot
Christine Burns [Fri, 10 Jul 2015 19:35:46 +0000 (12:35 -0700)]
adjusting size of screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoupdate screenshot
Christine Burns [Thu, 9 Jul 2015 19:33:25 +0000 (12:33 -0700)]
update screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Thu, 9 Jul 2015 19:06:49 +0000 (12:06 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadjusting size of screenshots
Christine Burns [Thu, 9 Jul 2015 18:33:23 +0000 (11:33 -0700)]
adjusting size of screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Thu, 9 Jul 2015 18:14:57 +0000 (11:14 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoupdating screenshots
Christine Burns [Thu, 9 Jul 2015 17:41:59 +0000 (10:41 -0700)]
updating screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadjusting size of screenshot
Christine Burns [Thu, 9 Jul 2015 17:18:23 +0000 (10:18 -0700)]
adjusting size of screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoupdating screenshots
Christine Burns [Thu, 9 Jul 2015 17:08:37 +0000 (10:08 -0700)]
updating screenshots

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoadjusting size of screenshot
Christine Burns [Thu, 9 Jul 2015 14:45:57 +0000 (07:45 -0700)]
adjusting size of screenshot

Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Thu, 9 Jul 2015 14:33:43 +0000 (07:33 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Wed, 8 Jul 2015 19:34:54 +0000 (12:34 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Wed, 8 Jul 2015 19:28:12 +0000 (12:28 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Wed, 8 Jul 2015 19:11:31 +0000 (12:11 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoMerge branch 'sitka_2_8' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisit...
Christine Burns [Tue, 7 Jul 2015 18:55:46 +0000 (11:55 -0700)]
Merge branch 'sitka_2_8' of git+ssh://git@git.sitka.bclibraries.ca/sitka/doc/acquisitions.git into sitka_2_8

5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Tue, 7 Jul 2015 18:28:43 +0000 (11:28 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Tue, 7 Jul 2015 18:13:16 +0000 (11:13 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoMerge branch 'sitka_2_8'
Christine Burns [Tue, 7 Jul 2015 17:58:22 +0000 (10:58 -0700)]
Merge branch 'sitka_2_8'

Conflicts:
acq/media/Thumbs.db
admin/media/Thumbs.db

5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Tue, 7 Jul 2015 17:56:51 +0000 (10:56 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>
5 years agoSigned-off-by: Christine Burns <christine.burns@bc.libraries.coop>
Christine Burns [Tue, 7 Jul 2015 17:55:52 +0000 (10:55 -0700)]
Signed-off-by: Christine Burns <christine.burns@bc.libraries.coop>