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

[GitHub]

  Branch: refs/heads/feature/integrate-uikit
  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: 68f5200db1d1d5bb323613b43c7bddab9cab7a4e
      https://github.com/Geeklog-Core/geeklog/commit/68f5200db1d1d5bb323613b43c7bddab9cab7a4e
  Author: Tom Homer <tomhomer at gmail.com>
  Date:   2016-06-08 (Wed, 08 Jun 2016)

  Changed paths:
    M public_html/docs/english/theme.html
    M public_html/docs/history

  Log Message:
  -----------
  Updated History and theme docs with latest info


  Commit: e019a2c61f516a689057f2d32a980aaf7708b7cc
      https://github.com/Geeklog-Core/geeklog/commit/e019a2c61f516a689057f2d32a980aaf7708b7cc
  Author: dengenxp <taharaxp at gmail.com>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M public_html/admin/block.php

  Log Message:
  -----------
  Fixed some errors


  Commit: edd0e5fb77531ec2607ead7f3dd14d63c93855e1
      https://github.com/Geeklog-Core/geeklog/commit/edd0e5fb77531ec2607ead7f3dd14d63c93855e1
  Author: dengenxp <taharaxp at gmail.com>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M public_html/admin/block.php

  Log Message:
  -----------
  Fixed a bug where a SQL error occurs when click an upward arrow icon on the block admin list table


  Commit: ab9b7a02540403b213ecefaddfa6d9461eda6a1e
      https://github.com/Geeklog-Core/geeklog/commit/ab9b7a02540403b213ecefaddfa6d9461eda6a1e
  Author: dengenxp <taharaxp at gmail.com>
  Date:   2016-06-11 (Sat, 11 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/docs/english/theme.html
    M public_html/docs/history
    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/integrate-uikit


Compare: https://github.com/Geeklog-Core/geeklog/compare/4b409b91c7ad...ab9b7a025404