- Git - lists.phpmyadmin.net

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 4cad30: Remove comment
by Michal Čihař 24 Aug '13

24 Aug '13

Branch: refs/heads/QA_4_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4cad306ab0337cbaee12fa0cd6bbd2392da36a96 https://github.com/phpmyadmin/phpmyadmin/commit/4cad306ab0337cbaee12fa0cd6b… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Remove comment

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 265ee8: Translated using Weblate (Indonesian)
by Weblate 24 Aug '13

24 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 265ee8244387d091598fd90685e23e84c3fb2406 https://github.com/phpmyadmin/phpmyadmin/commit/265ee8244387d091598fd90685e… Author: Dadan Setia <da2n_s(a)yahoo.co.id> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M po/id.po Log Message: ----------- Translated using Weblate (Indonesian) Currently translated at 77.4% (2106 of 2720) Commit: eed802428f8c81fcb8937aa1a429013521aebd43 https://github.com/phpmyadmin/phpmyadmin/commit/eed802428f8c81fcb8937aa1a42… Author: shanyan baishui <Siramizu(a)gmail.com> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Translated using Weblate (Simplified Chinese) Currently translated at 94.2% (2561 of 2720) Commit: 69851c4318fe4aaed6a5c669c46a57ea34f849de https://github.com/phpmyadmin/phpmyadmin/commit/69851c4318fe4aaed6a5c669c46… Author: Weblate <noreply(a)weblate.org> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M gis_data_editor.php M po/zh_CN.po Log Message: ----------- Merge remote-tracking branch 'origin/master' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0fecb355dac4...69851c4318fe

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 41dffb: Remove comment
by Michal Čihař 24 Aug '13

24 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 41dffb6469e17b2425892b3880bc92531ba45f1e https://github.com/phpmyadmin/phpmyadmin/commit/41dffb6469e17b2425892b3880b… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M po/zh_CN.po Log Message: ----------- Remove comment Commit: 0fecb355dac4f6fc212d998f4e9f0f87ce7595f4 https://github.com/phpmyadmin/phpmyadmin/commit/0fecb355dac4f6fc212d998f4e9… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-08-24 (Sat, 24 Aug 2013) Changed paths: M gis_data_editor.php Log Message: ----------- Add explaining comment Compare: https://github.com/phpmyadmin/phpmyadmin/compare/aa0c22d34876...0fecb355dac4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] aa0c22: Fix include path
by Michal Čihař 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: aa0c22d34876f4dd47a5317a424fc21d46e12521 https://github.com/phpmyadmin/phpmyadmin/commit/aa0c22d34876f4dd47a5317a424… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M gis_data_editor.php Log Message: ----------- Fix include path

1 0

[Phpmyadmin-git] [phpmyadmin/error-reporting-server] b07251: Fixed indentation to tabs from spaces for consiste...
by Dieter Adriaenssens 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/error-reporting-server Commit: b072513449b9523f34c46c6405112fde5d8fd053 https://github.com/phpmyadmin/error-reporting-server/commit/b072513449b9523… Author: Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M app/webroot/js/custom.js Log Message: ----------- Fixed indentation to tabs from spaces for consistency Commit: dd3d1a303cf0d5a6d16a01a969acf53a08cee7da https://github.com/phpmyadmin/error-reporting-server/commit/dd3d1a303cf0d5a… Author: Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M app/webroot/js/custom.js Log Message: ----------- Fixed bug where filtering was not being done correctly Commit: 82dda93f33fcf4a596c95e0902175bad0331ac27 https://github.com/phpmyadmin/error-reporting-server/commit/82dda93f33fcf4a… Author: Mohamed Ashraf <mohamed.ashraf.213(a)gmail.com> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M app/Config/Migration/1375798518_remove_unneeded_fields_form_reports.php A app/Config/Migration/1376824296_add_extra_columns_to_incidents_table.php M app/Controller/ReportsController.php M app/Model/Incident.php M app/View/Helper/IncidentsHelper.php M app/View/Helper/ReportsHelper.php M app/View/Incidents/view.ctp M app/View/Layouts/default.ctp M app/View/Reports/view.ctp A app/webroot/css/shCore.css A app/webroot/css/shThemeDefault.css M app/webroot/js/custom.js A app/webroot/js/g.pie-min.js A app/webroot/js/g.raphael-min.js A app/webroot/js/pie.js A app/webroot/js/raphael-min.js A app/webroot/js/shBrushJScript.js A app/webroot/js/shBrushXml.js A app/webroot/js/shCore.js Log Message: ----------- Merge remote-tracking branch 'phpma/master' into fixes Conflicts: app/webroot/js/custom.js Commit: eecdeaf011fde7be2105499a2aa6a95e5fd75292 https://github.com/phpmyadmin/error-reporting-server/commit/eecdeaf011fde7b… Author: Dieter Adriaenssens <ruleant(a)users.sourceforge.net> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M app/webroot/js/custom.js Log Message: ----------- Merge pull request #15 from m0hamed/fixes Fixes bugs that arised from previous pull request Compare: https://github.com/phpmyadmin/error-reporting-server/compare/a2e63e7c23f0..…

