- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 373a7a: bug #3599362 [core] Double-escaped error message
by Marc Delisle 15 Jan '13

15 Jan '13

Branch: refs/heads/QA_3_5 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 373a7a025e981bef46489ec77647e06bf0a9c6a9 https://github.com/phpmyadmin/phpmyadmin/commit/373a7a025e981bef46489ec7764… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M ChangeLog M libraries/Error_Handler.class.php M libraries/core.lib.php M test/libraries/core/PMA_warnMissingExtension_test.php Log Message: ----------- bug #3599362 [core] Double-escaped error message Commit: 6314225f415a53fa0581eae0024d0b83b4bdf89e https://github.com/phpmyadmin/phpmyadmin/commit/6314225f415a53fa0581eae0024… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js M js/tbl_chart.js M po/cs.po M po/ro.po M po/sv.po Log Message: ----------- Merge branch 'QA_3_5' of github.com:phpmyadmin/phpmyadmin into QA_3_5 Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7ddc71c03325...6314225f415a

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] c709dc: improve coding style : correct syntax with if-then...
by Dieter Adriaenssens 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c709dc91912985de7091a35697ed8bc75bffc66c https://github.com/phpmyadmin/phpmyadmin/commit/c709dc91912985de7091a35697e… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M libraries/Config.class.php Log Message: ----------- improve coding style : correct syntax with if-then-else statements Commit: 86dfd2506c1540bf5283348897a9dad3ee282473 https://github.com/phpmyadmin/phpmyadmin/commit/86dfd2506c1540bf5283348897a… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M libraries/Config.class.php Log Message: ----------- wrap long lines Compare: https://github.com/phpmyadmin/phpmyadmin/compare/2f7ef7a83d84...86dfd2506c15

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 431ced: Translated using Weblate (Korean)
by Weblate 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 431ced3a2526b502df7f6af222858a8b070f5e86 https://github.com/phpmyadmin/phpmyadmin/commit/431ced3a2526b502df7f6af2228… Author: Dong-bum Kim <dongbum(a)me.com> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 39.0% (1014 of 2602) Commit: 2f7ef7a83d84ab1a6d4a64446a059a28e7262598 https://github.com/phpmyadmin/phpmyadmin/commit/2f7ef7a83d84ab1a6d4a64446a0… Author: Weblate <noreply(a)weblate.org> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M db_tracking.php M libraries/display_change_password.lib.php M tbl_chart.php Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/42dc425c0b69...2f7ef7a83d84

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f696d9: don't use tabs for indenting
by Dieter Adriaenssens 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f696d91690075a8e0ff01326ea6c632e86cdb351 https://github.com/phpmyadmin/phpmyadmin/commit/f696d91690075a8e0ff01326ea6… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M libraries/display_change_password.lib.php Log Message: ----------- don't use tabs for indenting Commit: a33515a155950da15f2db4b25b89f6117517b0d7 https://github.com/phpmyadmin/phpmyadmin/commit/a33515a155950da15f2db4b25b8… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M db_tracking.php Log Message: ----------- use require when including a file unconditionally Commit: b1431bae58273a85b2cb101cf7e00cf5ad3fdb85 https://github.com/phpmyadmin/phpmyadmin/commit/b1431bae58273a85b2cb101cf7e… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M tbl_chart.php Log Message: ----------- improve coding style : correct syntax with if-then-else statements Commit: 42dc425c0b695470481169b028fc626025282438 https://github.com/phpmyadmin/phpmyadmin/commit/42dc425c0b695470481169b028f… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M tbl_chart.php Log Message: ----------- wrap long lines Compare: https://github.com/phpmyadmin/phpmyadmin/compare/55ebbeeae4db...42dc425c0b69

1 0

[Phpmyadmin-git] [phpmyadmin/website] 34c0e9: Add info about Metro theme
by Michal Čihař 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/website Commit: 34c0e983308ba3b4b0593d13dcd01f8f546a5a67 https://github.com/phpmyadmin/website/commit/34c0e983308ba3b4b0593d13dcd01f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M data/themes.py A images/themes/metro.png Log Message: ----------- Add info about Metro theme

1 0

