Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 16, 2012
  1. @realityking

    Undo a "fix"

    realityking authored
  2. @realityking

    Reduce use of JRequest.

    realityking authored
  3. @realityking

    Merge branch 'master' into template9

    realityking authored
    Conflicts:
    	administrator/components/com_config/views/component/tmpl/default.php
    	administrator/components/com_content/views/article/tmpl/edit.php
    	administrator/components/com_media/views/media/tmpl/default.php
    	administrator/modules/mod_status/tmpl/default.php
    	installation/controllers/setup.json.php
    	libraries/cms/html/bootstrap.php
  4. @kyleledbetter @realityking

    Add the bootstrap changes for plugins.

    kyleledbetter authored realityking committed
  5. @kyleledbetter @realityking
  6. @kyleledbetter @realityking

    Add the bootstrap changes to the platform.

    kyleledbetter authored realityking committed
    Note none of these have been submitted upstream yet so they may change a lot.
  7. @kyleledbetter @realityking

    Add JUI.

    kyleledbetter authored realityking committed
  8. @realityking
  9. @realityking
  10. @realityking
  11. @realityking
  12. @realityking
  13. @realityking

    minor fixes

    realityking authored
  14. @realityking
  15. @realityking

    Merge branch 'master' into template9

    realityking authored
    Conflicts:
    	administrator/components/com_admin/views/sysinfo/view.html.php
    	administrator/components/com_content/config.xml
    	administrator/components/com_modules/helpers/modules.php
    	administrator/components/com_modules/models/module.php
    	administrator/components/com_weblinks/config.xml
    	administrator/templates/hathor/css/colour_blue.css
    	administrator/templates/hathor/css/colour_standard.css
    	administrator/templates/hathor/css/template.css
    	installation/controllers/setup.json.php
    	installation/models/fields/sample.php
    	plugins/editors-xtd/pagebreak/pagebreak.php
  16. @realityking

    More fixes

    realityking authored
  17. @realityking

    Pick up some code style improvements from the UX branch. This will ma…

    realityking authored
    …ke the final diff easier to read.
    
    Also enhance the CSS with additional browser prefixes.
  18. @realityking
  19. @realityking

    More fixes.

    realityking authored
  20. @mbabker

    Hathor menu tweaks

    mbabker authored
  21. @realityking

    Fix #115

    realityking authored
  22. @realityking

    More cleanup work.

    realityking authored
Commits on Aug 15, 2012
  1. @realityking

    Merge branch 'master' into template9

    realityking authored
    Conflicts:
    	installation/language/az-AZ/az-AZ.ini
    	installation/language/cs-CZ/cs-CZ.ini
    	installation/language/fa-IR/fa-IR.ini
    	installation/language/gl-ES/gl-ES.ini
    	installation/language/mn-MN/mn-MN.ini
    	installation/language/pl-PL/pl-PL.ini
    	installation/language/sk-SK/sk-SK.ini
    	installation/language/sr-YU/sr-YU.ini
    	installation/language/zh-CN/zh-CN.ini
  2. @realityking
  3. @realityking

    Fixes from the UX branch to installation languages

    realityking authored
    Fix az-AZ.ini, cs-CZ.ini, fa-IR.ini, gl-ES.ini, mn-MN.ini, mn-MN.xml, pl-PL.ini, pl-PL.xml, sk-SK.ini, sk-SK.xml, sr-YU.ini, ur-PK.xml, zh-CN.ini being CRLF.
    Fix ko-KR.xml being CR
  4. @realityking

    Some last minute fixes.

    realityking authored
  5. @realityking

    More CS.

    realityking authored
  6. @realityking

    Merge branch 'master' into template9

    realityking authored
    Conflicts:
    	administrator/components/com_installer/views/languages/tmpl/default.php
  7. @realityking

    Fix codestyle.

    realityking authored
  8. @realityking
  9. @realityking

    too much whitespace...

    realityking authored
  10. @mbabker @infograf768

    #^ [#28918] Abstract FinderIndexer class for improved database support.

    mbabker authored infograf768 committed
    Thanks Michael
  11. @realityking

    Fix codestyle (again).

    realityking authored
  12. @mbabker @infograf768

    #^ [#28918] Abstract FinderIndexer class for improved database support.

    mbabker authored infograf768 committed
    Thanks Michael
  13. @realityking

    Merge branch 'master' into template9

    realityking authored
    Conflicts:
    	modules/mod_login/tmpl/default.php
    	modules/mod_login/tmpl/logout.php
Something went wrong with that request. Please try again.