Daniel Camargo
|
7e08482e05
|
partial #1503
|
2013-08-08 16:01:25 -03:00 |
|
Daniel Camargo
|
300c61fabc
|
partial #1503 - more optimizations at restaurant's page (removed from scope all the things that don't belong there)
|
2013-08-08 15:59:40 -03:00 |
|
Daniel Camargo
|
ef5146d7cf
|
partial #1503 - performance optimization at the restaurant's page
|
2013-08-08 13:41:12 -03:00 |
|
Daniel Camargo
|
5ee9bdd986
|
partial #1503 - problem with location fixed
|
2013-08-08 12:42:57 -03:00 |
|
Daniel Camargo
|
ef31ae1b71
|
partial #1503 - credit stuff
|
2013-08-08 11:05:18 -03:00 |
|
Daniel Camargo
|
19d20aaa3a
|
partial #1503 - fixed the order page
|
2013-08-08 10:53:48 -03:00 |
|
Daniel Camargo
|
02b020bc4b
|
partial #1503 - credit/gift card at restaurant's page
|
2013-08-08 10:51:34 -03:00 |
|
Daniel Camargo
|
d4a6af3bb1
|
partial #1503 - credit/gift card at restaurant's page
|
2013-08-08 10:31:55 -03:00 |
|
Devin Smith
|
dc4bb3a894
|
Update README.md
|
2013-08-07 16:40:31 -07:00 |
|
Daniel Camargo
|
f2e5237214
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2013-08-07 20:34:55 -03:00 |
|
arzynik
|
2b6516d869
|
fixes #1547
|
2013-08-07 16:29:15 -07:00 |
|
Daniel Camargo
|
91be24e8e2
|
Merge branch 'Issue_1503_AngularJS' of https://github.com/crunchbutton/crunchbutton into Issue_1503_AngularJS
Conflicts:
www/assets/js/app.js
www/assets/js/services.account.js
www/assets/js/services.order.js
|
2013-08-07 20:26:17 -03:00 |
|
Daniel Camargo
|
0a975ccb6e
|
merge
|
2013-08-07 20:22:22 -03:00 |
|
Daniel Camargo
|
77ee1b573f
|
Merge branch 'refs/heads/master' into Issue_1503_AngularJS
|
2013-08-07 20:14:59 -03:00 |
|
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 |
|
arzynik
|
292f404249
|
fixed rendering issue with templates. disabled autofocus for phonegap. updated some styles ofr phonegap.
|
2013-08-07 16:02:28 -07:00 |
|
Daniel Camargo
|
7b156375b5
|
partial #1503 - gift card (notes field)
|
2013-08-07 19:39:03 -03:00 |
|
arzynik
|
76bfe0c726
|
added phonegap specific vibration for crunch sound
|
2013-08-07 14:12:57 -07:00 |
|
arzynik
|
420b41ec99
|
temp commented out phonegap specific alerts due to 3.0 bug
|
2013-08-07 14:09:37 -07:00 |
|
arzynik
|
b24a9126e0
|
added remote image server for app food image generation
|
2013-08-07 13:02:00 -07:00 |
|
Daniel Camargo
|
943c21bd6a
|
partial #1503 - login / orders
|
2013-08-07 16:48:44 -03:00 |
|
arzynik
|
453a90ae85
|
updates for phonegap
|
2013-08-07 12:30:05 -07:00 |
|
Daniel Camargo
|
6ffe1d0b47
|
partial #1503 - login / orders
|
2013-08-07 15:22:06 -03:00 |
|
arzynik
|
548680cf83
|
updates for phonegap
|
2013-08-07 11:13:53 -07:00 |
|
arzynik
|
a4ff5ee834
|
updated some stuff for phonegap
|
2013-08-06 21:14:36 -07:00 |
|
Daniel Camargo
|
ea294c2d3a
|
gift card flyer
|
2013-08-06 22:28:37 -03:00 |
|
Daniel Camargo
|
001edd4683
|
partial #1503
|
2013-08-06 22:28:02 -03:00 |
|
Daniel Camargo
|
03e26f80d1
|
partial #1503 - removed the App.config.user calls
|
2013-08-06 19:09:39 -03:00 |
|
Daniel Camargo
|
590df187f1
|
partial #1503 - order stuff
|
2013-08-06 18:03:32 -03:00 |
|
Daniel Camargo
|
1247245575
|
Merge branch 'refs/heads/master' into Issue_1503_AngularJS
|
2013-08-06 17:17:15 -03:00 |
|
Daniel Camargo
|
69caa59c10
|
partial #1503 - order
|
2013-08-06 17:15:39 -03:00 |
|
arzynik
|
650b24c69c
|
changed how app config loads
|
2013-08-06 12:00:16 -07:00 |
|
arzynik
|
4a3c0f3042
|
added body view
|
2013-08-06 10:49:52 -07:00 |
|
arzynik
|
0ca08deffd
|
added views api
|
2013-08-06 10:05:31 -07:00 |
|
Daniel Camargo
|
b6978c21f0
|
partial #1503 - preload user info
|
2013-08-06 10:34:11 -03:00 |
|
Daniel Camargo
|
cf34e204b1
|
partial #1503 - pre loading user's presets
|
2013-08-05 18:35:22 -03:00 |
|
Daniel Camargo
|
92e2a13fb1
|
partial #1503 - tip
|
2013-08-05 16:24:17 -03:00 |
|
Daniel Camargo
|
b2d174631f
|
Merge branch 'refs/heads/master' into Issue_1503_AngularJS
|
2013-08-05 13:53:23 -03:00 |
|
Daniel Camargo
|
33d9181865
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2013-08-05 13:52:20 -03:00 |
|
Daniel Camargo
|
62f0c1eeae
|
script to create 16 mini gift cards per page
|
2013-08-05 13:52:07 -03:00 |
|
arzynik
|
9d40b00577
|
moved stored config vars out of bundle
|
2013-08-03 11:57:50 -07:00 |
|
arzynik
|
47797da403
|
removed some old stuff
|
2013-08-03 11:53:24 -07:00 |
|
arzynik
|
a9adc20a25
|
moved some config stuff around
|
2013-08-02 16:34:15 -07:00 |
|
Daniel Camargo
|
c0169018ce
|
partial #1503 - cart / order stuff
|
2013-08-02 17:53:13 -03:00 |
|
Daniel Camargo
|
b0688eb4d0
|
toogles: payment and delivery
|
2013-08-02 16:22:10 -03:00 |
|
arzynik
|
90e7f8af85
|
cleanup
|
2013-08-02 10:13:44 -07:00 |
|
Daniel Camargo
|
fbf20ff2eb
|
partial #1503
|
2013-08-02 11:16:52 -03:00 |
|
Daniel Camargo
|
f80e4dd2a6
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2013-08-01 17:57:00 -03:00 |
|
Daniel Camargo
|
95e63f2edb
|
partial #1531
|
2013-08-01 17:56:06 -03:00 |
|
arzynik
|
4257370974
|
added ios7 specific nav header
|
2013-08-01 09:58:40 -07:00 |
|