[geeklog-hg] [Geeklog-Core/geeklog] ba6883: Updated Block Manager, Display, and Editor with De...

[GitHub]

  Branch: refs/heads/feature/url-routing
  Home:   https://github.com/Geeklog-Core/geeklog
  Commit: ba6883203d3d32004fb4e8071b82323306bf5f51
      https://github.com/Geeklog-Core/geeklog/commit/ba6883203d3d32004fb4e8071b82323306bf5f51
  Author: Tom Homer <tomhomer at gmail.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M language/english_utf-8.php
    M language/japanese_utf-8.php
    M public_html/admin/block.php
    M public_html/layout/denim/admin/block/blockeditor.thtml
    M public_html/layout/denim/admin/block/defaultblockeditor.thtml
    M public_html/layout/modern_curve/admin/block/blockeditor.thtml
    M public_html/layout/modern_curve/admin/block/defaultblockeditor.thtml
    M public_html/layout/professional/admin/block/blockeditor.thtml
    M public_html/layout/professional/admin/block/defaultblockeditor.thtml
    M public_html/layout/professional_css/admin/block/blockeditor.thtml
    M public_html/layout/professional_css/admin/block/defaultblockeditor.thtml
    M public_html/lib-common.php
    M sql/mssql_tableanddata.php
    M sql/mysql_tableanddata.php
    M sql/pgsql_tableanddata.php
    M sql/updates/mssql_2.1.1_to_2.1.2.php
    M sql/updates/mysql_2.1.1_to_2.1.2.php
    M sql/updates/pgsql_2.1.1_to_2.1.2.php
    M system/classes/device.class.php
    M system/lib-admin.php
    M system/lib-block.php

  Log Message:
  -----------
  Updated Block Manager, Display, and Editor with Device detection features

Updated block manager. Consolidated lists and added position and device
column in list.

Updated block editor so user can save none position and device type to
display block for (All, Mobile, or Computer). Added device column to
Blocks table

Updated ADMIN_list function. $header_arr can now have 'sort_field'
option which allows you to specify one or more columns to sort the list
on if the specified column header is clicked.

Completion of feature request #683


  Commit: 11d9a90633d62db124bc11bdfbf167708f732f1e
      https://github.com/Geeklog-Core/geeklog/commit/11d9a90633d62db124bc11bdfbf167708f732f1e
  Author: Kenji ITO <mystralkk at gmail.com>
  Date:   2016-06-08 (Wed, 08 Jun 2016)

  Changed paths:
    M language/english_utf-8.php
    M language/japanese_utf-8.php
    M public_html/admin/block.php
    M public_html/layout/denim/admin/block/blockeditor.thtml
    M public_html/layout/denim/admin/block/defaultblockeditor.thtml
    M public_html/layout/modern_curve/admin/block/blockeditor.thtml
    M public_html/layout/modern_curve/admin/block/defaultblockeditor.thtml
    M public_html/layout/professional/admin/block/blockeditor.thtml
    M public_html/layout/professional/admin/block/defaultblockeditor.thtml
    M public_html/layout/professional_css/admin/block/blockeditor.thtml
    M public_html/layout/professional_css/admin/block/defaultblockeditor.thtml
    M public_html/lib-common.php
    M sql/mssql_tableanddata.php
    M sql/mysql_tableanddata.php
    M sql/pgsql_tableanddata.php
    M sql/updates/mssql_2.1.1_to_2.1.2.php
    M sql/updates/mysql_2.1.1_to_2.1.2.php
    M sql/updates/pgsql_2.1.1_to_2.1.2.php
    M system/classes/device.class.php
    M system/lib-admin.php
    M system/lib-block.php

  Log Message:
  -----------
  Merge branch 'master' into feature/url-routing


Compare: https://github.com/Geeklog-Core/geeklog/compare/c4ffc7f8ad96...11d9a90633d6