arvados.git
10 years agoMerge branch '1943-client-sdk-config-files'
Tim Pierce [Tue, 21 Jan 2014 22:14:40 +0000 (17:14 -0500)]
Merge branch '1943-client-sdk-config-files'

Conflicts:
sdk/python/arvados/__init__.py

10 years agoClients use $HOME/.config/arvados/settings.conf for configuration. (fixes #1943)
Tim Pierce [Tue, 21 Jan 2014 22:09:00 +0000 (17:09 -0500)]
Clients use $HOME/.config/arvados/settings.conf for configuration. (fixes #1943)

10 years agoMerge branch '1881-normalize-collection-uuids'
Tom Clegg [Tue, 21 Jan 2014 22:07:39 +0000 (14:07 -0800)]
Merge branch '1881-normalize-collection-uuids'

closes #1881

10 years agoMerge branch '1922-cache-discovery-python'
Tom Clegg [Tue, 21 Jan 2014 22:04:30 +0000 (14:04 -0800)]
Merge branch '1922-cache-discovery-python'

10 years agoMerge branch '1868-tutorial-running-binary-progs'
Peter Amstutz [Tue, 21 Jan 2014 22:04:11 +0000 (17:04 -0500)]
Merge branch '1868-tutorial-running-binary-progs'

10 years agoMerge branch '1911-python-sdk-pydoc'
Peter Amstutz [Tue, 21 Jan 2014 22:03:38 +0000 (17:03 -0500)]
Merge branch '1911-python-sdk-pydoc'

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Tue, 21 Jan 2014 22:03:00 +0000 (17:03 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agoFixed import problems due to splitting module into multiple files
Peter Amstutz [Tue, 21 Jan 2014 21:57:53 +0000 (16:57 -0500)]
Fixed import problems due to splitting module into multiple files

10 years agoNew tutorial for running external programs
Peter Amstutz [Tue, 21 Jan 2014 21:38:23 +0000 (16:38 -0500)]
New tutorial for running external programs

10 years agoRemoved "Tutorial:" from titles since that was an artifact from before we had improve...
Peter Amstutz [Tue, 21 Jan 2014 21:35:37 +0000 (16:35 -0500)]
Removed "Tutorial:" from titles since that was an artifact from before we had improved the navbar.  Also fixed typo in tutorial-trait-search.

10 years agocollection.py import stream
Peter Amstutz [Tue, 21 Jan 2014 20:29:25 +0000 (15:29 -0500)]
collection.py import stream

10 years agoUpdating API parameter documentation (refs #1901)
Tim Pierce [Tue, 21 Jan 2014 20:28:19 +0000 (15:28 -0500)]
Updating API parameter documentation (refs #1901)

Removed unused parameters.
More docs for the "list" command.
Use only the first line of the parameter documentation in "arv resource help".

10 years agoStarted tutorial on running external programs
Peter Amstutz [Tue, 21 Jan 2014 19:19:37 +0000 (14:19 -0500)]
Started tutorial on running external programs

10 years agoFixed path to glyphicons
Peter Amstutz [Tue, 21 Jan 2014 19:15:08 +0000 (14:15 -0500)]
Fixed path to glyphicons

10 years agoMoved Python SDK and crunch utility scripts pages to SDK Reference section.
Peter Amstutz [Tue, 21 Jan 2014 19:06:35 +0000 (14:06 -0500)]
Moved Python SDK and crunch utility scripts pages to SDK Reference section.

10 years agoFix circumventing usual permission mechanism in nodes.ping.
Tom Clegg [Tue, 21 Jan 2014 18:53:02 +0000 (10:53 -0800)]
Fix circumventing usual permission mechanism in nodes.ping.

10 years agoAdd section about adding Keep disks during install.
Tom Clegg [Tue, 21 Jan 2014 18:19:20 +0000 (10:19 -0800)]
Add section about adding Keep disks during install.

10 years agoUpdate bundle. Avoid google-api-client 0.7.0 (rc2 is incompatible) and
Tom Clegg [Tue, 21 Jan 2014 17:01:31 +0000 (09:01 -0800)]
Update bundle. Avoid google-api-client 0.7.0 (rc2 is incompatible) and
ensure minitest >= 5.0.

10 years agoAdd link to "create standard objects", and delete obsolete tutorial
Tom Clegg [Tue, 21 Jan 2014 16:58:00 +0000 (08:58 -0800)]
Add link to "create standard objects", and delete obsolete tutorial
instructions.

10 years agoScript to build python documentation (requires epydoc)
Peter Amstutz [Tue, 21 Jan 2014 16:51:34 +0000 (11:51 -0500)]
Script to build python documentation (requires epydoc)

10 years agoAdded Python SDK section to documentation
Peter Amstutz [Tue, 21 Jan 2014 16:45:40 +0000 (11:45 -0500)]
Added Python SDK section to documentation

10 years agoFix error message when the all-users group can not be found.
Ward Vandewege [Tue, 21 Jan 2014 16:36:46 +0000 (11:36 -0500)]
Fix error message when the all-users group can not be found.

10 years agoRenamed Keep/Stream/Collection submodules to keep/stream/collection (lower case)
Peter Amstutz [Tue, 21 Jan 2014 15:15:48 +0000 (10:15 -0500)]
Renamed Keep/Stream/Collection submodules to keep/stream/collection (lower case)

10 years agoMoving Collection, Stream and Keep classes into their own files
Peter Amstutz [Tue, 21 Jan 2014 14:06:00 +0000 (09:06 -0500)]
Moving Collection, Stream and Keep classes into their own files

10 years agoRender token with ApplicationController#show instead of calling
Tom Clegg [Mon, 20 Jan 2014 18:16:55 +0000 (10:16 -0800)]
Render token with ApplicationController#show instead of calling
as_api_response directly from
api_client_authorizations.create_system_auth.

Resolves:

Error: #<ActsAsApi::TemplateNotFoundError: acts_as_api template
:superuser was not found for model ApiClientAuthorization>

10 years agoCache discovery document in ~/.cache/arvados/discovery/.
Tom Clegg [Mon, 20 Jan 2014 15:41:39 +0000 (07:41 -0800)]
Cache discovery document in ~/.cache/arvados/discovery/.

refs #1922

10 years agoSet cache expiry time on discovery document.
Tom Clegg [Mon, 20 Jan 2014 15:41:12 +0000 (07:41 -0800)]
Set cache expiry time on discovery document.

refs #1922

10 years agoRemove +K@{name} hints from collection uuid, link head/tail, job
Tom Clegg [Mon, 20 Jan 2014 07:55:55 +0000 (23:55 -0800)]
Remove +K@{name} hints from collection uuid, link head/tail, job
output/log, and job_task output.

refs #1881

10 years agoNormalize collection UUID to {hash}+{size} before save and lookup.
Tom Clegg [Mon, 20 Jan 2014 07:34:20 +0000 (23:34 -0800)]
Normalize collection UUID to {hash}+{size} before save and lookup.

refs #1881

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Tim Pierce [Fri, 17 Jan 2014 22:35:34 +0000 (17:35 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agoUpdated `arv' command line format options. Default now generates JSON. (refs #1889)
Tim Pierce [Fri, 17 Jan 2014 22:33:00 +0000 (17:33 -0500)]
Updated `arv' command line format options. Default now generates JSON. (refs #1889)

Replaced --pretty, --json, --uuid, --yaml, --human with
--format={json,uuid,yaml}, and added --short for --format=uuid.

Default output format is now JSON (pretty-printed).

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Fri, 17 Jan 2014 21:58:41 +0000 (16:58 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agoChanged upload path in scp command to load to /scratch/you instead of just /scratch...
Peter Amstutz [Fri, 17 Jan 2014 21:58:07 +0000 (16:58 -0500)]
Changed upload path in scp command to load to /scratch/you instead of just /scratch, tweaked markup to try and emphasize that "you" that should be replaced by your own username.

10 years agoMerge branch '1880-check-duplicate-public-key'
Tom Clegg [Fri, 17 Jan 2014 21:50:19 +0000 (13:50 -0800)]
Merge branch '1880-check-duplicate-public-key'

closes #1880

10 years agoAdd themes to .gitignore in apps/workbench
Tom Clegg [Fri, 17 Jan 2014 16:00:43 +0000 (08:00 -0800)]
Add themes to .gitignore in apps/workbench

10 years agoRemoved spurious '>' (typo)
Peter Amstutz [Fri, 17 Jan 2014 21:43:50 +0000 (16:43 -0500)]
Removed spurious '>' (typo)

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Fri, 17 Jan 2014 21:21:24 +0000 (16:21 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agorefs #1912
Peter Amstutz [Fri, 17 Jan 2014 21:20:58 +0000 (16:20 -0500)]
refs #1912
* ssh-access tweaked to emphasize need for user to use their own user name and not 'you' and changed example ssh config to use *.qr1hi to *.arvados
* tutorial-firstscript suggests using nano to edit files instead of leaving the user hanging
* Fixed inconsistent keep locators for manifests caused by removal of +K@qr1hi from locators
* Removed +K@qr1hi from all locators used in examples

10 years agoAccept DSA public keys ("ssh-dss"), not just RSA.
Tom Clegg [Fri, 17 Jan 2014 21:02:35 +0000 (13:02 -0800)]
Accept DSA public keys ("ssh-dss"), not just RSA.

refs #1880

10 years agoReduce boilerplate on error messages.
Tom Clegg [Fri, 17 Jan 2014 20:47:09 +0000 (12:47 -0800)]
Reduce boilerplate on error messages.

"The error message [API 422]" instead of "#<RuntimeError: API error
422: The error message>"

refs #1880

10 years agoTweak error messages to render nicely as Rails "full messages".
Tom Clegg [Fri, 17 Jan 2014 20:20:21 +0000 (12:20 -0800)]
Tweak error messages to render nicely as Rails "full messages".

"Public key does not appear to be ..."

refs #1880

10 years agoUse render_error instead of custom error logic in update method.
Tom Clegg [Fri, 17 Jan 2014 20:19:34 +0000 (12:19 -0800)]
Use render_error instead of custom error logic in update method.

10 years agoRespond with an error status if save fails during create method.
Tom Clegg [Fri, 17 Jan 2014 20:17:54 +0000 (12:17 -0800)]
Respond with an error status if save fails during create method.

refs #1880

10 years agoUse AJAX when adding a new authorized_key from the user home page.
Tom Clegg [Fri, 17 Jan 2014 20:06:34 +0000 (12:06 -0800)]
Use AJAX when adding a new authorized_key from the user home page.

On success, replace reminder box with a "Key added" message. On
failure, display the error message below the form.

refs #1880

10 years agoMore clinicalfuture.com -> curoverse.com
Ward Vandewege [Fri, 17 Jan 2014 19:02:08 +0000 (14:02 -0500)]
More clinicalfuture.com -> curoverse.com

10 years agoFixed spaces in manifest stream names. Refs #1849.
Peter Amstutz [Fri, 17 Jan 2014 15:32:33 +0000 (10:32 -0500)]
Fixed spaces in manifest stream names.  Refs #1849.

10 years agoFixed spacing on dashboard and generic table page when tables are empty.
Peter Amstutz [Fri, 17 Jan 2014 14:42:21 +0000 (09:42 -0500)]
Fixed spacing on dashboard and generic table page when tables are empty.

10 years agoAdds validate :public_key_must_be_unique to AuthorizedKey which checks to see if...
Peter Amstutz [Thu, 16 Jan 2014 22:07:46 +0000 (17:07 -0500)]
Adds validate :public_key_must_be_unique to AuthorizedKey which checks to see if the key
a) looks like a ssh-rsa key
b) that the key isn't already in the table

10 years agoMerge branch 'master' into 1880-check-duplicate-public-key
Peter Amstutz [Thu, 16 Jan 2014 21:06:14 +0000 (16:06 -0500)]
Merge branch 'master' into 1880-check-duplicate-public-key

10 years agoDo not attempt to load authentication config file unless it exists.
Tom Clegg [Thu, 16 Jan 2014 21:02:13 +0000 (13:02 -0800)]
Do not attempt to load authentication config file unless it exists.

closes #1915

10 years agoFix "ignore client-provided values for protected auditing attributes"
Tom Clegg [Thu, 16 Jan 2014 20:57:40 +0000 (12:57 -0800)]
Fix "ignore client-provided values for protected auditing attributes"

(Broken by 976a754dc7fceee767322ae964c287b63595211f)

10 years agoAdded validate step, needs testing
Peter Amstutz [Thu, 16 Jan 2014 18:38:44 +0000 (13:38 -0500)]
Added validate step, needs testing

10 years agoRemove boilerplate comments and unused test fixtures.
Tom Clegg [Thu, 16 Jan 2014 17:12:52 +0000 (09:12 -0800)]
Remove boilerplate comments and unused test fixtures.

refs #1696

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Thu, 16 Jan 2014 13:59:42 +0000 (08:59 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agoFixed Python SDK to quote/unquote spaces when reading/writing manifests. Refs #1849
Peter Amstutz [Thu, 16 Jan 2014 13:59:12 +0000 (08:59 -0500)]
Fixed Python SDK to quote/unquote spaces when reading/writing manifests.  Refs #1849

10 years agoInactive users can get a list of Keep disks.
Tom Clegg [Wed, 15 Jan 2014 22:41:09 +0000 (14:41 -0800)]
Inactive users can get a list of Keep disks.

(Otherwise they cannot retrieve user agreements.)

10 years agoarv-get replaces spaces in get_prefix with \040 to match the manifest. Refs #1849
Peter Amstutz [Wed, 15 Jan 2014 20:20:53 +0000 (15:20 -0500)]
arv-get replaces spaces in get_prefix with \040 to match the manifest.  Refs #1849

10 years agoMerge branch '1510-arv-tag-unit-tests' of git.clinicalfuture.com:arvados into 1510...
Tim Pierce [Wed, 15 Jan 2014 19:37:45 +0000 (14:37 -0500)]
Merge branch '1510-arv-tag-unit-tests' of git.clinicalfuture.com:arvados into 1510-arv-tag-unit-tests

Conflicts:
sdk/cli/test/test_arv-tag.rb

10 years agoClean up tests with "assert_tag" method, remove non-working test. Fixes #1510.
Tim Pierce [Wed, 15 Jan 2014 19:33:28 +0000 (14:33 -0500)]
Clean up tests with "assert_tag" method, remove non-working test. Fixes #1510.

10 years agoAdding arv-tag unit tests.
Tim Pierce [Tue, 14 Jan 2014 22:23:34 +0000 (17:23 -0500)]
Adding arv-tag unit tests.

Also:
Fix return value for deleting multiple links.
Clean up arv-put unit test code.

10 years agoCommand-line clients use $HOME/.config/arvados for config settings.
Tim Pierce [Fri, 10 Jan 2014 23:37:00 +0000 (18:37 -0500)]
Command-line clients use $HOME/.config/arvados for config settings.

10 years agoLogging out now returns you to the login page, rather than an empty "you have logged...
Peter Amstutz [Wed, 15 Jan 2014 19:15:51 +0000 (14:15 -0500)]
Logging out now returns you to the login page, rather than an empty "you have logged out" page.  Refs #1865

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Wed, 15 Jan 2014 19:07:30 +0000 (14:07 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agoMoves "add new item" button from bottom of the page to the top. Refs #1877
Peter Amstutz [Wed, 15 Jan 2014 19:07:11 +0000 (14:07 -0500)]
Moves "add new item" button from bottom of the page to the top.  Refs #1877

10 years agoDo not show user agreement inline unless site config says so. Remove
Tom Clegg [Wed, 15 Jan 2014 18:52:21 +0000 (10:52 -0800)]
Do not show user agreement inline unless site config says so. Remove
superfluous dialog box presentation, and use agreement filename as
page title if there is only one.

refs #1694

10 years agoFix user_agreements.sign when collection uuid has +size hint.
Tom Clegg [Wed, 15 Jan 2014 18:47:07 +0000 (10:47 -0800)]
Fix user_agreements.sign when collection uuid has +size hint.

refs #1694

10 years agoFix user_agreements_controller.table_name so generic list method works.
Tom Clegg [Wed, 15 Jan 2014 17:37:21 +0000 (09:37 -0800)]
Fix user_agreements_controller.table_name so generic list method works.

refs #1871

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Wed, 15 Jan 2014 17:16:41 +0000 (12:16 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoStory 1879 "log" link on dashboard links directly to log file.
Peter Amstutz [Wed, 15 Jan 2014 17:16:11 +0000 (12:16 -0500)]
Story 1879 "log" link on dashboard links directly to log file.

10 years agoFix incorrect find(), should have been find_by_uuid()
Tom Clegg [Wed, 15 Jan 2014 17:11:25 +0000 (09:11 -0800)]
Fix incorrect find(), should have been find_by_uuid()

refs #1871
amends 463e996ae5276dc41deca98cb444c802e6f5e251

10 years agoReload the target object before updating if it is marked read-only
Tom Clegg [Wed, 15 Jan 2014 17:07:00 +0000 (09:07 -0800)]
Reload the target object before updating if it is marked read-only
(e.g., it was retrieved using a join). Also, fix error response when
update is called on a non-existent object.

Prevents ActiveRecord::ReadOnlyRecord error.

refs #1871
amends 92d1022d103b58ddad0427736a776a27f198667e

10 years agoWith where={"any":["contains",X]}, search all text and string columns.
Tom Clegg [Wed, 15 Jan 2014 05:13:32 +0000 (21:13 -0800)]
With where={"any":["contains",X]}, search all text and string columns.

closes #1867

10 years agoIf a GET fails while looking up a friendly name, skip the hyperlink
Tom Clegg [Tue, 14 Jan 2014 22:41:54 +0000 (14:41 -0800)]
If a GET fails while looking up a friendly name, skip the hyperlink
instead of crashing.

Also, move the "choose a friendly name" logic from helper to model.

refs #1871

10 years agoAdding arv-tag unit tests.
Tim Pierce [Tue, 14 Jan 2014 22:23:34 +0000 (17:23 -0500)]
Adding arv-tag unit tests.

Also:
Fix return value for deleting multiple links.
Clean up arv-put unit test code.

10 years agoIn collections.create, set owner to root and add a permission link
Tom Clegg [Tue, 14 Jan 2014 22:12:59 +0000 (14:12 -0800)]
In collections.create, set owner to root and add a permission link
rather than setting owner to current_user. This gives the expected
behavior when two different users create identical collections: both
users can read the resulting object.

closes #1870

10 years agoObey permissions when retrieving object by UUID.
Tom Clegg [Tue, 14 Jan 2014 21:37:30 +0000 (13:37 -0800)]
Obey permissions when retrieving object by UUID.

closes #1871

10 years agoLowercase model name in discovery document, like the real parameter name.
Tom Clegg [Tue, 14 Jan 2014 16:37:50 +0000 (08:37 -0800)]
Lowercase model name in discovery document, like the real parameter name.

closes #1869

10 years agoFix sending resource body to server.
Tom Clegg [Tue, 14 Jan 2014 16:35:29 +0000 (08:35 -0800)]
Fix sending resource body to server.

Resolves "Error: #<ArgumentError: No {model} hash provided with request>"

refs #1869

10 years agoMerge branch '1510-arv-tag-unit-tests' of git.clinicalfuture.com:arvados into 1510...
Tim Pierce [Tue, 14 Jan 2014 15:23:25 +0000 (10:23 -0500)]
Merge branch '1510-arv-tag-unit-tests' of git.clinicalfuture.com:arvados into 1510-arv-tag-unit-tests

10 years agoCommand-line clients use $HOME/.config/arvados for config settings.
Tim Pierce [Fri, 10 Jan 2014 23:37:00 +0000 (18:37 -0500)]
Command-line clients use $HOME/.config/arvados for config settings.

10 years agoMerge branch '1748-workbench-view-files'
Peter Amstutz [Tue, 14 Jan 2014 14:20:03 +0000 (09:20 -0500)]
Merge branch '1748-workbench-view-files'

10 years agoMoved "size" column to last and added SI order of magnitude suffixes instead of showi...
Peter Amstutz [Tue, 14 Jan 2014 14:17:12 +0000 (09:17 -0500)]
Moved "size" column to last and added SI order of magnitude suffixes instead of showing raw byte counts.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Tue, 14 Jan 2014 13:34:47 +0000 (08:34 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

10 years agoMerge branch '1499-workbench-tags'
Tom Clegg [Tue, 14 Jan 2014 01:10:46 +0000 (17:10 -0800)]
Merge branch '1499-workbench-tags'

10 years agoSwitch to rounded search box style on collections page, to match home page.
Tom Clegg [Tue, 14 Jan 2014 01:09:23 +0000 (17:09 -0800)]
Switch to rounded search box style on collections page, to match home page.

refs #1499

10 years agoMerged 1862-show-object-links into master
Peter Amstutz [Tue, 14 Jan 2014 00:50:05 +0000 (19:50 -0500)]
Merged 1862-show-object-links into master

10 years agoMerge branch '1499-workbench-tags'
Tom Clegg [Mon, 13 Jan 2014 22:33:06 +0000 (14:33 -0800)]
Merge branch '1499-workbench-tags'

closes #1499

10 years agoFix test setup.
Tom Clegg [Mon, 13 Jan 2014 22:29:28 +0000 (14:29 -0800)]
Fix test setup.

Even if ./tmp/ already exists, we might need mkdir ./tmp/empty_dir

10 years agoAdd collection search box on home page.
Tom Clegg [Mon, 13 Jan 2014 21:48:33 +0000 (13:48 -0800)]
Add collection search box on home page.

refs #1499

10 years agoUse symbol keys to access request parameters.
Tom Clegg [Mon, 13 Jan 2014 21:34:18 +0000 (13:34 -0800)]
Use symbol keys to access request parameters.

10 years agoAllow admin client to create API tokens for other users.
Tom Clegg [Mon, 13 Jan 2014 18:46:20 +0000 (10:46 -0800)]
Allow admin client to create API tokens for other users.

refs #1680

10 years agoUnescape filenames from manifests. refs #1849
Tom Clegg [Mon, 13 Jan 2014 18:13:19 +0000 (10:13 -0800)]
Unescape filenames from manifests. refs #1849

10 years agoUpdate query in browser location bar when showing search results.
Tom Clegg [Mon, 13 Jan 2014 18:11:40 +0000 (10:11 -0800)]
Update query in browser location bar when showing search results.

refs #1499

10 years agoFix crash if no search parameter given.
Tom Clegg [Mon, 13 Jan 2014 18:10:55 +0000 (10:10 -0800)]
Fix crash if no search parameter given.

refs #1499

10 years agoReworked Files tab of collection view a bit.
Peter Amstutz [Mon, 13 Jan 2014 16:49:06 +0000 (11:49 -0500)]
Reworked Files tab of collection view a bit.

10 years agoMerge branch 'master' of git.clinicalfuture.com:arvados
Peter Amstutz [Mon, 13 Jan 2014 16:36:25 +0000 (11:36 -0500)]
Merge branch 'master' of git.clinicalfuture.com:arvados

10 years agoFinished improving rendering of UUIDs for now.
Peter Amstutz [Mon, 13 Jan 2014 16:17:00 +0000 (11:17 -0500)]
Finished improving rendering of UUIDs for now.

10 years agoMerge commit '030d673e455ac7fa92732eafe95f1db12f6a46b6' into 1862-show-object-links
Peter Amstutz [Mon, 13 Jan 2014 15:17:03 +0000 (10:17 -0500)]
Merge commit '030d673e455ac7fa92732eafe95f1db12f6a46b6' into 1862-show-object-links

10 years agoMerge remote-tracking branch 'origin' into 1862-show-object-links
Peter Amstutz [Mon, 13 Jan 2014 15:10:39 +0000 (10:10 -0500)]
Merge remote-tracking branch 'origin' into 1862-show-object-links

10 years agoAdd AJAX tag search box to collections.index page.
Tom Clegg [Mon, 13 Jan 2014 08:56:26 +0000 (00:56 -0800)]
Add AJAX tag search box to collections.index page.

refs #1499