[Phpmyadmin-git] [phpmyadmin/themes] 8d83e6: Add Metro theme (tracker #3600771)
by Michal Čihař 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/themes Commit: 8d83e634023d883fcc6d0b5854063a2488373a9a https://github.com/phpmyadmin/themes/commit/8d83e634023d883fcc6d0b5854063a2… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: A metro/css/theme_left.css.php A metro/css/theme_print.css.php A metro/css/theme_right.css.php A metro/fonts/IcoMoon.eot A metro/fonts/IcoMoon.svg A metro/fonts/IcoMoon.ttf A metro/fonts/IcoMoon.woff A metro/fonts/opensans-bold-webfont.eot A metro/fonts/opensans-bold-webfont.ttf A metro/fonts/opensans-bold-webfont.woff A metro/fonts/opensans-extrabold-webfont.eot A metro/fonts/opensans-extrabold-webfont.ttf A metro/fonts/opensans-extrabold-webfont.woff A metro/fonts/opensans-light-webfont.eot A metro/fonts/opensans-light-webfont.ttf A metro/fonts/opensans-light-webfont.woff A metro/fonts/opensans-regular-webfont.eot A metro/fonts/opensans-regular-webfont.ttf A metro/fonts/opensans-regular-webfont.woff A metro/fonts/opensans-semibold-webfont.eot A metro/fonts/opensans-semibold-webfont.ttf A metro/fonts/opensans-semibold-webfont.woff A metro/img/ajax_clock_small.gif A metro/img/arrow_ltr.png A metro/img/arrow_rtl.png A metro/img/asc_order.png A metro/img/b_browse.png A metro/img/b_calendar.png A metro/img/b_deltbl.png A metro/img/b_drop.png A metro/img/b_edit.png A metro/img/b_ftext.png A metro/img/b_globe.gif A metro/img/b_index.png A metro/img/b_login_on.png A metro/img/b_newdb.png A metro/img/b_primary.png A metro/img/b_spatial.png A metro/img/b_tblexport.png A metro/img/b_tblops.png A metro/img/b_unique.png A metro/img/col_drop.png A metro/img/col_pointer.png A metro/img/col_pointer_ver.png A metro/img/database.png A metro/img/error.ico A metro/img/item_ltr.png A metro/img/item_rtl.png A metro/img/more.png A metro/img/php_sym.png A metro/img/pma_logo2.png A metro/img/pmd/1.png A metro/img/pmd/2.png A metro/img/pmd/2leftarrow.png A metro/img/pmd/2leftarrow_m.png A metro/img/pmd/2rightarrow.png A metro/img/pmd/2rightarrow_m.png A metro/img/pmd/3.png A metro/img/pmd/4.png A metro/img/pmd/5.png A metro/img/pmd/6.png A metro/img/pmd/7.png A metro/img/pmd/8.png A metro/img/pmd/FieldKey_small.png A metro/img/pmd/Field_small.png A metro/img/pmd/Field_small_char.png A metro/img/pmd/Field_small_date.png A metro/img/pmd/Field_small_int.png A metro/img/pmd/Header.png A metro/img/pmd/Header_Linked.png A metro/img/pmd/and_icon.png A metro/img/pmd/ang_direct.png A metro/img/pmd/bord.png A metro/img/pmd/bottom.png A metro/img/pmd/def.png A metro/img/pmd/display_field.png A metro/img/pmd/downarrow1.png A metro/img/pmd/downarrow2.png A metro/img/pmd/downarrow2_m.png A metro/img/pmd/exec.png A metro/img/pmd/exec_small.png A metro/img/pmd/favicon.ico A metro/img/pmd/grid.png A metro/img/pmd/help.png A metro/img/pmd/help_relation.png A metro/img/pmd/left_panel_butt.png A metro/img/pmd/left_panel_tab.png A metro/img/pmd/minus.png A metro/img/pmd/or_icon.png A metro/img/pmd/pdf.png A metro/img/pmd/plus.png A metro/img/pmd/query_builder.png A metro/img/pmd/relation.png A metro/img/pmd/reload.png A metro/img/pmd/resize.png A metro/img/pmd/rightarrow1.png A metro/img/pmd/rightarrow2.png A metro/img/pmd/save.png A metro/img/pmd/small_tab.png A metro/img/pmd/table.png A metro/img/pmd/toggle_lines.png A metro/img/pmd/top_panel.png A metro/img/pmd/uparrow2_m.png A metro/img/s_asci.png A metro/img/s_error.png A metro/img/s_fulltext.png A metro/img/s_info.png A metro/img/s_lang.png A metro/img/s_notice.png A metro/img/s_partialtext.png A metro/img/s_passwd.png A metro/img/s_success.png A metro/img/s_theme.png A metro/img/spacer.png A metro/img/sprites.png A metro/img/toggle-ltr.png A metro/img/toggle-rtl.png A metro/img/vertical_line.png A metro/info.inc.php A metro/info.txt A metro/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png A metro/jquery/images/ui-bg_flat_75_ffffff_40x100.png A metro/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png A metro/jquery/images/ui-bg_glass_65_ffffff_1x400.png A metro/jquery/images/ui-bg_glass_75_dadada_1x400.png A metro/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png A metro/jquery/images/ui-bg_glass_95_fef1ec_1x400.png A metro/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png A metro/jquery/images/ui-icons_222222_256x240.png A metro/jquery/images/ui-icons_2e83ff_256x240.png A metro/jquery/images/ui-icons_454545_256x240.png A metro/jquery/images/ui-icons_888888_256x240.png A metro/jquery/images/ui-icons_cd0a0a_256x240.png A metro/jquery/jquery-ui-1.8.16.custom.css A metro/layout.inc.php A metro/screen.png A metro/sprites.lib.php Log Message: ----------- Add Metro theme (tracker #3600771) Commit: 257ca7497e94c27c4282a6d1235096400b3c0766 https://github.com/phpmyadmin/themes/commit/257ca7497e94c27c4282a6d12350964… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M metro/css/theme_left.css.php Log Message: ----------- Fix PHP warning Commit: 4535218658eed76117f0b02c57629238f7ab76fc https://github.com/phpmyadmin/themes/commit/4535218658eed76117f0b02c5762923… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M metro/css/theme_left.css.php M metro/img/arrow_ltr.png M metro/img/arrow_rtl.png M metro/img/asc_order.png M metro/img/b_browse.png M metro/img/b_edit.png M metro/img/b_index.png M metro/img/b_login_on.png M metro/img/pmd/2leftarrow.png M metro/img/pmd/2rightarrow.png M metro/img/pmd/Header.png M metro/img/pmd/Header_Linked.png M metro/img/pmd/ang_direct.png M metro/img/pmd/help.png M metro/img/pmd/help_relation.png M metro/img/pmd/left_panel_butt.png M metro/img/pmd/relation.png M metro/img/pmd/small_tab.png M metro/img/pmd/toggle_lines.png M metro/img/pmd/top_panel.png M metro/img/sprites.png M metro/img/toggle-ltr.png M metro/img/toggle-rtl.png M metro/screen.png Log Message: ----------- Whitespace cleanup and image optimization Compare: https://github.com/phpmyadmin/themes/compare/17c7baecdecb...4535218658ee

1 0

[Phpmyadmin-git] [phpmyadmin/themes]
by nijel 15 Jan '13

15 Jan '13

Branch: refs/tags/metro-1.0 Home: https://github.com/phpmyadmin/themes

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 84c35b: Translated using Weblate (Swedish)
by Weblate 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 84c35b75fb330c11ff79f4e1d771505861195d68 https://github.com/phpmyadmin/phpmyadmin/commit/84c35b75fb330c11ff79f4e1d77… Author: ProUser <stefan(a)inkopsforum.se> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 99.5% (2588 of 2602) Commit: 55ebbeeae4dbf8c513ef8e6a1b9a05d616b0993b https://github.com/phpmyadmin/phpmyadmin/commit/55ebbeeae4dbf8c513ef8e6a1b9… Author: Weblate <noreply(a)weblate.org> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js M js/tbl_chart.js Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b586d8164a4c...55ebbeeae4db

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] b59d6d: Translated using Weblate (Czech)
by Michal Čihař 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b59d6dee04d117c1e608403763e47485c9edca66 https://github.com/phpmyadmin/phpmyadmin/commit/b59d6dee04d117c1e608403763e… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 100.0% (2602 of 2602) Commit: 9433426417e701fde78a04772c60d451eafe20b4 https://github.com/phpmyadmin/phpmyadmin/commit/9433426417e701fde78a04772c6… Author: Pham Andrei <pham.andrei4(a)gmail.com> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/ro.po Log Message: ----------- Translated using Weblate (Romanian) Currently translated at 55.5% (1444 of 2602) Commit: b586d8164a4ca2b7bcbb16a8fc4905cec716a181 https://github.com/phpmyadmin/phpmyadmin/commit/b586d8164a4ca2b7bcbb16a8fc4… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/cs.po M po/ro.po Log Message: ----------- Merge remote-tracking branch 'weblate/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/077a93b0e256...b586d8164a4c

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 662757: Translated using Weblate (Korean)
by Michal Čihař 15 Jan '13

