Branch: refs/heads/master Home: https://github.com/phpmyadmin/error-reporting-server Commit: b072513449b9523f34c46c6405112fde5d8fd053 https://github.com/phpmyadmin/error-reporting-server/commit/b072513449b9523f... Author: Mohamed Ashraf mohamed.ashraf.213@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/dd3d1a303cf0d5a6... Author: Mohamed Ashraf mohamed.ashraf.213@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/82dda93f33fcf4a5... Author: Mohamed Ashraf mohamed.ashraf.213@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/eecdeaf011fde7be... Author: Dieter Adriaenssens ruleant@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......