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

..

account

initial

2012-06-20 21:39:23 -07:00

addme

fixes #76

2012-08-24 15:32:42 -04:00

api

Merge branch 'refs/heads/master' into Issue_1503_AngularJS

2013-08-07 20:14:30 -03:00

assets

partial #1503 - fixed the css

2013-07-19 16:48:52 -03:00

error

initial

2012-06-20 21:39:23 -07:00

hello

added hello

2012-07-17 14:02:09 -07:00

help

hella shit

2012-06-25 17:58:06 -07:00

home

seo progress

2012-10-16 17:05:13 -07:00

landing

landing

2012-07-17 00:49:09 -07:00

legal

added static legal

2012-10-17 13:47:34 -04:00

like

added like

2012-10-11 19:34:46 -04:00

listorders

admin panel rearangement

2012-09-08 19:20:08 -07:00

printorder

fixes #1188

2013-07-12 15:16:32 -07:00

restaurantmap

added restaurant map

2013-01-03 18:19:02 -05:00

sitemap.xml

added sitemap

2012-10-17 13:58:08 -04:00

support

hella shit

2012-06-25 17:58:06 -07:00

view

updates for phonegap

2013-08-07 11:13:53 -07:00

vieworder

adds stuff to #982

2013-04-01 22:09:22 -04:00