15 Jan '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 662757a8678cd4afd6bd821b9a7343874f63a3ef https://github.com/phpmyadmin/phpmyadmin/commit/662757a8678cd4afd6bd821b9a7… Author: Dong-bum Kim <dongbum(a)me.com> Date: 2013-01-12 (Sat, 12 Jan 2013) Changed paths: M po/ko.po Log Message: ----------- Translated using Weblate (Korean) Currently translated at 40.6% (1040 of 2562) Commit: 761cf904acf3709c91092bb86076fe6bcf1bfdc5 https://github.com/phpmyadmin/phpmyadmin/commit/761cf904acf3709c91092bb8607… Author: Weblate <noreply(a)weblate.org> Date: 2013-01-12 (Sat, 12 Jan 2013) Changed paths: M ChangeLog M libraries/gis/pma_gis_geometry.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: d30aaaee73e4391c15095280cf0345d5cf23e671 https://github.com/phpmyadmin/phpmyadmin/commit/d30aaaee73e4391c15095280cf0… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Escape HTML in chart title Commit: d876574e61e413cca6906da7c208c1d3c8ae34d6 https://github.com/phpmyadmin/phpmyadmin/commit/d876574e61e413cca6906da7c20… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Whitespace cleanup Commit: 75ab209aaff202e35b7e524483855c8a8acee247 https://github.com/phpmyadmin/phpmyadmin/commit/75ab209aaff202e35b7e5244838… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/cs.po Log Message: ----------- Translated using Weblate (Czech) Currently translated at 100.0% (2562 of 2562) Commit: 90ed3865ea287638b6b014404ffba4b18eb1f5ee https://github.com/phpmyadmin/phpmyadmin/commit/90ed3865ea287638b6b014404ff… Author: Pham Andrei <pham.andrei4(a)gmail.com> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/ro.po Log Message: ----------- Translated using Weblate (Romanian) Currently translated at 60.2% (1543 of 2562) Commit: fb0fb6c756724bc12a8e68fe5a8a311bcc54d0ef https://github.com/phpmyadmin/phpmyadmin/commit/fb0fb6c756724bc12a8e68fe5a8… Author: ProUser <stefan(a)inkopsforum.se> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M po/sv.po Log Message: ----------- Translated using Weblate (Swedish) Currently translated at 100.0% (2562 of 2562) Commit: ae2a59f02d42ee1bf3c84f6c695194468534bfe6 https://github.com/phpmyadmin/phpmyadmin/commit/ae2a59f02d42ee1bf3c84f6c695… Author: Weblate <noreply(a)weblate.org> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5 Commit: 7e968cf30e811fd2dc51ae754907d01049468505 https://github.com/phpmyadmin/phpmyadmin/commit/7e968cf30e811fd2dc51ae75490… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/tbl_chart.js Log Message: ----------- Escape HTML in titles of table charts Commit: b489fdffb6572e7036933d5d87dbe648cd583733 https://github.com/phpmyadmin/phpmyadmin/commit/b489fdffb6572e7036933d5d87d… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js Log Message: ----------- Escape HTML in chart title Commit: b23372a3368d33d7adf3bfe5a0466a572d7ec5a6 https://github.com/phpmyadmin/phpmyadmin/commit/b23372a3368d33d7adf3bfe5a04… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/tbl_chart.js Log Message: ----------- Escape HTML in titles of table charts Conflicts: js/tbl_chart.js Commit: 7463acbe9fe521380ed9ea47f064af8b2b859f85 https://github.com/phpmyadmin/phpmyadmin/commit/7463acbe9fe521380ed9ea47f06… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Commit: 7ddc71c033256baad76957c42fc1b9ad83bac8e7 https://github.com/phpmyadmin/phpmyadmin/commit/7ddc71c033256baad76957c42fc… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js M js/tbl_chart.js Log Message: ----------- Fix possibly wrong commas Commit: 077a93b0e256421a0cdf60392adef06283454fac https://github.com/phpmyadmin/phpmyadmin/commit/077a93b0e256421a0cdf60392ad… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-01-15 (Tue, 15 Jan 2013) Changed paths: M js/server_status_monitor.js M js/tbl_chart.js Log Message: ----------- Merge remote-tracking branch 'origin/QA_3_5' Conflicts: js/tbl_chart.js Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8063d2270ee2...077a93b0e256

1 0