[Bps-public-commit] rt-extension-assets branch, master, updated. 6125261bed1803f64e2831c220ff48878e509511

[Alex Vandiver]

The branch, master has been updated
       via  6125261bed1803f64e2831c220ff48878e509511 (commit)
       via  d84f15ae4122bb00d67a7bbe99fea4cffe7f0851 (commit)
       via  71dd6fa672b334c855b52bfb29c1c2c2c5814678 (commit)
       via  15163628e454cdcc77006ddbbd7ede896b2f268e (commit)
       via  c0a29423e3aacf6ff71c04597a866ca66d6d2f79 (commit)
       via  c5e508a6408b27326ff598ba75c1d3b990d8e244 (commit)
       via  2334f976937248afefc1676f9c8e5dfe681e5153 (commit)
       via  13b1404911e4e94b24da99cda66ecfd11acfc5ef (commit)
       via  7a0a4573479e83c6f6215eb4e32367851720ca21 (commit)
       via  7f811fe0505098ed5edb76ed4e36560d5092d394 (commit)
       via  0b768ba778262ce777f2ed7a509cc22108390ec9 (commit)
       via  9de016b63adc328ca53617fa1b230cfcbc259f05 (commit)
       via  aa28eaf78d59a0a563d64b62729343fd17b692e3 (commit)
       via  a56ae2a32db68571348e4e5242ac28914407e00a (commit)
       via  d43c8ae36a611cb1af98b1f89f14f61ffcb7b18e (commit)
      from  3ff07e06ebe08b49393c088ed48d60d80d389307 (commit)

Summary of changes:
 html/Admin/Assets/Catalogs/Elements/EditBasics |   4 +-
 html/Asset/Create.html                         |  23 ++--
 html/Asset/Elements/AssetSearchBasics          |   8 +-
 html/Asset/Elements/AssetSearchCFs             |   4 +-
 html/Asset/Elements/AssetSearchPeople          |   6 +-
 html/Asset/Elements/EditBasics                 |   4 +-
 html/Asset/Elements/ShowSummary                |   2 +
 html/Asset/Search/Bulk.html                    |  10 +-
 html/Elements/RT__Asset/ColumnMap              |   4 +-
 static/css/RTx-Assets.css                      | 151 +++++++++++++++++++++++--
 10 files changed, 181 insertions(+), 35 deletions(-)

- Log -----------------------------------------------------------------
commit 6125261bed1803f64e2831c220ff48878e509511
Merge: 3ff07e0 d84f15a
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Wed Jan 22 17:20:18 2014 -0500

    Merge branch '1.0/style'


-----------------------------------------------------------------------