Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: def60af6e0d1fde4787ff0b8c6f48bc4a719ec5c
      
https://github.com/phpmyadmin/phpmyadmin/commit/def60af6e0d1fde4787ff0b8c6f48bc4a719ec5c
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M libraries/common.lib.php

  Log Message:
  -----------
  Various coding style improvements


  Commit: 1427b2f2de9084b52e2b92a82baa0713b035567e
      
https://github.com/phpmyadmin/phpmyadmin/commit/1427b2f2de9084b52e2b92a82baa0713b035567e
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M libraries/core.lib.php
    M main.php
    M server_status.php
    M server_variables.php

  Log Message:
  -----------
  Fix function names: PMA_AddJSVar -> PMA_addJSVar


  Commit: 8649b8263ca623534015b170e83d6c6c5eca0ecd
      
https://github.com/phpmyadmin/phpmyadmin/commit/8649b8263ca623534015b170e83d6c6c5eca0ecd
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M libraries/common.inc.php
    M libraries/core.lib.php

  Log Message:
  -----------
  Fix function names: PMA_AddJSCode -> PMA_addJSCode


  Commit: a8a6c69c96a86c0de60a77e88dbfd0856224353d
      
https://github.com/phpmyadmin/phpmyadmin/commit/a8a6c69c96a86c0de60a77e88dbfd0856224353d
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-05-27 (Sun, 27 May 2012)

  Changed paths:
    M ChangeLog
    M browse_foreigners.php
    M js/functions.js
    A js/jqplot/jquery.jqplot.js
    A js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
    A js/jqplot/plugins/jqplot.canvasTextRenderer.js
    A js/jqplot/plugins/jqplot.cursor.js
    A js/jqplot/plugins/jqplot.dateAxisRenderer.js
    A js/jqplot/plugins/jqplot.highlighter.js
    A js/jqplot/plugins/jqplot.pieRenderer.js
    M js/messages.php
    M js/sql.js
    R js/tbl_zoom_plot.js
    A js/tbl_zoom_plot_jqplot.js
    M libraries/Theme.class.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/[email protected]
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/[email protected]
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/[email protected]
    M po/zh_CN.po
    M po/zh_TW.po
    M server_status.php
    M sql.php
    M tbl_zoom_select.php
    M themes/original/css/common.css.php
    A themes/pmahomme/css/jqplot.css.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin


  Commit: 15b60bd2d4651672ae999754a413f4c6a1c57dc4
      
https://github.com/phpmyadmin/phpmyadmin/commit/15b60bd2d4651672ae999754a413f4c6a1c57dc4
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M libraries/tbl_properties.inc.php

  Log Message:
  -----------
  Revert to avoid notices on undefined variables


  Commit: 27e6c2ac1b83b4c9be3c73a442be0e5b6c938451
      
https://github.com/phpmyadmin/phpmyadmin/commit/27e6c2ac1b83b4c9be3c73a442be0e5b6c938451
  Author: Madhura Jayaratne <[email protected]>
  Date:   2012-05-29 (Tue, 29 May 2012)

  Changed paths:
    M Documentation.html
    M libraries/Theme.class.php
    M libraries/common.lib.php
    M libraries/config.default.php
    M libraries/display_tbl.lib.php
    M libraries/insert_edit.lib.php
    M libraries/server_synchronize.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    M libraries/tbl_select.lib.php
    M phpmyadmin.css.php
    M pmd_general.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/[email protected]
    M po/bg.po
    M po/bn.po
    M po/br.po
    M po/bs.po
    M po/ca.po
    M po/ckb.po
    M po/cs.po
    M po/cy.po
    M po/da.po
    M po/de.po
    M po/el.po
    M po/en_GB.po
    M po/es.po
    M po/et.po
    M po/eu.po
    M po/fa.po
    M po/fi.po
    M po/fr.po
    M po/gl.po
    M po/he.po
    M po/hi.po
    M po/hr.po
    M po/hu.po
    M po/hy.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/ko.po
    M po/lt.po
    M po/lv.po
    M po/mk.po
    M po/ml.po
    M po/mn.po
    M po/ms.po
    M po/nb.po
    M po/nl.po
    M po/phpmyadmin.pot
    M po/pl.po
    M po/pt.po
    M po/pt_BR.po
    M po/ro.po
    M po/ru.po
    M po/si.po
    M po/sk.po
    M po/sl.po
    M po/sq.po
    M po/sr.po
    M po/[email protected]
    M po/sv.po
    M po/ta.po
    M po/te.po
    M po/th.po
    M po/tk.po
    M po/tr.po
    M po/tt.po
    M po/ug.po
    M po/uk.po
    M po/ur.po
    M po/uz.po
    M po/[email protected]
    M po/zh_CN.po
    M po/zh_TW.po
    M tbl_printview.php
    M tbl_select.php
    M tbl_zoom_select.php
    M themes/original/css/common.css.php
    R themes/original/img/pmd/1.png
    R themes/original/img/pmd/2.png
    R themes/original/img/pmd/2leftarrow.png
    R themes/original/img/pmd/2leftarrow_m.png
    R themes/original/img/pmd/2rightarrow.png
    R themes/original/img/pmd/2rightarrow_m.png
    R themes/original/img/pmd/3.png
    R themes/original/img/pmd/4.png
    R themes/original/img/pmd/5.png
    R themes/original/img/pmd/6.png
    R themes/original/img/pmd/7.png
    R themes/original/img/pmd/8.png
    R themes/original/img/pmd/FieldKey_small.png
    R themes/original/img/pmd/Field_small.png
    R themes/original/img/pmd/Field_small_char.png
    R themes/original/img/pmd/Field_small_date.png
    R themes/original/img/pmd/Field_small_int.png
    R themes/original/img/pmd/Header.png
    R themes/original/img/pmd/Header_Linked.png
    R themes/original/img/pmd/and_icon.png
    R themes/original/img/pmd/ang_direct.png
    R themes/original/img/pmd/bord.png
    R themes/original/img/pmd/bottom.png
    R themes/original/img/pmd/def.png
    R themes/original/img/pmd/display_field.png
    R themes/original/img/pmd/downarrow1.png
    R themes/original/img/pmd/downarrow2.png
    R themes/original/img/pmd/downarrow2_m.png
    R themes/original/img/pmd/exec.png
    R themes/original/img/pmd/exec_small.png
    R themes/original/img/pmd/favicon.ico
    R themes/original/img/pmd/grid.png
    R themes/original/img/pmd/help.png
    R themes/original/img/pmd/help_relation.png
    R themes/original/img/pmd/left_panel_butt.png
    R themes/original/img/pmd/left_panel_tab.png
    R themes/original/img/pmd/minus.png
    R themes/original/img/pmd/or_icon.png
    R themes/original/img/pmd/pdf.png
    R themes/original/img/pmd/plus.png
    R themes/original/img/pmd/query_builder.png
    R themes/original/img/pmd/relation.png
    R themes/original/img/pmd/reload.png
    R themes/original/img/pmd/resize.png
    R themes/original/img/pmd/rightarrow1.png
    R themes/original/img/pmd/rightarrow2.png
    R themes/original/img/pmd/save.png
    R themes/original/img/pmd/small_tab.png
    R themes/original/img/pmd/table.png
    R themes/original/img/pmd/toggle_lines.png
    R themes/original/img/pmd/top_panel.png
    R themes/original/img/pmd/uparrow2_m.png
    A themes/pmahomme/css/codemirror.css.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/css/pmd.css.php

  Log Message:
  -----------
  Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Conflicts:
        libraries/common.lib.php


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9945415...27e6c2a
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to