Daniel Camargo 5358ca92e7 Merge branch 'refs/heads/master' into Issue_1503_AngularJS
Conflicts:
	www/assets/js/app.js
	www/assets/js/services.cart.js
2013-08-07 20:14:30 -03:00
2013-05-24 18:05:34 -04:00
2013-07-23 14:30:51 -03:00
2013-04-18 23:44:01 -04:00

Some tips

== JS == if you use JS code in your views, do not use the comment format // comment till EOL The compressor/minifier that removes the spaces before sending the output will break the code and force the rest of the code to be sent as comment.

== DB import == when importing the dbs triggers, keep in mind the Definer field. you may want to just create a user called "devin"@"%"

Languages
PHP 38.5%
JavaScript 35.5%
HTML 17.1%
CSS 6.7%
SCSS 2.1%