Daniel Camargo
|
5fa56a1821
|
partial #1503 - fixed the sign in button at mobile
|
2013-08-10 19:55:28 -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
|
d7e99cb250
|
fixed the App.routeAlias replaced by a service
|
2013-08-10 15:40:51 -03:00 |
|
Daniel Camargo
|
14af0d73e9
|
partial #1503 - mobile fix
|
2013-08-10 15:26:56 -03:00 |
|
arzynik
|
765f9c12cc
|
changed how the location background gets there by adding a global route-ACTION class to the body
|
2013-08-09 20:23:57 -07:00 |
|
arzynik
|
e1e2d7500c
|
added wrapper to legal
|
2013-08-09 19:45:49 -07:00 |
|
arzynik
|
580691b049
|
added fonts. added some new styles for mobile
|
2013-08-09 19:26:31 -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 |
|
arzynik
|
3c77dae732
|
commented out location stuff for phonegap since its freaking out right now.
|
2013-08-09 12:51:33 -07:00 |
|
arzynik
|
dc8dc4ef76
|
Merge branch 'master' of github.com:crunchbutton/crunchbutton
Conflicts:
www/assets/js/pages.js
|
2013-08-09 12:49:18 -07:00 |
|
arzynik
|
6bb81bdb7f
|
added a comment about this function fucking shit up
|
2013-08-09 12:46:46 -07:00 |
|
arzynik
|
a93f977f82
|
change button spacing for mobile
|
2013-08-09 12:46:11 -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 |
|
arzynik
|
caaa4b1534
|
fixed nav padding
|
2013-08-08 21:33:35 -04:00 |
|
arzynik
|
2eff2eb85f
|
Merge branch 'master' of github.com:crunchbutton/crunchbutton
|
2013-08-08 21:29:15 -04:00 |
|
arzynik
|
42aef0f9e3
|
added back button for ios7
|
2013-08-08 21:29:09 -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
|
7d3ebdf3d2
|
changed nav padding
|
2013-08-08 20:02:54 -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
|
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 |
|