- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d578bd: Clarify code for ForceSSL
by Michal Čihař 20 Jun '12

20 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d578bda1009af54a8d32f11ba75f78aeddedb68b https://github.com/phpmyadmin/phpmyadmin/commit/d578bda1009af54a8d32f11ba75… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M libraries/common.inc.php Log Message: ----------- Clarify code for ForceSSL Conflicts: libraries/common.inc.php Commit: 6fe86fc54919ac756bc5f0ee1229671259e1f490 https://github.com/phpmyadmin/phpmyadmin/commit/6fe86fc54919ac756bc5f0ee122… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M libraries/common.inc.php Log Message: ----------- More clever URL rewriting with ForceSSL (bug #3510196) Commit: 2e354b7b7551ac0c310bb05666b624936e103a62 https://github.com/phpmyadmin/phpmyadmin/commit/2e354b7b7551ac0c310bb05666b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M ChangeLog Log Message: ----------- Document backport Commit: 75f3174436841e0ca729553238a7a457ada7b46a https://github.com/phpmyadmin/phpmyadmin/commit/75f3174436841e0ca729553238a… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7f6e42295245...75f317443684

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d578bd: Clarify code for ForceSSL
by Michal Čihař 20 Jun '12

20 Jun '12

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d578bda1009af54a8d32f11ba75f78aeddedb68b https://github.com/phpmyadmin/phpmyadmin/commit/d578bda1009af54a8d32f11ba75… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M libraries/common.inc.php Log Message: ----------- Clarify code for ForceSSL Conflicts: libraries/common.inc.php Commit: 6fe86fc54919ac756bc5f0ee1229671259e1f490 https://github.com/phpmyadmin/phpmyadmin/commit/6fe86fc54919ac756bc5f0ee122… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M libraries/common.inc.php Log Message: ----------- More clever URL rewriting with ForceSSL (bug #3510196) Commit: 2e354b7b7551ac0c310bb05666b624936e103a62 https://github.com/phpmyadmin/phpmyadmin/commit/2e354b7b7551ac0c310bb05666b… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-20 (Wed, 20 Jun 2012) Changed paths: M ChangeLog Log Message: ----------- Document backport Compare: https://github.com/phpmyadmin/phpmyadmin/compare/20a6d3b1c6b1...2e354b7b7551

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7f6e42: Fix possibly undefined $return_to_sql_query in ins...
by J.M 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7f6e422952454dbe02924ffecd20cb1d1c1ff06a https://github.com/phpmyadmin/phpmyadmin/commit/7f6e422952454dbe02924ffecd2… Author: J.M <me(a)mynetx.net> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fix possibly undefined $return_to_sql_query in insert_edit.lib.php

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4ccf9b: Fix sql results display in database search while d...
by Marc Delisle 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4ccf9b29b217d4dadadc496d4427695f490be7ac https://github.com/phpmyadmin/phpmyadmin/commit/4ccf9b29b217d4dadadc496d442… Author: Atul Pratap Singh <atulpratapsingh05(a)gmail.com> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M js/db_search.js Log Message: ----------- Fix sql results display in database search while deleting from search results Commit: 6db3d79ce050a4081a0e46d316debd083be7f2ed https://github.com/phpmyadmin/phpmyadmin/commit/6db3d79ce050a4081a0e46d316d… Author: Marc Delisle <marc(a)infomarc.info> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M js/db_search.js Log Message: ----------- Merge branch 'atul' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/976254709644...6db3d79ce050

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0941d2: Various coding style improvements
by Madhura Jayaratne 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0941d2c6644cd622d41f8f59d925f352110ac37e https://github.com/phpmyadmin/phpmyadmin/commit/0941d2c6644cd622d41f8f59d92… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-06-10 (Sun, 10 Jun 2012) Changed paths: M tbl_replace.php Log Message: ----------- Various coding style improvements Commit: baa0643696ac4c7504ad6fcf3ea872ecffcb4368 https://github.com/phpmyadmin/phpmyadmin/commit/baa0643696ac4c7504ad6fcf3ea… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-06-10 (Sun, 10 Jun 2012) Changed paths: M ChangeLog M config.sample.inc.php M db_qbe.php M js/functions.js M js/server_status.js M js/server_variables.js M js/tbl_zoom_plot_jqplot.js M libraries/insert_edit.lib.php M libraries/schema/Pdf_Relation_Schema.class.php M po/de.po M po/sv.po M tbl_replace.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: 15a436de74e50994c8d494d752c170a7c5d0d42e https://github.com/phpmyadmin/phpmyadmin/commit/15a436de74e50994c8d494d752c… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-06-13 (Wed, 13 Jun 2012) Changed paths: M ChangeLog M Documentation.html M browse_foreigners.php M chk_rel.php M db_create.php M db_datadict.php M db_events.php M db_export.php M db_import.php M db_operations.php M db_printview.php M db_qbe.php M db_routines.php M db_search.php M db_sql.php M db_structure.php M db_tables_search.php M db_tracking.php M db_triggers.php M export.php M gis_data_editor.php M import.php M index.php M js/common.js M js/config.js M js/cross_framing_protection.js M js/db_operations.js M js/db_search.js M js/db_structure.js M js/functions.js M js/gis_data_editor.js M js/makegrid.js M js/navigation.js M js/server_databases.js M js/server_privileges.js M js/server_status.js M js/server_status_monitor.js M js/server_variables.js M js/sql.js M js/tbl_change.js M js/tbl_select.js M js/tbl_structure.js M js/tbl_zoom_plot_jqplot.js M libraries/Error.class.php M libraries/Error_Handler.class.php A libraries/Footer.class.php A libraries/Header.class.php M libraries/Menu.class.php M libraries/Message.class.php A libraries/OutputBuffering.class.php M libraries/PDF.class.php A libraries/Response.class.php A libraries/Scripts.class.php M libraries/Theme.class.php M libraries/Theme_Manager.class.php M libraries/auth/config.auth.lib.php M libraries/auth/cookie.auth.lib.php M libraries/auth/http.auth.lib.php M libraries/common.inc.php M libraries/common.lib.php M libraries/core.lib.php M libraries/db_common.inc.php M libraries/display_export.lib.php M libraries/display_git_revision.lib.php M libraries/display_import.lib.php M libraries/display_tbl.lib.php M libraries/error.inc.php R libraries/footer.inc.php R libraries/header.inc.php R libraries/header_http.inc.php R libraries/header_meta_style.inc.php R libraries/header_printview.inc.php R libraries/header_scripts.inc.php M libraries/insert_edit.lib.php M libraries/mult_submits.inc.php M libraries/navigation_header.inc.php R libraries/ob.lib.php M libraries/pmd_common.php M libraries/relation.lib.php M libraries/rte/rte_events.lib.php M libraries/rte/rte_export.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/server_common.inc.php M libraries/tbl_common.inc.php M libraries/tbl_info.inc.php M libraries/tbl_select.lib.php M libraries/user_preferences.inc.php M libraries/user_preferences.lib.php M main.php M navigation.php M pmd_display_field.php M pmd_general.php M pmd_pdf.php M pmd_relation_new.php M pmd_relation_upd.php M prefs_forms.php M prefs_manage.php M querywindow.php M schema_edit.php M schema_export.php M server_binlog.php M server_collations.php M server_databases.php M server_engines.php M server_export.php M server_import.php M server_plugins.php M server_privileges.php M server_replication.php M server_sql.php M server_status.php M server_synchronize.php M server_variables.php M setup/index.php M setup/styles.css M sql.php M tbl_addfield.php M tbl_alter.php M tbl_change.php M tbl_chart.php M tbl_create.php M tbl_export.php M tbl_gis_visualization.php M tbl_import.php M tbl_indexes.php M tbl_move_copy.php M tbl_operations.php M tbl_printview.php M tbl_relation.php M tbl_replace.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 R test/PMA_showHint_test.php R test/libraries/common/PMA_ajaxResponse_test.php M test/libraries/core/PMA_getLinks_test.php M test/libraries/core/PMA_headerLocation_test_disabled.php M themes.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php M themes/sprites.css.php M transformation_overview.php M transformation_wrapper.php M user_password.php M view_create.php M view_operations.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: c84ec829943e639fbc20dd5b6c7ca7d0f78e0c64 https://github.com/phpmyadmin/phpmyadmin/commit/c84ec829943e639fbc20dd5b6c7… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M db_datadict.php M db_printview.php M db_structure.php M js/functions.js M js/server_databases.js A libraries/DisplayResults.class.php M libraries/Error_Handler.class.php M libraries/File.class.php M libraries/Footer.class.php M libraries/Header.class.php M libraries/Menu.class.php M libraries/Scripts.class.php A libraries/TableSearch.class.php M libraries/common.lib.php M libraries/display_export.lib.php M libraries/display_import.lib.php R libraries/display_tbl.lib.php M libraries/error.inc.php M libraries/gis/pma_gis_geometrycollection.php M libraries/insert_edit.lib.php R libraries/tbl_select.lib.php M libraries/transformations/text_plain__append.inc.php M libraries/user_preferences.inc.php M main.php M navigation.php M po/af.po M po/ar.po M po/az.po M po/be.po M po/be(a)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/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/sr(a)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(a)latin.po M po/zh_CN.po M po/zh_TW.po M querywindow.php M server_databases.php M server_privileges.php M sql.php M tbl_printview.php M tbl_replace.php M tbl_select.php M tbl_zoom_select.php M test/classes/gis/PMA_GIS_Geometry_test.php A 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 M test/libraries/common/PMA_browseUploadFile_test.php M test/theme.php M user_password.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Commit: 976254709644a9d91837b48faee299d2422c0533 https://github.com/phpmyadmin/phpmyadmin/commit/976254709644a9d91837b48faee… Author: Madhura Jayaratne <madhura.cj(a)gmail.com> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e6492b592af4...976254709644

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e6492b: Fix typo
by Michal Čihař 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e6492b592af4396a8ceb410877a34c021f1ed324 https://github.com/phpmyadmin/phpmyadmin/commit/e6492b592af4396a8ceb410877a… Author: Michal Čihař <michal(a)cihar.com> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fix typo

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] e729dc: Wrap some long lines and various other minor codin...
by Michal Čihař 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e729dc9a184789b39ce76b8bdaf1f185f30c39c1 https://github.com/phpmyadmin/phpmyadmin/commit/e729dc9a184789b39ce76b8bdaf… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Wrap some long lines and various other minor coding style improvements

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 1774f2: Wrap some long lines
by Michal Čihař 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1774f2b0f57ec2d83c120f62d4afb59024321a28 https://github.com/phpmyadmin/phpmyadmin/commit/1774f2b0f57ec2d83c120f62d4a… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Wrap some long lines Commit: 8f4243dacc61a8479c7bbb53ffb86a0a9f4a6697 https://github.com/phpmyadmin/phpmyadmin/commit/8f4243dacc61a8479c7bbb53ffb… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- No need to unset local variables while leaving function Commit: e26f9a03c44c4a5859d94d99c73eed4265e415c4 https://github.com/phpmyadmin/phpmyadmin/commit/e26f9a03c44c4a5859d94d99c73… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Fix docblocks indentation Commit: f529c10505b43324517b6e4045aff403f745d883 https://github.com/phpmyadmin/phpmyadmin/commit/f529c10505b43324517b6e4045a… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/insert_edit.lib.php Log Message: ----------- Various indentation and new line fixes Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0a4fa4a25a19...f529c10505b4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 0a4fa4: Fix some coding standard violations
by Michal Čihař 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0a4fa4a25a19282fbc2271ca7918d54e04df1ff7 https://github.com/phpmyadmin/phpmyadmin/commit/0a4fa4a25a19282fbc2271ca791… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M test/classes/gis/PMA_GIS_Geometry_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 Log Message: ----------- Fix some coding standard violations

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 26feda: Fix documentation
by Michal Čihař 19 Jun '12

19 Jun '12

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 26feda2eda5fda722c65548e8fd82ed9b835fb39 https://github.com/phpmyadmin/phpmyadmin/commit/26feda2eda5fda722c65548e8fd… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2012-06-19 (Tue, 19 Jun 2012) Changed paths: M libraries/transformations/text_plain__append.inc.php Log Message: ----------- Fix documentation

1 0