[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5dbc08: Added error reporting settings to config.sample.in...

[Rouslan Placella]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 5dbc0873ac3a3ad83fcbd5a9da1c888a76b8ecd3
      https://github.com/phpmyadmin/phpmyadmin/commit/5dbc0873ac3a3ad83fcbd5a9da1c888a76b8ecd3
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M config.sample.inc.php
    M libraries/config.default.php

  Log Message:
  -----------
  Added error reporting settings to config.sample.inc.php and to the libraries/config.default.php


  Commit: 8f4ff6b8c92236657b9d5d4d0b7a553aa9acabe6
      https://github.com/phpmyadmin/phpmyadmin/commit/8f4ff6b8c92236657b9d5d4d0b7a553aa9acabe6
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M doc/config.rst
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php

  Log Message:
  -----------
  Added Error reporting settings for deployers with docs

Enabling and disabling settings for error reporting has been added to the setup
script as well as to the sample configuration file and to the config.rst file in
the docs.


  Commit: e6d6e336c4520b20486890db5039a2835a166a5c
      https://github.com/phpmyadmin/phpmyadmin/commit/e6d6e336c4520b20486890db5039a2835a166a5c
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-14 (Fri, 14 Jun 2013)

  Changed paths:
    M ChangeLog
    M libraries/bookmark.lib.php
    M libraries/config.default.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/parse_analyze.lib.php
    A libraries/server_status_monitor.lib.php
    M libraries/sqlparser.lib.php
    M po/da.po
    M po/id.po
    M po/ur.po
    M server_status_monitor.php
    M sql.php
    M tbl_zoom_select.php
    A test/classes/plugin/import/ImportMediawiki_test.php
    A test/classes/plugin/import/ImportShp_test.php
    A test/classes/plugin/import/ImportXml_test.php
    A test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    A test/classes/plugin/transformations/Text_Plain_Download_test.php
    A test/classes/plugin/transformations/Text_Plain_External_test.php
    A test/classes/plugin/transformations/Text_Plain_Formatted_test.php
    A test/classes/plugin/transformations/Text_Plain_Hex_test.php
    A test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
    A test/classes/plugin/transformations/Text_Plain_Link_test.php
    A test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php
    A test/classes/plugin/transformations/Text_Plain_Sql_test.php
    A test/classes/plugin/transformations/Text_Plain_Substring_test.php

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


  Commit: 1214e19ad548d14c5f5766d07ce8b2b4c62547d1
      https://github.com/phpmyadmin/phpmyadmin/commit/1214e19ad548d14c5f5766d07ce8b2b4c62547d1
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-15 (Sat, 15 Jun 2013)

  Changed paths:
    M doc/config.rst
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/messages.inc.php
    M libraries/config/user_preferences.forms.php

  Log Message:
  -----------
  Added setting for confirmation before sending error reports


  Commit: 6ddb9458d00a8c89ed12ba1e973249f559445595
      https://github.com/phpmyadmin/phpmyadmin/commit/6ddb9458d00a8c89ed12ba1e973249f559445595
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-18 (Tue, 18 Jun 2013)

  Changed paths:
    A error_report.php
    A js/error_report.js
    M libraries/Header.class.php

  Log Message:
  -----------
  Added error report form

Errors are now being caught and an error report is shown
The error report is being sent to the server if the user
authorises it however the server currently doesnt do
anything with the report. No attempt to anonymize the data
is made at this time.


  Commit: 62071d9aea664a9a0e0c17791ba92ecfc1bdab58
      https://github.com/phpmyadmin/phpmyadmin/commit/62071d9aea664a9a0e0c17791ba92ecfc1bdab58
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M error_report.php
    M js/error_report.js

  Log Message:
  -----------
  Added translation arround strings and error report now being sent to non-existent server


  Commit: a2f9d9cc7e875d4eff6ddbe96d37e009cb31f037
      https://github.com/phpmyadmin/phpmyadmin/commit/a2f9d9cc7e875d4eff6ddbe96d37e009cb31f037
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ChangeLog
    M db_create.php
    M doc/config.rst
    M export.php
    M import.php
    M index.php
    M js/ajax.js
    M js/makegrid.js
    M js/navigation.js
    M libraries/Config.class.php
    M libraries/DisplayResults.class.php
    M libraries/RecentTable.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/iconv_wrapper.lib.php
    A libraries/parse_analyze.inc.php
    R libraries/parse_analyze.lib.php
    M libraries/server_collations.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/sql.lib.php
    M libraries/sqlparser.lib.php
    M pmd_pdf.php
    M pmd_save_pos.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    M server_status_monitor.php
    M sql.php
    M tbl_tracking.php
    M test/classes/navigation/PMA_Node_Column_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/classes/plugin/import/ImportXml_test.php
    A test/classes/plugin/transformations/Image_JPEG_Inline_test.php
    A test/classes/plugin/transformations/Image_Link_test.php
    A test/classes/plugin/transformations/Image_PNG_Inline_test.php
    M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    M test/libraries/PMA_charset_conversion_test.php
    M test/libraries/PMA_iconv_wrapper_test.php
    A test/test_data/phpmyadmin_importXML_For_Testing.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into error_reporting


  Commit: 3b9fad42e09abc62442bdf63675f03d8acd7fce5
      https://github.com/phpmyadmin/phpmyadmin/commit/3b9fad42e09abc62442bdf63675f03d8acd7fce5
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-20 (Thu, 20 Jun 2013)

  Changed paths:
    M scripts/create-release.sh

  Log Message:
  -----------
  Stopped the release script from deleting the original unminified file


  Commit: 3541a6d2b59fcfaedf8250016afd84321211f3b9
      https://github.com/phpmyadmin/phpmyadmin/commit/3541a6d2b59fcfaedf8250016afd84321211f3b9
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M doc/Makefile
    M error_report.php
    M js/error_report.js
    M js/get_scripts.js.php
    M js/messages.php
    M libraries/Scripts.class.php

  Log Message:
  -----------
  error reporting now respects settings


  Commit: 0e6933efdfb44c80cfbf1475f1555db931c50191
      https://github.com/phpmyadmin/phpmyadmin/commit/0e6933efdfb44c80cfbf1475f1555db931c50191
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M doc/Makefile

  Log Message:
  -----------
  Removed changes from Makefile


  Commit: b9bf9e0bcce8b468bef13226919d9b443b629ca9
      https://github.com/phpmyadmin/phpmyadmin/commit/b9bf9e0bcce8b468bef13226919d9b443b629ca9
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ChangeLog
    M browse_foreigners.php
    M db_tracking.php
    M doc/config.rst
    M doc/faq.rst
    R js/jquery/jquery-1.8.3.js
    A js/jquery/jquery-1.8.3.min.js
    R js/jquery/jquery-ui-1.9.2.custom.js
    A js/jquery/jquery-ui-1.9.2.custom.min.js
    M js/server_privileges.js
    M libraries/DisplayResults.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Menu.class.php
    A libraries/StringCType.class.php
    A libraries/StringMB.class.php
    A libraries/StringNative.class.php
    A libraries/StringNativeType.class.php
    M libraries/Util.class.php
    M libraries/charset_conversion.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/display_create_table.lib.php
    M libraries/display_structure.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/relation.lib.php
    M libraries/replication.inc.php
    M libraries/replication_gui.lib.php
    M libraries/schema/User_Schema.class.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.lib.php
    M libraries/server_privileges.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/string.lib.php
    R libraries/string_mb.lib.php
    R libraries/string_native.lib.php
    R libraries/string_type_ctype.lib.php
    R libraries/string_type_native.lib.php
    M libraries/structure.lib.php
    A libraries/tbl_relation.lib.php
    M pmd_general.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    M po/zh_CN.po
    M po/zh_TW.po
    R scripts/compress-js
    M scripts/create-release.sh
    M server_databases.php
    M server_replication.php
    M server_status.php
    M setup/index.php
    M sql.php
    M tbl_relation.php
    M tbl_structure.php
    M tbl_tracking.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_Menu_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/transformations/Text_Plain_Append_test.php
    M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    M test/classes/plugin/transformations/Text_Plain_Download_test.php
    M test/classes/plugin/transformations/Text_Plain_External_test.php
    M test/classes/plugin/transformations/Text_Plain_Hex_test.php
    M test/classes/plugin/transformations/Text_Plain_Longtoipv4_test.php
    M test/libraries/PMA_STR_sub_test.php
    A test/libraries/PMA_StringCType_test.php
    A test/libraries/PMA_StringMB_test.php
    A test/libraries/PMA_StringNativeType_test.php
    A test/libraries/PMA_StringNative_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_operations_test.php
    A test/libraries/PMA_string_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/common/PMA_buildActionTitles_test.php
    M test/libraries/common/PMA_getIcon_test.php
    A test/test_data/phpmyadmin.mediawiki
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

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


  Commit: 0fb14931cd9336d17d4bca1439ab95bb399fe9f3
      https://github.com/phpmyadmin/phpmyadmin/commit/0fb14931cd9336d17d4bca1439ab95bb399fe9f3
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M error_report.php
    M js/error_report.js
    M js/messages.php
    M libraries/Scripts.class.php

  Log Message:
  -----------
  Corrected comments by Rouslan

* Added doc blocks to functions
* Removed syntax error
* Changed string in error report form
* resized error report notification to full screen size


  Commit: 9bc3fd5387581b0ffde7d11f91e0016930970121
      https://github.com/phpmyadmin/phpmyadmin/commit/9bc3fd5387581b0ffde7d11f91e0016930970121
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Now data submision uses proxy settings and file get contents


  Commit: abcfe1a11e03d82a4851b0a6e3d91f8cde1a3b45
      https://github.com/phpmyadmin/phpmyadmin/commit/abcfe1a11e03d82a4851b0a6e3d91f8cde1a3b45
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Data is sent using POST and in json format


  Commit: fa612fe64e7b8cd592675afa44b07e2abe635e47
      https://github.com/phpmyadmin/phpmyadmin/commit/fa612fe64e7b8cd592675afa44b07e2abe635e47
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  removed onclick and used $.fn.on to register callbacks


  Commit: 74933318f32f96c74e5ebcfe410ab356c7ab9f69
      https://github.com/phpmyadmin/phpmyadmin/commit/74933318f32f96c74e5ebcfe410ab356c7ab9f69
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    A js/tracekit.js
    M libraries/Header.class.php

  Log Message:
  -----------
  Added Tracekit to help with stacktrace normalization


  Commit: 7b22b1c6fcf5b53e7c9a8b1ebb28e63c875f7f8e
      https://github.com/phpmyadmin/phpmyadmin/commit/7b22b1c6fcf5b53e7c9a8b1ebb28e63c875f7f8e
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Token now being sent during ajax request scripts


  Commit: e3205f131656bddaaf31035b38681493be9779ea
      https://github.com/phpmyadmin/phpmyadmin/commit/e3205f131656bddaaf31035b38681493be9779ea
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Fixed conditions due to PHP gotchas


  Commit: f7129c929feb529e3ebee59d6993004896c3842f
      https://github.com/phpmyadmin/phpmyadmin/commit/f7129c929feb529e3ebee59d6993004896c3842f
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M js/ajax.js
    M js/error_report.js

  Log Message:
  -----------
  Refactored the error_report.js to make it more readable


  Commit: cc2558b9a7022c7b9eeebd39ff947840dc42efab
      https://github.com/phpmyadmin/phpmyadmin/commit/cc2558b9a7022c7b9eeebd39ff947840dc42efab
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M js/ajax.js

  Log Message:
  -----------
  Fixed js error (typo)


  Commit: 26bab09ef3756e53c90f0f36e49e440fd1e9518d
      https://github.com/phpmyadmin/phpmyadmin/commit/26bab09ef3756e53c90f0f36e49e440fd1e9518d
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  Added function to wrap JQuery.fn.on callback


  Commit: f99f448eb6e5581a331f496be59ee34dbf90fd09
      https://github.com/phpmyadmin/phpmyadmin/commit/f99f448eb6e5581a331f496be59ee34dbf90fd09
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M js/get_scripts.js.php

  Log Message:
  -----------
  Added warning to change back the cache setting


  Commit: 6f84aa5af4f719b886c4cde5775cabfb06ffe2e6
      https://github.com/phpmyadmin/phpmyadmin/commit/6f84aa5af4f719b886c4cde5775cabfb06ffe2e6
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  Removes the error notification correctly


  Commit: 96f038f285f71ec8cdc03bb2f520b26b9b640012
      https://github.com/phpmyadmin/phpmyadmin/commit/96f038f285f71ec8cdc03bb2f520b26b9b640012
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  fixed scenario where error reports may not be sent correctly to error report server


  Commit: 4784086ee3f706be79530a4897d601d7fa59a39d
      https://github.com/phpmyadmin/phpmyadmin/commit/4784086ee3f706be79530a4897d601d7fa59a39d
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M ChangeLog
    M doc/faq.rst
    M js/tbl_relation.js
    M libraries/Table.class.php
    M libraries/build_html_for_db.lib.php
    M libraries/charset_conversion.lib.php
    M libraries/display_create_database.lib.php
    R libraries/gis_visualization.lib.php
    M libraries/operations.lib.php
    M libraries/pmd_common.php
    M libraries/server_common.lib.php
    A libraries/server_databases.lib.php
    A libraries/server_engines.lib.php
    A libraries/server_status_variables.lib.php
    M libraries/sql.lib.php
    A libraries/tbl_gis_visualization.lib.php
    M libraries/tbl_relation.lib.php
    M pmd_relation_upd.php
    M po/el.po
    M po/et.po
    M po/ko.po
    M po/ur.po
    M po/zh_TW.po
    M server_databases.php
    M server_engines.php
    M server_status_variables.php
    M sql.php
    M tbl_gis_visualization.php
    M tbl_relation.php
    A test/classes/plugin/import/ImportCsv_test.php
    A test/classes/plugin/import/ImportSql_test.php
    M test/libraries/PMA_GIS_modifyQuery_test.php
    M test/libraries/PMA_StringCType_test.php
    M test/libraries/PMA_StringNative_test.php
    M test/libraries/PMA_charset_conversion_test.php
    A test/test_data/db_test.csv
    A test/test_data/pma_bookmark.sql
    M themes/original/css/common.css.php
    M themes/pmahomme/css/common.css.php

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


  Commit: 6c242747e5981db491b57d061a6f317a2baba43d
      https://github.com/phpmyadmin/phpmyadmin/commit/6c242747e5981db491b57d061a6f317a2baba43d
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  Really removes the error notification correctly


  Commit: 396184c85a09d4ffde844384419c2bbddc7d3464
      https://github.com/phpmyadmin/phpmyadmin/commit/396184c85a09d4ffde844384419c2bbddc7d3464
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Fixes width issues in firefox


  Commit: fe37de2640dda79704f34b68aeebb308bcfe9ea2
      https://github.com/phpmyadmin/phpmyadmin/commit/fe37de2640dda79704f34b68aeebb308bcfe9ea2
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-06-29 (Sat, 29 Jun 2013)

  Changed paths:
    M doc/config.rst
    M error_report.php
    M libraries/config.default.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M version_check.php

  Log Message:
  -----------
  Removed 'VersionCheck' profix from proxy variables


  Commit: 4e8ea5876dbfa3cd30e7e6899cf143c360968705
      https://github.com/phpmyadmin/phpmyadmin/commit/4e8ea5876dbfa3cd30e7e6899cf143c360968705
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Fixed sending of report to server. Data sent successfully


  Commit: 2c0c621203088826e331b0d5909110946d23bf62
      https://github.com/phpmyadmin/phpmyadmin/commit/2c0c621203088826e331b0d5909110946d23bf62
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Added user operating system and server software


  Commit: 5f60f33e0d043c4c3e69a9da54db49e176b601c9
      https://github.com/phpmyadmin/phpmyadmin/commit/5f60f33e0d043c4c3e69a9da54db49e176b601c9
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Added renaming of proxy variables to change log


  Commit: 0d4faee304fb5959493f039321e5061348ebb6ee
      https://github.com/phpmyadmin/phpmyadmin/commit/0d4faee304fb5959493f039321e5061348ebb6ee
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  Removed long urls from stack trace


  Commit: 841c7c8f2166f784d45afe460e896d7fed0308d2
      https://github.com/phpmyadmin/phpmyadmin/commit/841c7c8f2166f784d45afe460e896d7fed0308d2
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Changed submission url and report key names


  Commit: 92fad83168488979d2687f7ee69f5c72a2173170
      https://github.com/phpmyadmin/phpmyadmin/commit/92fad83168488979d2687f7ee69f5c72a2173170
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-27 (Sat, 27 Jul 2013)

  Changed paths:
    A js/line_counts.php
    M scripts/create-release.sh
    A scripts/line-counts.sh

  Log Message:
  -----------
  Added new script to generate line counts of scripts in the js folder


  Commit: f8fe8e5aa30aade6349e87cda859343dc80878cb
      https://github.com/phpmyadmin/phpmyadmin/commit/f8fe8e5aa30aade6349e87cda859343dc80878cb
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M error_report.php
    M js/error_report.js
    M scripts/line-counts.sh

  Log Message:
  -----------
  Stacktrace now translated if line counts exist


  Commit: e6741318056cf661f9c41d213dc6869ba1f6bb30
      https://github.com/phpmyadmin/phpmyadmin/commit/e6741318056cf661f9c41d213dc6869ba1f6bb30
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M .gitignore
    R js/line_counts.php

  Log Message:
  -----------
  Removed the js/line_counts.php file and added it to gitignore


  Commit: 0e3b830e3e1728d0e075053e63bedf09be097076
      https://github.com/phpmyadmin/phpmyadmin/commit/0e3b830e3e1728d0e075053e63bedf09be097076
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Changed using  to ['cfg'] in error_report.php


  Commit: 005c8953a35dd774ff09abef620deb9abbc27d56
      https://github.com/phpmyadmin/phpmyadmin/commit/005c8953a35dd774ff09abef620deb9abbc27d56
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Removed some useless comments in error_report.php


  Commit: 75ba7b9526c8f50a50f8293d602ecb56c582946f
      https://github.com/phpmyadmin/phpmyadmin/commit/75ba7b9526c8f50a50f8293d602ecb56c582946f
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M scripts/line-counts.sh

  Log Message:
  -----------
  Changed line counts generator to follow phpma file template guidelines


  Commit: b83f0eb463a670ff529fb730d7f11e77a3a501d7
      https://github.com/phpmyadmin/phpmyadmin/commit/b83f0eb463a670ff529fb730d7f11e77a3a501d7
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M ChangeLog
    M README
    M browse_foreigners.php
    M build.xml
    M composer.json
    M config.sample.inc.php
    M db_export.php
    M db_qbe.php
    M db_sql.php
    M db_structure.php
    M doc/config.rst
    M doc/faq.rst
    M doc/require.rst
    M examples/config.manyhosts.inc.php
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M export.php
    M import.php
    M import_status.php
    M index.php
    M js/chart.js
    M js/config.js
    A js/cross_framing_protection.js
    R js/date.js
    M js/functions.js
    M js/messages.php
    M js/navigation.js
    M js/rte.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M js/sql.js
    A js/tbl_find_replace.js
    M js/tbl_zoom_plot_jqplot.js
    R libraries/.htaccess
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/Error_Handler.class.php
    M libraries/File.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/Message.class.php
    M libraries/OutputBuffering.class.php
    M libraries/PDF.class.php
    M libraries/PMA.php
    M libraries/RecentTable.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    A libraries/String.class.php
    A libraries/StringAbstractType.class.php
    A libraries/StringByte.int.php
    M libraries/StringCType.class.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/StringNativeType.class.php
    A libraries/StringType.int.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/advisory_rules.txt
    M libraries/bookmark.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    A libraries/config/Validator.class.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    R libraries/config/validate.lib.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/dbi/DBIMysqli.class.php
    A libraries/display_export.inc.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M libraries/display_import_ajax.lib.php
    M libraries/engines/bdb.lib.php
    M libraries/engines/berkeleydb.lib.php
    M libraries/engines/binlog.lib.php
    M libraries/engines/innobase.lib.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/memory.lib.php
    M libraries/engines/merge.lib.php
    M libraries/engines/mrg_myisam.lib.php
    M libraries/engines/myisam.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/file_listing.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/ip_allow_deny.lib.php
    M libraries/mult_submits.inc.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Event.class.php
    M libraries/navigation/Nodes/Node_Function.class.php
    M libraries/navigation/Nodes/Node_Procedure.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_View.class.php
    M libraries/opendocument.lib.php
    M libraries/operations.lib.php
    M libraries/parse_analyze.inc.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/PluginObserver.class.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/auth/AuthenticationHttp.class.php
    M libraries/plugins/auth/AuthenticationSignon.class.php
    M libraries/plugins/auth/swekey/swekey.auth.lib.php
    M libraries/plugins/export/ExportCsv.class.php
    M libraries/plugins/export/ExportJson.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/import/ImportCsv.class.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportSql.class.php
    M libraries/plugins/import/ImportXml.class.php
    M libraries/plugins/import/README
    M libraries/plugins/transformations/Application_Octetstream_Download.class.php
    M libraries/plugins/transformations/Application_Octetstream_Hex.class.php
    M libraries/plugins/transformations/Image_JPEG_Inline.class.php
    M libraries/plugins/transformations/Image_JPEG_Link.class.php
    M libraries/plugins/transformations/Image_PNG_Inline.class.php
    M libraries/plugins/transformations/TEMPLATE
    M libraries/plugins/transformations/Text_Plain_Append.class.php
    M libraries/plugins/transformations/Text_Plain_Dateformat.class.php
    M libraries/plugins/transformations/Text_Plain_External.class.php
    M libraries/plugins/transformations/Text_Plain_Formatted.class.php
    M libraries/plugins/transformations/Text_Plain_Imagelink.class.php
    M libraries/plugins/transformations/Text_Plain_Link.class.php
    M libraries/plugins/transformations/Text_Plain_Longtoipv4.class.php
    M libraries/plugins/transformations/Text_Plain_Sql.class.php
    M libraries/plugins/transformations/Text_Plain_Substring.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    M libraries/pmd_common.php
    M libraries/properties/options/OptionsPropertyGroup.class.php
    M libraries/relation.lib.php
    M libraries/replication_gui.lib.php
    M libraries/schema/Dia_Relation_Schema.class.php
    M libraries/schema/Eps_Relation_Schema.class.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/Pdf_Relation_Schema.class.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/select_lang.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_plugins.lib.php
    M libraries/server_privileges.lib.php
    A libraries/server_status.lib.php
    A libraries/server_status_advisor.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    M libraries/sqlvalidator.class.php
    A libraries/string.inc.php
    R libraries/string.lib.php
    M libraries/structure.lib.php
    M libraries/sysinfo.lib.php
    M libraries/transformations.lib.php
    M libraries/user_preferences.lib.php
    M navigation.php
    M phpunit.xml.dist
    M pmd_display_field.php
    M pmd_pdf.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    A po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M schema_export.php
    M server_collations.php
    M server_export.php
    M server_plugins.php
    M server_privileges.php
    M server_status.php
    M server_status_advisor.php
    M server_status_monitor.php
    A server_user_groups.php
    R setup/frames/.htaccess
    R setup/lib/.htaccess
    M setup/lib/form_processing.lib.php
    M setup/lib/index.lib.php
    M setup/validate.php
    M sql.php
    M tbl_export.php
    A tbl_find_replace.php
    M tbl_get_field.php
    M tbl_gis_visualization.php
    M tbl_row_action.php
    M tbl_select.php
    M tbl_structure.php
    M tbl_zoom_select.php
    M test/AllSeleniumTests.php
    M test/Environment_test.php
    M test/bootstrap-dist.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_StorageEngine_test.php
    A test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Util_test.php
    A test/classes/config/PMA_FormDisplay_test.php
    M test/classes/config/PMA_Form_test.php
    A test/classes/dbi/DBIMysql_test.php
    A test/classes/dbi/DBIMysqli_test.php
    M test/classes/navigation/PMA_Node_Column_test.php
    M test/classes/navigation/PMA_Node_test.php
    A test/classes/plugin/PMA_PluginManager_test.php
    A test/classes/plugin/auth/PMA_AuthenticationConfig_test.php
    A test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    A test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
    A test/classes/plugin/auth/PMA_AuthenticationSignon_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    A test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    A test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/classes/plugin/transformations/Image_JPEG_Inline_test.php
    M test/classes/plugin/transformations/Image_Link_test.php
    M test/classes/plugin/transformations/Image_PNG_Inline_test.php
    M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    M test/classes/plugin/transformations/Text_Plain_Download_test.php
    M test/classes/plugin/transformations/Text_Plain_External_test.php
    M test/classes/plugin/transformations/Text_Plain_Formatted_test.php
    M test/classes/plugin/transformations/Text_Plain_Hex_test.php
    M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
    M test/classes/plugin/transformations/Text_Plain_Link_test.php
    A test/classes/properties/PMA_PorpertyItem_test.php
    A test/classes/properties/options/PMA_OptionsPropertyGroup_test.php
    A test/classes/properties/options/PMA_OptionsPropertyItem_test.php
    A test/classes/properties/options/PMA_OptionsPropertyOneItem_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertyMainGroup_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertyRootGroup_test.php
    A test/classes/properties/options/groups/PMA_OptionsPropertySubgroup_test.php
    A test/classes/properties/options/items/PMA_PropertyItems_test.php
    A test/classes/properties/plugins/PMA_ExportPluginProperties_test.php
    A test/classes/properties/plugins/PMA_ImportPluginProperties_test.php
    A test/classes/properties/plugins/PMA_PluginPorpertyItem_test.php
    A test/classes/schema/Dia_Relation_Schema_test.php
    A test/classes/schema/Eps_Relation_Schema_test.php
    M test/classes/schema/Export_Relation_Schema_test.php
    A test/classes/schema/Pdf_Relation_Schema_test.php
    A test/classes/schema/Svg_Relation_Schema_test.php
    A test/classes/schema/User_Schema_test.php
    A test/libraries/PMA_ConfigFile_test.php
    A test/libraries/PMA_ConfigGenerator_test.php
    A test/libraries/PMA_FormDisplay_tpl_test.php
    A test/libraries/PMA_Form_Processing_test.php
    A test/libraries/PMA_Index_test.php
    A test/libraries/PMA_SQL_parse_analyze_test.php
    M test/libraries/PMA_SQL_parser_data_test.php
    M test/libraries/PMA_SQL_parser_test.php
    A test/libraries/PMA_SQL_validator_test.php
    R test/libraries/PMA_STR_sub_test.php
    M test/libraries/PMA_StringCType_test.php
    M test/libraries/PMA_StringMB_test.php
    M test/libraries/PMA_StringNativeType_test.php
    M test/libraries/PMA_StringNative_test.php
    A test/libraries/PMA_Tracker_test.php
    A test/libraries/PMA_config_functions_test.php
    A test/libraries/PMA_display_export_test.php
    A test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_mysql_charsets_test.php
    A test/libraries/PMA_relation_cleanup_test.php
    A test/libraries/PMA_relation_test.php
    A test/libraries/PMA_server_binlog_test.php
    A test/libraries/PMA_server_collations_test.php
    A test/libraries/PMA_server_common_test.php
    A test/libraries/PMA_server_databases_test.php
    A test/libraries/PMA_server_engines_test.php
    A test/libraries/PMA_server_plugins_test.php
    A test/libraries/PMA_server_replication_test.php
    A test/libraries/PMA_server_status_advisor_test.php
    A test/libraries/PMA_server_status_monitor_test.php
    A test/libraries/PMA_server_status_test.php
    A test/libraries/PMA_server_status_variables_test.php
    M test/libraries/PMA_string_test.php
    M test/libraries/PMA_transformation_test.php
    A test/libraries/PMA_user_preferences_test.php
    M test/libraries/common/PMA_whichCrlf_test.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/database_interface_test.php
    A test/test_data/db_test.ods
    A test/test_data/db_test_ldi.csv
    M test/theme.php
    M themes/.gitignore
    M themes/original/css/common.css.php
    M themes/original/css/navigation.css.php
    A themes/original/img/b_find_replace.png
    A themes/original/img/b_undo.png
    M themes/original/img/sprites.png
    M themes/original/sprites.lib.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/css/navigation.css.php
    A themes/pmahomme/img/b_find_replace.png
    A themes/pmahomme/img/b_undo.png
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/sprites.lib.php
    M version_check.php
    M view_create.php

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

Conflicts:
	ChangeLog
	doc/config.rst
	js/messages.php
	libraries/config/setup.forms.php
	version_check.php

changed 'libraries/Util.class.php' to accept the newly renamed proxy variables


  Commit: 918b670207068f2f0cfb80dddee083527e3886be
      https://github.com/phpmyadmin/phpmyadmin/commit/918b670207068f2f0cfb80dddee083527e3886be
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M js/ajax.js
    M js/get_scripts.js.php

  Log Message:
  -----------
  Changed the way scripts are loaded from getScript to appending script elements to head


  Commit: 9d38212c065e01e466a8ac6211b52400b40a43e7
      https://github.com/phpmyadmin/phpmyadmin/commit/9d38212c065e01e466a8ac6211b52400b40a43e7
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Changed submission url to new controller


  Commit: dc63ed89c4f6148562f697696112e1b7b0d79685
      https://github.com/phpmyadmin/phpmyadmin/commit/dc63ed89c4f6148562f697696112e1b7b0d79685
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Added url sanitization to remove useless params and get script name for error grouping


  Commit: babca95f9f32a1839a51fe050446a7ce783a95b0
      https://github.com/phpmyadmin/phpmyadmin/commit/babca95f9f32a1839a51fe050446a7ce783a95b0
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  Removed custom get_token method and used the pma method


  Commit: 1bbb3816a8952659a42ab3f4b199d377e8e998fe
      https://github.com/phpmyadmin/phpmyadmin/commit/1bbb3816a8952659a42ab3f4b199d377e8e998fe
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M .gitignore
    M ChangeLog
    M PMAStandard/Sniffs/Files/LineLengthSniff.php
    M README
    M browse_foreigners.php
    M build.xml
    M changelog.php
    M db_create.php
    M db_datadict.php
    M db_export.php
    M db_import.php
    M db_operations.php
    M db_qbe.php
    M db_sql.php
    M db_structure.php
    M db_tracking.php
    M doc/config.rst
    M doc/require.rst
    M doc/setup.rst
    M export.php
    M index.php
    M js/ajax.js
    M js/codemirror/lib/codemirror.js
    M js/codemirror/mode/sql/sql.js
    M js/cross_framing_protection.js
    M js/export.js
    A js/jquery/MIT-LICENSE.txt
    M js/jquery/jquery.svg.js
    A js/jquery/src/README
    A js/jquery/src/jquery-ui/jquery.ui.accordion.js
    A js/jquery/src/jquery-ui/jquery.ui.autocomplete.js
    A js/jquery/src/jquery-ui/jquery.ui.button.js
    A js/jquery/src/jquery-ui/jquery.ui.core.js
    A js/jquery/src/jquery-ui/jquery.ui.datepicker.js
    A js/jquery/src/jquery-ui/jquery.ui.dialog.js
    A js/jquery/src/jquery-ui/jquery.ui.draggable.js
    A js/jquery/src/jquery-ui/jquery.ui.droppable.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-blind.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-bounce.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-clip.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-drop.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-explode.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-fade.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-fold.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-highlight.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-pulsate.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-scale.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-shake.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-slide.js
    A js/jquery/src/jquery-ui/jquery.ui.effect-transfer.js
    A js/jquery/src/jquery-ui/jquery.ui.effect.js
    A js/jquery/src/jquery-ui/jquery.ui.menu.js
    A js/jquery/src/jquery-ui/jquery.ui.mouse.js
    A js/jquery/src/jquery-ui/jquery.ui.position.js
    A js/jquery/src/jquery-ui/jquery.ui.progressbar.js
    A js/jquery/src/jquery-ui/jquery.ui.resizable.js
    A js/jquery/src/jquery-ui/jquery.ui.selectable.js
    A js/jquery/src/jquery-ui/jquery.ui.slider.js
    A js/jquery/src/jquery-ui/jquery.ui.sortable.js
    A js/jquery/src/jquery-ui/jquery.ui.spinner.js
    A js/jquery/src/jquery-ui/jquery.ui.tabs.js
    A js/jquery/src/jquery-ui/jquery.ui.tooltip.js
    A js/jquery/src/jquery-ui/jquery.ui.widget.js
    A js/jquery/src/jquery/ajax.js
    A js/jquery/src/jquery/ajax/jsonp.js
    A js/jquery/src/jquery/ajax/script.js
    A js/jquery/src/jquery/ajax/xhr.js
    A js/jquery/src/jquery/attributes.js
    A js/jquery/src/jquery/callbacks.js
    A js/jquery/src/jquery/core.js
    A js/jquery/src/jquery/css.js
    A js/jquery/src/jquery/data.js
    A js/jquery/src/jquery/deferred.js
    A js/jquery/src/jquery/deprecated.js
    A js/jquery/src/jquery/dimensions.js
    A js/jquery/src/jquery/effects.js
    A js/jquery/src/jquery/event-alias.js
    A js/jquery/src/jquery/event.js
    A js/jquery/src/jquery/intro.js
    A js/jquery/src/jquery/manipulation.js
    A js/jquery/src/jquery/offset.js
    A js/jquery/src/jquery/outro.js
    A js/jquery/src/jquery/queue.js
    A js/jquery/src/jquery/selector-native.js
    A js/jquery/src/jquery/serialize.js
    A js/jquery/src/jquery/sizzle-jquery.js
    A js/jquery/src/jquery/support.js
    A js/jquery/src/jquery/traversing.js
    A js/jquery/src/jquery/wrap.js
    M js/keyhandler.js
    M js/messages.php
    M js/navigation.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    A js/server_user_groups.js
    M js/server_variables.js
    M js/sql.js
    M js/tbl_chart.js
    M js/tbl_find_replace.js
    M js/tbl_relation.js
    M js/tbl_structure.js
    M js/tbl_zoom_plot_jqplot.js
    M libraries/Advisor.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DisplayResults.class.php
    M libraries/File.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/Menu.class.php
    M libraries/Scripts.class.php
    M libraries/ServerStatusData.class.php
    M libraries/Table.class.php
    M libraries/TableSearch.class.php
    M libraries/Theme.class.php
    M libraries/Theme_Manager.class.php
    M libraries/Tracker.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/charset_conversion.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/Form.class.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/config_functions.lib.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_export.lib.php
    A libraries/display_import.inc.php
    M libraries/display_import.lib.php
    M libraries/display_structure.lib.php
    M libraries/engines/bdb.lib.php
    M libraries/engines/berkeleydb.lib.php
    M libraries/engines/binlog.lib.php
    M libraries/engines/innobase.lib.php
    M libraries/engines/innodb.lib.php
    M libraries/engines/memory.lib.php
    M libraries/engines/merge.lib.php
    M libraries/engines/mrg_myisam.lib.php
    M libraries/engines/myisam.lib.php
    M libraries/engines/ndbcluster.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mult_submits.inc.php
    M libraries/navigation/NavigationTree.class.php
    A libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/navigation/Nodes/Node_Event.class.php
    M libraries/navigation/Nodes/Node_Function.class.php
    M libraries/navigation/Nodes/Node_Procedure.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_View.class.php
    M libraries/operations.lib.php
    M libraries/phpseclib/Crypt/AES.php
    M libraries/phpseclib/Crypt/Rijndael.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.lib.php
    M libraries/server_privileges.lib.php
    A libraries/server_status_queries.lib.php
    A libraries/server_variables.lib.php
    R libraries/server_variables_doc.php
    M libraries/special_schema_links.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    A libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/transformations.lib.php
    M pmd_pdf.php
    M pmd_relation_new.php
    M pmd_relation_upd.php
    M pmd_save_pos.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M schema_edit.php
    M schema_export.php
    M scripts/generate-sprites
    A scripts/revision-info
    M server_binlog.php
    M server_collations.php
    M server_databases.php
    M server_engines.php
    M server_import.php
    M server_plugins.php
    M server_privileges.php
    M server_replication.php
    M server_sql.php
    M server_status_queries.php
    M server_user_groups.php
    M server_variables.php
    M setup/lib/ConfigGenerator.class.php
    M setup/scripts.js
    M tbl_change.php
    M tbl_export.php
    M tbl_import.php
    M tbl_move_copy.php
    M tbl_operations.php
    M tbl_printview.php
    M tbl_row_action.php
    M tbl_select.php
    M tbl_sql.php
    M tbl_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_Scripts_test.php
    A test/classes/PMA_TableReplaceSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Theme_test.php
    M test/classes/PMA_Types_Drizzle_test.php
    A test/classes/dbi/DBIDrizzle_test.php
    M test/classes/navigation/PMA_NodeFactory_test.php
    M test/classes/plugin/auth/PMA_AuthenticationHttp_test.php
    A test/classes/plugin/export/PMA_ExportCodegen_test.php
    A test/classes/plugin/export/PMA_ExportCsv_test.php
    A test/classes/plugin/export/PMA_ExportExcel_test.php
    A test/classes/plugin/export/PMA_ExportHtmlword_test.php
    A test/classes/plugin/export/PMA_ExportJson_test.php
    A test/classes/plugin/export/PMA_ExportLatex_test.php
    A test/classes/plugin/export/PMA_ExportMediawiki_test.php
    A test/classes/plugin/export/PMA_ExportOds_test.php
    A test/classes/plugin/export/PMA_ExportOdt_test.php
    A test/classes/plugin/export/PMA_ExportPdf_test.php
    A test/classes/plugin/export/PMA_ExportPhparray_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/transformations/Text_Plain_Substring_test.php
    M test/libraries/PMA_SQL_parse_analyze_test.php
    M test/libraries/PMA_SQL_parser_data_test.php
    M test/libraries/PMA_SQL_parser_test.php
    M test/libraries/PMA_charset_conversion_test.php
    M test/libraries/PMA_iconv_wrapper_test.php
    M test/libraries/PMA_ip_allow_deny_test.php
    M test/libraries/PMA_mime_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_relation_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_collations_test.php
    M test/libraries/PMA_server_common_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_engines_test.php
    M test/libraries/PMA_server_plugins_test.php
    M test/libraries/PMA_server_replication_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    A test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php
    A test/libraries/PMA_server_user_groups_test.php
    A test/libraries/PMA_server_variables_test.php
    A test/libraries/PMA_tbl_relation_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/PMA_zip_test.php
    M test/libraries/common/PMA_formatSql_test.php
    M themes/original/css/common.css.php
    M themes/original/img/sprites.png
    M themes/original/layout.inc.php
    M themes/original/sprites.lib.php
    M themes/pmahomme/css/codemirror.css.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/layout.inc.php
    M themes/pmahomme/sprites.lib.php
    M themes/svg_gradient.php
    M transformation_wrapper.php
    M user_password.php
    M version_check.php
    M view_create.php

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

Conflicts:
	ChangeLog
	libraries/Scripts.class.php
	libraries/config.default.php


  Commit: 3edba72c1f60b8508804d92852cb9d9944869123
      https://github.com/phpmyadmin/phpmyadmin/commit/3edba72c1f60b8508804d92852cb9d9944869123
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M error_report.php
    M js/ajax.js
    M js/error_report.js

  Log Message:
  -----------
  Fixed inconsistencies with error reporting server in report schema


  Commit: 43c8e8c448c84028619c1073f423a05ac344c08b
      https://github.com/phpmyadmin/phpmyadmin/commit/43c8e8c448c84028619c1073f423a05ac344c08b
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-08-31 (Sat, 31 Aug 2013)

  Changed paths:
    M error_report.php
    A libraries/error_report.lib.php

  Log Message:
  -----------
  Refactored error report functions to a library and added doc blocks


  Commit: 088166f0a352d697e171b0361518b3b040ebb262
      https://github.com/phpmyadmin/phpmyadmin/commit/088166f0a352d697e171b0361518b3b040ebb262
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-01 (Sun, 01 Sep 2013)

  Changed paths:
    M .travis.yml
    M ChangeLog
    M README.rst
    M browse_foreigners.php
    M build.xml
    M db_create.php
    M db_datadict.php
    M db_printview.php
    M db_qbe.php
    M db_sql.php
    M db_structure.php
    M doc/config.rst
    M doc/faq.rst
    M doc/require.rst
    M doc/setup.rst
    M export.php
    M gis_data_editor.php
    M import.php
    M index.php
    M js/common.js
    A js/doclinks.js
    M js/functions.js
    M js/gis_data_editor.js
    M js/jquery/jquery-ui-timepicker-addon.js
    M js/makegrid.js
    M js/messages.php
    M js/navigation.js
    M js/server_databases.js
    M js/server_status_monitor.js
    M js/sql.js
    M js/tbl_change.js
    M js/tbl_gis_visualization.js
    M libraries/Advisor.class.php
    M libraries/Config.class.php
    M libraries/DBQbe.class.php
    M libraries/DatabaseInterface.class.php
    M libraries/DbSearch.class.php
    M libraries/DisplayResults.class.php
    M libraries/Error.class.php
    M libraries/Footer.class.php
    M libraries/Header.class.php
    M libraries/Index.class.php
    M libraries/List.class.php
    M libraries/List_Database.class.php
    M libraries/Menu.class.php
    M libraries/PDF.class.php
    M libraries/RecentTable.class.php
    M libraries/ServerStatusData.class.php
    M libraries/String.class.php
    M libraries/StringByte.int.php
    M libraries/StringMB.class.php
    M libraries/StringNative.class.php
    M libraries/TableSearch.class.php
    M libraries/Theme.class.php
    M libraries/Theme_Manager.class.php
    M libraries/Types.class.php
    M libraries/Util.class.php
    M libraries/bookmark.lib.php
    M libraries/build_html_for_db.lib.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/config/Validator.class.php
    M libraries/config/config_functions.lib.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    M libraries/core.lib.php
    M libraries/create_addfield.lib.php
    M libraries/data_dictionary_relations.lib.php
    M libraries/db_common.inc.php
    M libraries/db_info.inc.php
    M libraries/db_table_exists.lib.php
    M libraries/dbi/DBIDrizzle.class.php
    M libraries/dbi/DBIMysqli.class.php
    M libraries/display_change_password.lib.php
    M libraries/display_create_database.lib.php
    M libraries/display_create_table.lib.php
    M libraries/display_export.lib.php
    M libraries/display_import.lib.php
    M libraries/display_indexes.lib.php
    M libraries/display_select_lang.lib.php
    A libraries/display_structure.inc.php
    R libraries/display_structure.lib.php
    M libraries/engines/innobase.lib.php
    M libraries/iconv_wrapper.lib.php
    M libraries/import.lib.php
    M libraries/index.lib.php
    M libraries/information_schema_relations.lib.php
    M libraries/insert_edit.lib.php
    M libraries/mult_submits.inc.php
    A libraries/mult_submits.lib.php
    M libraries/mysql_charsets.inc.php
    M libraries/mysql_charsets.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node.class.php
    M libraries/navigation/Nodes/Node_Column.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/navigation/Nodes/Node_Event.class.php
    M libraries/navigation/Nodes/Node_Function.class.php
    M libraries/navigation/Nodes/Node_Procedure.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_View.class.php
    M libraries/operations.lib.php
    M libraries/plugin_interface.lib.php
    M libraries/plugins/ExportPlugin.class.php
    M libraries/plugins/ImportPlugin.class.php
    M libraries/plugins/auth/AuthenticationConfig.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportSql.class.php
    M libraries/plugins/export/ExportTexytext.class.php
    M libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/InlineTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php
    A libraries/properties/options/items/NumberPropertyItem.class.php
    M libraries/relation.lib.php
    M libraries/replication_gui.lib.php
    M libraries/rte/rte_events.lib.php
    M libraries/rte/rte_footer.lib.php
    M libraries/rte/rte_list.lib.php
    M libraries/rte/rte_main.inc.php
    M libraries/rte/rte_routines.lib.php
    M libraries/rte/rte_triggers.lib.php
    M libraries/schema/Export_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/select_server.lib.php
    M libraries/server_bin_log.lib.php
    M libraries/server_common.inc.php
    M libraries/server_common.lib.php
    M libraries/server_databases.lib.php
    M libraries/server_engines.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status.lib.php
    M libraries/server_status_monitor.lib.php
    M libraries/server_status_queries.lib.php
    M libraries/server_status_variables.lib.php
    M libraries/server_variables.lib.php
    M libraries/sql.lib.php
    M libraries/sql_query_form.lib.php
    M libraries/sqlparser.data.php
    M libraries/sqlparser.lib.php
    M libraries/structure.lib.php
    A libraries/tbl_chart.lib.php
    M libraries/tbl_columns_definition_form.inc.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_common.inc.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/tbl_relation.lib.php
    A libraries/tbl_tracking.lib.php
    M libraries/tcpdf/README.TXT
    M libraries/tcpdf/include/tcpdf_colors.php
    M libraries/tcpdf/include/tcpdf_font_data.php
    M libraries/tcpdf/include/tcpdf_fonts.php
    M libraries/tcpdf/include/tcpdf_images.php
    M libraries/tcpdf/include/tcpdf_static.php
    M libraries/tcpdf/tcpdf.php
    M libraries/tcpdf/tcpdf_autoconfig.php
    M libraries/transformations.lib.php
    M libraries/url_generating.lib.php
    M libraries/user_preferences.lib.php
    M libraries/zip.lib.php
    M phpunit.xml.dist
    M phpunit.xml.nocoverage
    M pmd_general.php
    M pmd_pdf.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M prefs_forms.php
    M prefs_manage.php
    M querywindow.php
    M scripts/create-release.sh
    M server_databases.php
    M server_privileges.php
    M server_sql.php
    M server_variables.php
    M setup/frames/config.inc.php
    M setup/frames/index.inc.php
    M setup/frames/menu.inc.php
    M setup/lib/form_processing.lib.php
    M setup/lib/index.lib.php
    M setup/styles.css
    M setup/validate.php
    M sql.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_chart.php
    M tbl_create.php
    M tbl_find_replace.php
    M tbl_move_copy.php
    M tbl_printview.php
    M tbl_relation.php
    M tbl_row_action.php
    M tbl_select.php
    M tbl_sql.php
    M tbl_structure.php
    M tbl_tracking.php
    M tbl_zoom_select.php
    M test/Environment_test.php
    M test/bootstrap-dist.php
    M test/classes/PMA_Advisor_test.php
    M test/classes/PMA_Config_test.php
    M test/classes/PMA_DBQbe_test.php
    M test/classes/PMA_DbSearch_test.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/PMA_File_test.php
    M test/classes/PMA_Footer_test.php
    M test/classes/PMA_List_Database_test.php
    M test/classes/PMA_Message_test.php
    M test/classes/PMA_PDF_test.php
    M test/classes/PMA_Scripts_test.php
    M test/classes/PMA_TableReplaceSearch_test.php
    M test/classes/PMA_TableSearch_test.php
    M test/classes/PMA_Table_test.php
    M test/classes/PMA_Theme_Manager_test.php
    M test/classes/PMA_Theme_test.php
    M test/classes/PMA_Types_Drizzle_test.php
    M test/classes/PMA_Util_test.php
    M test/classes/dbi/DBIMysql_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/classes/gis/PMA_GIS_Geometrycollection_test.php
    M test/classes/gis/PMA_GIS_Linestring_test.php
    M test/classes/gis/PMA_GIS_Multilinestring_test.php
    M test/classes/gis/PMA_GIS_Multipoint_test.php
    M test/classes/gis/PMA_GIS_Multipolygon_test.php
    M test/classes/gis/PMA_GIS_Point_test.php
    M test/classes/gis/PMA_GIS_Polygon_test.php
    A test/classes/navigation/PMA_Navigation_test.php
    M test/classes/navigation/PMA_NodeFactory_test.php
    M test/classes/navigation/PMA_Node_Column_Container_test.php
    M test/classes/navigation/PMA_Node_Column_test.php
    A test/classes/navigation/PMA_Node_DatabaseChild_test.php
    M test/classes/navigation/PMA_Node_Database_test.php
    M test/classes/navigation/PMA_Node_Event_Container_test.php
    M test/classes/navigation/PMA_Node_Event_test.php
    M test/classes/navigation/PMA_Node_Function_Container_test.php
    M test/classes/navigation/PMA_Node_Function_test.php
    M test/classes/navigation/PMA_Node_Index_Container_test.php
    M test/classes/navigation/PMA_Node_Index_test.php
    M test/classes/navigation/PMA_Node_Procedure_Container_test.php
    M test/classes/navigation/PMA_Node_Procedure_test.php
    M test/classes/navigation/PMA_Node_Table_Container_test.php
    M test/classes/navigation/PMA_Node_Table_test.php
    M test/classes/navigation/PMA_Node_Trigger_Container_test.php
    M test/classes/navigation/PMA_Node_Trigger_test.php
    M test/classes/navigation/PMA_Node_View_Container_test.php
    M test/classes/navigation/PMA_Node_View_test.php
    M test/classes/navigation/PMA_Node_test.php
    M test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
    M test/classes/plugin/export/PMA_ExportCodegen_test.php
    M test/classes/plugin/export/PMA_ExportCsv_test.php
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php
    M test/classes/plugin/export/PMA_ExportJson_test.php
    M test/classes/plugin/export/PMA_ExportLatex_test.php
    M test/classes/plugin/export/PMA_ExportMediawiki_test.php
    M test/classes/plugin/export/PMA_ExportOds_test.php
    M test/classes/plugin/export/PMA_ExportOdt_test.php
    M test/classes/plugin/export/PMA_ExportPdf_test.php
    M test/classes/plugin/export/PMA_ExportPhparray_test.php
    A test/classes/plugin/export/PMA_ExportSql_test.php
    A test/classes/plugin/export/PMA_ExportTexytext_test.php
    A test/classes/plugin/export/PMA_ExportXml_test.php
    A test/classes/plugin/export/PMA_ExportYaml_test.php
    A test/classes/plugin/export/PMA_TableProperty_test.php
    M test/classes/plugin/import/ImportCsv_test.php
    M test/classes/plugin/import/ImportLdi_test.php
    M test/classes/plugin/import/ImportMediawiki_test.php
    M test/classes/plugin/import/ImportOds_test.php
    M test/classes/plugin/import/ImportSql_test.php
    M test/classes/plugin/import/ImportXml_test.php
    M test/classes/plugin/transformations/Image_PNG_Inline_test.php
    M test/classes/plugin/transformations/Text_Plain_Append_test.php
    M test/classes/plugin/transformations/Text_Plain_Dateformat_test.php
    M test/classes/plugin/transformations/Text_Plain_External_test.php
    M test/classes/plugin/transformations/Text_Plain_Imagelink_test.php
    M test/classes/schema/Dia_Relation_Schema_test.php
    M test/classes/schema/Eps_Relation_Schema_test.php
    M test/classes/schema/Pdf_Relation_Schema_test.php
    M test/classes/schema/Svg_Relation_Schema_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    M test/libraries/PMA_build_html_for_db_test.php
    M test/libraries/PMA_display_export_test.php
    M test/libraries/PMA_generateCommonUrl_test.php
    A test/libraries/PMA_insert_edit_test.php
    M test/libraries/PMA_ip_allow_deny_test.php
    A test/libraries/PMA_mult_submits_test.php
    M test/libraries/PMA_operations_test.php
    M test/libraries/PMA_relation_cleanup_test.php
    M test/libraries/PMA_relation_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_engines_test.php
    A test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_server_status_advisor_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_queries_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_status_variables_test.php
    M test/libraries/PMA_server_user_groups_test.php
    M test/libraries/PMA_server_variables_test.php
    A test/libraries/PMA_sql_query_form_test.php
    M test/libraries/PMA_string_test.php
    A test/libraries/PMA_tbl_columns_definition_form_test.php
    M test/libraries/PMA_tbl_relation_test.php
    A test/libraries/PMA_tbl_tracking_test.php
    A test/libraries/PMA_tbl_views_test.php
    M test/libraries/PMA_transformation_test.php
    M test/libraries/PMA_user_preferences_test.php
    M test/libraries/core/PMA_headerLocation_test.php
    M test/libraries/rte/PMA_RTN_getEditorForm_test.php
    M test/libraries/rte/PMA_RTN_getExecuteForm_test.php
    M test/selenium/Helper.php
    M test/selenium/PmaSeleniumCreateDropDatabaseTest.php
    M test/selenium/PmaSeleniumCreateRemoveUserTest.php
    A test/selenium/PmaSeleniumDbEventsTest.php
    A test/selenium/PmaSeleniumDbOperationsTest.php
    A test/selenium/PmaSeleniumDbProceduresTest.php
    A test/selenium/PmaSeleniumDbStructureTest.php
    A test/selenium/PmaSeleniumDbTriggersTest.php
    A test/selenium/PmaSeleniumExportTest.php
    A test/selenium/PmaSeleniumImportTest.php
    M test/selenium/PmaSeleniumLoginTest.php
    M test/selenium/PmaSeleniumPrivilegesTest.php
    A test/selenium/PmaSeleniumServerSettingsTest.php
    A test/selenium/PmaSeleniumTableBrowseTest.php
    A test/selenium/PmaSeleniumTableCreateTest.php
    A test/selenium/PmaSeleniumTableInsertTest.php
    A test/selenium/PmaSeleniumTableOperationsTest.php
    A test/selenium/PmaSeleniumTableStructureTest.php
    R test/selenium/PmaSeleniumTestCase.php
    A test/selenium/PmaSeleniumTrackingTest.php
    M test/selenium/PmaSeleniumXssTest.php
    M test/selenium/TestConfig.php
    A test/test_data/db_import.sql
    A test/test_data/server_import.sql
    A test/test_data/table_import.sql
    M test/theme.php
    M themes/original/css/common.css.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/common.css.php
    M themes/pmahomme/css/navigation.css.php
    M themes/pmahomme/info.inc.php
    M transformation_wrapper.php
    M user_password.php
    M view_create.php
    M view_operations.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into error_reporting

Conflicts:
	ChangeLog


  Commit: fc777c88e24c1fca17f39e36b391cf4d2fc8b85a
      https://github.com/phpmyadmin/phpmyadmin/commit/fc777c88e24c1fca17f39e36b391cf4d2fc8b85a
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-01 (Sun, 01 Sep 2013)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  Added error reporting component to change log


  Commit: 78ae84d055997deb9275fddd4b3425eca8fcb152
      https://github.com/phpmyadmin/phpmyadmin/commit/78ae84d055997deb9275fddd4b3425eca8fcb152
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    R libraries/display_indexes.lib.php
    A libraries/tbl_indexes.lib.php
    M po/zh_CN.po
    M tbl_indexes.php

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


  Commit: ed3171cb8705e6cdc827f7bd8eb9cf7a5acb51ea
      https://github.com/phpmyadmin/phpmyadmin/commit/ed3171cb8705e6cdc827f7bd8eb9cf7a5acb51ea
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    M libraries/Scripts.class.php
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Fixed testcases that test the script class


  Commit: ed00f971f541bdecd654a25b0ca09378598e0938
      https://github.com/phpmyadmin/phpmyadmin/commit/ed00f971f541bdecd654a25b0ca09378598e0938
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    M libraries/error_report.lib.php

  Log Message:
  -----------
  Fixed call to undefined function due to function renaming


  Commit: 7cd2f7a598b87f2c5c6ba94a2ac0a0a809005e74
      https://github.com/phpmyadmin/phpmyadmin/commit/7cd2f7a598b87f2c5c6ba94a2ac0a0a809005e74
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M libraries/Scripts.class.php
    M libraries/error_report.lib.php
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Fixed failing tests


  Commit: daf558637d1ae98a1910943fbd629a043bad4085
      https://github.com/phpmyadmin/phpmyadmin/commit/daf558637d1ae98a1910943fbd629a043bad4085
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M js/error_report.js

  Log Message:
  -----------
  Removed the error throwing function


  Commit: ed4771586f1bdb6e80d4b2502f4e5b07399f784f
      https://github.com/phpmyadmin/phpmyadmin/commit/ed4771586f1bdb6e80d4b2502f4e5b07399f784f
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M js/get_scripts.js.php

  Log Message:
  -----------
  Returned the cache setting to the get_scripts.js.php file


  Commit: b9a0851f115cb4ceb331d60f593635d017e55a5d
      https://github.com/phpmyadmin/phpmyadmin/commit/b9a0851f115cb4ceb331d60f593635d017e55a5d
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M libraries/config/messages.inc.php

  Log Message:
  -----------
  Fixed the extra new line in the messages.inc.php


  Commit: 2bb923284cd5be2fa8c6cd0dcc734bcfcf1b52e7
      https://github.com/phpmyadmin/phpmyadmin/commit/2bb923284cd5be2fa8c6cd0dcc734bcfcf1b52e7
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ChangeLog
    M db_datadict.php
    M export.php
    M js/common.js
    M js/navigation.js
    M js/sql.js
    M libraries/Menu.class.php
    M libraries/Util.class.php
    M libraries/build_html_for_db.lib.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_Table_Container.class.php
    M libraries/navigation/Nodes/Node_View.class.php
    M libraries/navigation/Nodes/Node_View_Container.class.php
    M libraries/server_privileges.lib.php
    A libraries/tbl_printview.lib.php
    M po/pl.po
    M po/pt_BR.po
    M server_privileges.php
    M tbl_printview.php
    M test/classes/navigation/PMA_Node_Database_test.php
    M test/classes/navigation/PMA_Node_Table_Container_test.php
    M test/classes/navigation/PMA_Node_Table_test.php
    M test/classes/navigation/PMA_Node_View_Container_test.php
    M test/classes/navigation/PMA_Node_View_test.php
    M test/libraries/PMA_insert_edit_test.php
    A test/libraries/PMA_tbl_printview_test.php
    M themes/original/css/navigation.css.php
    M themes/pmahomme/css/navigation.css.php

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into error_reporting

Conflicts:
	ChangeLog


  Commit: 7fb6a44c1a8958f45547ce2b1f57072e3511f6ae
      https://github.com/phpmyadmin/phpmyadmin/commit/7fb6a44c1a8958f45547ce2b1f57072e3511f6ae
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M libraries/config/setup.forms.php

  Log Message:
  -----------
  Fixed missing comma


  Commit: 11bf0043d3f485593aea70cafc06edf7d8a1b753
      https://github.com/phpmyadmin/phpmyadmin/commit/11bf0043d3f485593aea70cafc06edf7d8a1b753
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M libraries/error_report.lib.php

  Log Message:
  -----------
  Fixed warning when line counts script not been run


  Commit: b33f0419dfa543f3963f0ba0a08596ef5636429a
      https://github.com/phpmyadmin/phpmyadmin/commit/b33f0419dfa543f3963f0ba0a08596ef5636429a
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M scripts/create-release.sh

  Log Message:
  -----------
  Linecounts script now only run if exists


  Commit: c5d2d51007bba0f612116a287493cd3b7fa9cc7d
      https://github.com/phpmyadmin/phpmyadmin/commit/c5d2d51007bba0f612116a287493cd3b7fa9cc7d
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M error_report.php
    M js/error_report.js

  Log Message:
  -----------
  Error reporting now fails gracefully on dev builds


  Commit: ea8b98b627b61dbf6d0d32d8dad5cde90db3098a
      https://github.com/phpmyadmin/phpmyadmin/commit/ea8b98b627b61dbf6d0d32d8dad5cde90db3098a
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M libraries/error_report.lib.php

  Log Message:
  -----------
  Added function to check if the latest line counts have been generated


  Commit: 39cddaf596c8561423ff4fe7cbf919334d964d0a
      https://github.com/phpmyadmin/phpmyadmin/commit/39cddaf596c8561423ff4fe7cbf919334d964d0a
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M error_report.php

  Log Message:
  -----------
  Fixed type


  Commit: d90126ebd77ae3e8e822a00fedb089fb65effc7a
      https://github.com/phpmyadmin/phpmyadmin/commit/d90126ebd77ae3e8e822a00fedb089fb65effc7a
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    A .coveralls.yml
    M .travis.yml
    M ChangeLog
    M browse_foreigners.php
    M build.xml
    M composer.json
    M db_tracking.php
    M doc/config.rst
    M examples/create_tables.sql
    M examples/create_tables_drizzle.sql
    M export.php
    M index.php
    M js/ajax.js
    M js/functions.js
    M js/makegrid.js
    M js/messages.php
    M js/navigation.js
    M js/rte.js
    M js/server_privileges.js
    M js/server_status_monitor.js
    M libraries/DisplayResults.class.php
    M libraries/Menu.class.php
    M libraries/Table.class.php
    A libraries/browse_foreigners.lib.php
    M libraries/common.inc.php
    M libraries/config.default.php
    M libraries/config/ConfigFile.class.php
    M libraries/create_addfield.lib.php
    M libraries/database_interface.inc.php
    M libraries/db_info.inc.php
    M libraries/display_create_table.lib.php
    M libraries/engines/bdb.lib.php
    M libraries/engines/berkeleydb.lib.php
    M libraries/information_schema_relations.lib.php
    M libraries/insert_edit.lib.php
    M libraries/navigation/NavigationHeader.class.php
    M libraries/navigation/NavigationTree.class.php
    A libraries/navigation/Nodes/Node_Database_Container.class.php
    M libraries/plugins/import/ImportMediawiki.class.php
    M libraries/plugins/import/ImportOds.class.php
    M libraries/plugins/import/ImportShp.class.php
    M libraries/plugins/import/ImportXml.class.php
    M libraries/rte/rte_list.lib.php
    M libraries/sanitizing.lib.php
    M libraries/server_privileges.lib.php
    M libraries/server_status_monitor.lib.php
    A libraries/server_user_groups.lib.php
    A libraries/server_users.lib.php
    M libraries/special_schema_links.lib.php
    M libraries/sql.lib.php
    M libraries/structure.lib.php
    M libraries/tbl_columns_definition_form.lib.php
    M libraries/tbl_gis_visualization.lib.php
    M libraries/tbl_indexes.lib.php
    M libraries/tbl_relation.lib.php
    M libraries/tcpdf/README.TXT
    M libraries/tcpdf/include/tcpdf_static.php
    M libraries/tcpdf/tcpdf.php
    M pmd_display_field.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M schema_edit.php
    R scripts/convert-htmldoc-to-rst.py
    M scripts/create-release.sh
    R scripts/mergepo.py
    R scripts/pending-po
    R scripts/pendingpo.py
    R scripts/update-po-foreign
    M server_privileges.php
    M server_user_groups.php
    M setup/frames/config.inc.php
    M setup/frames/index.inc.php
    M setup/lib/index.lib.php
    M tbl_addfield.php
    M tbl_change.php
    M tbl_get_field.php
    M tbl_relation.php
    M test/bootstrap-dist.php
    M test/classes/PMA_DisplayResults_test.php
    M test/classes/dbi/DBIDrizzle_test.php
    M test/classes/dbi/DBIMysql_test.php
    M test/classes/dbi/DBIMysqli_test.php
    M test/classes/plugin/export/PMA_ExportHtmlword_test.php
    M test/classes/plugin/import/ImportShp_test.php
    M test/engines/PMA_StorageEngine_bdb_test.php
    M test/engines/PMA_StorageEngine_pbxt_test.php
    M test/libraries/PMA_Index_test.php
    M test/libraries/PMA_Tracker_test.php
    M test/libraries/PMA_relation_test.php
    M test/libraries/PMA_server_binlog_test.php
    M test/libraries/PMA_server_databases_test.php
    M test/libraries/PMA_server_engines_test.php
    M test/libraries/PMA_server_privileges_test.php
    M test/libraries/PMA_server_status_monitor_test.php
    M test/libraries/PMA_server_status_test.php
    M test/libraries/PMA_server_user_groups_test.php
    A test/libraries/PMA_server_users_test.php
    A test/libraries/PMA_tbl_chart_test.php
    A test/libraries/PMA_tbl_gis_visualization_test.php
    A test/libraries/PMA_tbl_indexes_test.php
    M test/libraries/PMA_tbl_printview_test.php
    M test/libraries/PMA_tbl_relation_test.php
    M test/libraries/core/PMA_getTableCount_test_dis.php
    A test/test_data/timezone.shp.zip
    A test/travis.php.ini
    M themes/pmahomme/css/codemirror.css.php
    M themes/pmahomme/css/common.css.php
    M url.php
    M view_operations.php

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

Conflicts:
	ChangeLog
	scripts/create-release.sh


  Commit: ef2623db2062b62a87dd164e34075e496e1108e8
      https://github.com/phpmyadmin/phpmyadmin/commit/ef2623db2062b62a87dd164e34075e496e1108e8
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M libraries/error_report.lib.php

  Log Message:
  -----------
  Fixed error submission url and changed to constant


  Commit: a2659d7ba596171dbbf510f120c369d17afa138c
      https://github.com/phpmyadmin/phpmyadmin/commit/a2659d7ba596171dbbf510f120c369d17afa138c
  Author: Mohamed Ashraf <mohamed.ashraf.213 at gmail.com>
  Date:   2013-09-29 (Sun, 29 Sep 2013)

  Changed paths:
    M ChangeLog
    M doc/setup.rst
    M export.php
    M gis_data_editor.php
    M index.php
    M js/functions.js
    M js/navigation.js
    M js/pmd/history.js
    M js/rte.js
    M js/tbl_gis_visualization.js
    M js/tbl_relation.js
    M libraries/DatabaseInterface.class.php
    M libraries/check_user_privileges.lib.php
    M libraries/common.inc.php
    M libraries/config/FormDisplay.class.php
    M libraries/config/FormDisplay.tpl.php
    M libraries/db_info.inc.php
    M libraries/dbi/DBIDummy.class.php
    M libraries/display_create_table.lib.php
    M libraries/engines/pbxt.lib.php
    M libraries/navigation/Navigation.class.php
    M libraries/navigation/NavigationTree.class.php
    M libraries/navigation/Nodes/Node_Database.class.php
    M libraries/navigation/Nodes/Node_DatabaseChild.class.php
    M libraries/navigation/Nodes/Node_Table.class.php
    M libraries/navigation/Nodes/Node_Table_Container.class.php
    M libraries/navigation/Nodes/Node_View_Container.class.php
    M libraries/plugins/auth/AuthenticationCookie.class.php
    M libraries/plugins/export/ExportXml.class.php
    M libraries/plugins/import/ImportLdi.class.php
    M libraries/plugins/transformations/abstract/SubstringTransformationsPlugin.class.php
    M libraries/rte/rte_routines.lib.php
    M libraries/schema/Svg_Relation_Schema.class.php
    M libraries/schema/User_Schema.class.php
    M libraries/structure.lib.php
    M libraries/tbl_relation.lib.php
    M libraries/tbl_tracking.lib.php
    M pmd_general.php
    M po/af.po
    M po/ar.po
    M po/az.po
    M po/be.po
    M po/be at latin.po
    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/ia.po
    M po/id.po
    M po/it.po
    M po/ja.po
    M po/ka.po
    M po/kk.po
    M po/kn.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/pa.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/sr at latin.po
    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/uz at latin.po
    M po/vls.po
    M po/zh_CN.po
    M po/zh_TW.po
    M prefs_manage.php
    M setup/index.php
    M tbl_operations.php
    A test/classes/schema/Svg_test.php
    M test/libraries/PMA_FormDisplay_tpl_test.php
    A test/libraries/PMA_display_change_password_test.php
    A test/libraries/PMA_display_create_table_test.php
    A test/libraries/PMA_select_server_test.php
    M test/libraries/PMA_server_privileges_test.php
    A test/libraries/PMA_structure_test.php
    M test/libraries/PMA_user_preferences_test.php
    A themes/original/img/lightbulb.png
    A themes/original/img/lightbulb_off.png
    A themes/original/img/s_info.png
    M themes/original/img/sprites.png
    M themes/original/sprites.lib.php
    A themes/pmahomme/img/lightbulb.png
    A themes/pmahomme/img/lightbulb_off.png
    M themes/pmahomme/img/sprites.png
    M themes/pmahomme/sprites.lib.php

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

Conflicts:
	ChangeLog


  Commit: d5091e6d6f2427dc859b9eab3c3cea01530d1e4b
      https://github.com/phpmyadmin/phpmyadmin/commit/d5091e6d6f2427dc859b9eab3c3cea01530d1e4b
  Author: Rouslan Placella <rouslan at placella.com>
  Date:   2013-09-29 (Sun, 29 Sep 2013)

  Changed paths:
    M .gitignore
    M ChangeLog
    M config.sample.inc.php
    M doc/config.rst
    A error_report.php
    M js/ajax.js
    A js/error_report.js
    M js/get_scripts.js.php
    M js/messages.php
    A js/tracekit.js
    M libraries/Header.class.php
    M libraries/Scripts.class.php
    M libraries/Util.class.php
    M libraries/config.default.php
    M libraries/config.values.php
    M libraries/config/messages.inc.php
    M libraries/config/setup.forms.php
    M libraries/config/user_preferences.forms.php
    A libraries/error_report.lib.php
    M scripts/create-release.sh
    A scripts/line-counts.sh
    M test/classes/PMA_Scripts_test.php

  Log Message:
  -----------
  Merge pull request #671 from m0hamed/error_reporting

Error reporting Component


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/accd98b4669a...d5091e6d6f24