1 0

[Phpmyadmin-git] [phpmyadmin/scripts] cc5270: Use GA to track demo server
by Michal Čihař 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/scripts Commit: cc5270f2cf90587c3439770391ef3c8e35f31843 https://github.com/phpmyadmin/scripts/commit/cc5270f2cf90587c3439770391ef3c… Author: Michal Čihař <michal(a)cihar.com> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M demo/php/config-common.inc.php M demo/php/config.footer.inc.php Log Message: ----------- Use GA to track demo server

1 0

[Phpmyadmin-git] [phpmyadmin/planet] 365558: Update GA tracking code, drop stats.cihar.com
by Michal Čihař 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/planet Commit: 365558225fdc137ddb2ea3625a43c1f8f0d3e72b https://github.com/phpmyadmin/planet/commit/365558225fdc137ddb2ea3625a43c1f… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M theme/index.html.tmpl Log Message: ----------- Update GA tracking code, drop stats.cihar.com

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] d9b342: Fix end of lines
by Marc Delisle 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d9b342900cb5b38fe561b5fd0c99ce7300a92b8c https://github.com/phpmyadmin/phpmyadmin/commit/d9b342900cb5b38fe561b5fd0c9… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M libraries/tbl_chart.lib.php Log Message: ----------- Fix end of lines

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 7178de: added libraries/tbl_chart.lib.php and extracted me...
by Marc Delisle 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 7178de4e4ab2514d2bf204ed57a50310342c8238 https://github.com/phpmyadmin/phpmyadmin/commit/7178de4e4ab2514d2bf204ed57a… Author: Spun Nakandala <supun.nakandala(a)gmail.com> Date: 2013-08-22 (Thu, 22 Aug 2013) Changed paths: A libraries/tbl_chart.lib.php M tbl_chart.php Log Message: ----------- added libraries/tbl_chart.lib.php and extracted methods to generate html content Commit: c222811db9f4e46e53bb3718601ebc8a01c62633 https://github.com/phpmyadmin/phpmyadmin/commit/c222811db9f4e46e53bb3718601… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: A libraries/tbl_chart.lib.php M tbl_chart.php Log Message: ----------- Merge pull request #631 from scnakandala/refac_tbl_chart Refactoring tbl_chart.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9ffa71c78710...c222811db9f4

1 0

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 5be9c2: Fix typo
by Marc Delisle 23 Aug '13

23 Aug '13

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 5be9c2f61a32b9bdb6a12786a64f09a42354605a https://github.com/phpmyadmin/phpmyadmin/commit/5be9c2f61a32b9bdb6a12786a64… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M test/libraries/PMA_sql_query_form_test.php Log Message: ----------- Fix typo Commit: 9ffa71c78710b2b685f9495f67f43482bfb8a886 https://github.com/phpmyadmin/phpmyadmin/commit/9ffa71c78710b2b685f9495f67f… Author: Marc Delisle <marc(a)infomarc.info> Date: 2013-08-23 (Fri, 23 Aug 2013) Changed paths: M po/af.po M po/az.po M po/be.po M po/be(a)latin.po M po/bg.po M po/bs.po M po/ca.po M po/cs.po M po/da.po M po/de.po M po/el.po M po/es.po M po/et.po M po/eu.po M po/fi.po M po/fr.po M po/gl.po M po/hr.po M po/hu.po M po/id.po M po/it.po M po/ka.po M po/lt.po M po/mk.po M po/mn.po M po/nb.po M po/nl.po M po/pl.po M po/pt.po M po/pt_BR.po M po/ro.po M po/ru.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/tr.po M po/tt.po M po/uk.po M po/uz(a)latin.po M po/zh_TW.po Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8cc24a58cdbf...9ffa71c78710

1 0