arzynik
|
4ccdd9fe22
|
added custom restaurant closed dialog
|
2013-08-13 00:56:12 -07:00 |
|
arzynik
|
72b76ff7e7
|
moved the user into the rootscope for all controllers to watch
|
2013-08-13 00:17:23 -07:00 |
|
arzynik
|
97fdce5c09
|
added static help and legal pages for native apps
|
2013-08-13 00:15:53 -07:00 |
|
arzynik
|
e5e9236f4b
|
Merge branch 'master' of github.com:crunchbutton/crunchbutton
|
2013-08-12 20:04:32 -07:00 |
|
arzynik
|
eb08a067cb
|
added login to the menu
|
2013-08-12 20:01:58 -07:00 |
|
arzynik
|
875be431f4
|
removed double facebook call
|
2013-08-12 20:01:37 -07:00 |
|
arzynik
|
0e68c5be79
|
updated angular version
|
2013-08-12 20:01:25 -07:00 |
|
Daniel Camargo
|
411101ca68
|
partial #1540
|
2013-08-12 19:02:08 -03:00 |
|
Daniel Camargo
|
496137ee36
|
partial #1539
|
2013-08-12 18:15:59 -03:00 |
|
Daniel Camargo
|
a4d0ae7107
|
#1503 - some angular
|
2013-08-12 17:33:45 -03:00 |
|
Daniel Camargo
|
1abd760885
|
partial #1537
|
2013-08-12 15:37:43 -03:00 |
|
Daniel Camargo
|
2198def8cf
|
partial #1503 - button fixed
|
2013-08-10 19:48:37 -03:00 |
|
Daniel Camargo
|
dbe8855a7f
|
partial #1503 - button fixed
|
2013-08-10 18:13:03 -03:00 |
|
Daniel Camargo
|
c48b5c2b03
|
Merge branch 'refs/heads/master' into Issue_1503_AngularJS
Conflicts:
include/views/default/crunchbutton/frontend/restaurant.phtml
|
2013-08-10 15:53:03 -03:00 |
|
Daniel Camargo
|
14af0d73e9
|
partial #1503 - mobile fix
|
2013-08-10 15:26:56 -03:00 |
|
arzynik
|
e1e2d7500c
|
added wrapper to legal
|
2013-08-09 19:45:49 -07:00 |
|
arzynik
|
1019c6bec9
|
fixed some display issues on mobile
|
2013-08-09 17:41:09 -07:00 |
|
arzynik
|
3c2b1d6d31
|
changed top link to go home instead of open menu on desktop
|
2013-08-09 16:26:20 -07:00 |
|
arzynik
|
c9e274586a
|
reenabled facebook
|
2013-08-09 13:01:56 -07:00 |
|
Daniel Camargo
|
34d97c4faa
|
ux change at restaurant's page
|
2013-08-09 16:28:56 -03:00 |
|
Daniel Camargo
|
a2382f56c6
|
partial #1503 - restaurant is closet
|
2013-08-09 16:08:09 -03:00 |
|
Daniel Camargo
|
9ab871197c
|
partial #1503 - address verification at restaurant's page
|
2013-08-09 15:58:01 -03:00 |
|
arzynik
|
3feeeb2cb2
|
removed view filter. seems new lines break angular
|
2013-08-09 11:00:50 -07:00 |
|
Daniel Camargo
|
0fb82a1b57
|
ux change at restaurant's page
|
2013-08-09 14:48:43 -03:00 |
|
Daniel Camargo
|
38a5f0caa4
|
ux change
|
2013-08-09 12:17:14 -03:00 |
|
arzynik
|
5fd1d9d61a
|
testing disabling facebook since i think that might be causing issues
|
2013-08-08 22:28:22 -04:00 |
|
Daniel Camargo
|
8c97cab1e9
|
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
|
2013-08-08 21:18:28 -03:00 |
|
Daniel Camargo
|
4429cbed19
|
partial #1503
|
2013-08-08 21:17:40 -03:00 |
|
arzynik
|
a86afe80e7
|
no need for fake breaks aprarntly :(
|
2013-08-08 20:14:55 -04:00 |
|
arzynik
|
33329b3562
|
added some fake breaks
|
2013-08-08 20:12:36 -04:00 |
|
arzynik
|
dc0b3de4de
|
static nav spacing
|
2013-08-08 20:06:46 -04:00 |
|
arzynik
|
fced2b2d4c
|
updated nav
|
2013-08-08 20:01:28 -04:00 |
|
arzynik
|
318418963b
|
added fonts and some sample icons
|
2013-08-08 16:02:17 -07:00 |
|
arzynik
|
ea93419167
|
added easing. updated font awesome.
|
2013-08-08 15:17:01 -07: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
|
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 |
|
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 |
|
Daniel Camargo
|
943c21bd6a
|
partial #1503 - login / orders
|
2013-08-07 16:48:44 -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
|
590df187f1
|
partial #1503 - order stuff
|
2013-08-06 18:03:32 -03:00 |
|