3410 Commits

Author SHA1 Message Date
arzynik
e0cb64fee7 updated for retina 2013-12-01 00:35:26 -08:00
arzynik
50c5d0c50e added like bg 2013-12-01 00:31:27 -08:00
arzynik
cd2e10f952 updated lob acount info 2013-12-01 00:31:14 -08:00
arzynik
0e46ac6dab partial #859 2013-11-30 22:34:24 -08:00
arzynik
cc1f763dc1 fixes #2149 2013-11-30 18:43:31 -08:00
arzynik
839435dd0f fixes #2122 2013-11-30 16:08:32 -08:00
arzynik
8edec956f4 partial #2122 2013-11-30 14:57:35 -08:00
arzynik
e576e81688 partial #2122 2013-11-30 14:14:50 -08:00
arzynik
45e8eb7da4 dont need this 2013-11-30 14:14:38 -08:00
arzynik
174ad3b0e8 fixes #1766 2013-11-30 14:10:28 -08:00
arzynik
40411638e9 hide errors 2013-11-30 14:10:17 -08:00
arzynik
cb1ab6e92a fixes #2182 2013-11-30 13:44:40 -08:00
arzynik
ee8c4d6c72 git ci #2139 2013-11-30 12:09:17 -08:00
arzynik
2e359bed06 acidently commited debug stuff 2013-11-30 11:28:56 -08:00
arzynik
9d4caaec11 added partial functionality for unserved location page. needs login functionality 2013-11-30 11:26:15 -08:00
arzynik
3097dc71d1 menu tweaks 2013-11-29 15:29:59 -08:00
arzynik
143b03ab58 partial #1561. made fade transition fade into eachother, rather than fadeing in and out at the same time. 2013-11-29 13:16:26 -08:00
arzynik
fcb41c7c53 partial #1561. removed animations from current ui. lets just get this working for ui2. 2013-11-29 12:16:09 -08:00
arzynik
aa27b8952c partial #1561 2013-11-29 11:54:12 -08:00
arzynik
b8820d38f2 aded animations to ui2 2013-11-29 11:19:00 -08:00
arzynik
9d9ddf6cf7 splash tweaks 2013-11-29 11:16:21 -08:00
Daniel Camargo
0cb1a98d82 partial #1561 - implement ng-view transitions and animations - working with css3 2013-11-29 17:13:22 -02:00
Daniel Camargo
07b53280db partial #1561 - implement ng-view transitions and animations 2013-11-29 16:51:42 -02:00
Daniel Camargo
22c4cb7d81 Merge branch 'refs/heads/master' into Issue_1561 2013-11-29 13:14:08 -02:00
Daniel Camargo
15cd6ec358 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	include/library/Crunchbutton/Restaurant.php
2013-11-29 13:08:46 -02:00
Daniel Camargo
07d8a515a1 fixed the next_open_time method at Restaurant class 2013-11-29 13:07:50 -02:00
Daniel Camargo
e51abd6231 fixed the next_open_time method at Restaurant class 2013-11-29 12:21:46 -02:00
Daniel Camargo
06ae4ce26f partial #2190 - restaurant_hour_override overides ALL restaurants 2013-11-29 11:44:40 -02:00
arzynik
9bbf68d98f added retina favicon 2013-11-28 20:31:31 -08:00
Daniel Camargo
9b390ad5e6 fixed the bug that was showing a message "Hurry, closes in 420 min!" 2013-11-28 17:32:29 -02:00
Daniel Camargo
ca0288bfa2 first test with animation 2013-11-28 17:27:14 -02:00
Daniel Camargo
655d71b046 Merge branch 'refs/heads/master' into Issue_1561 2013-11-28 10:33:45 -02:00
Daniel Camargo
0d34b306c6 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-11-28 09:25:22 -02:00
Daniel Camargo
241cea4a0a gift card (printable) url changed from giftcard to gift 2013-11-28 09:25:09 -02:00
Daniel Camargo
fe7ed81dfa printable gift card url changed from giftcard/ to gift/ 2013-11-28 09:22:45 -02:00
arzynik
b6949f0717 added ability to grab a users image, and got a count of how many there are with images available 2013-11-27 15:09:15 -08:00
pererinha
b22c5f51f7 partial #2183 - fix the problem that just one admin user was being returned 2013-11-27 19:33:23 -02:00
arzynik
eaab5fac34 updated tumblr theme 2013-11-27 11:56:56 -08:00
Daniel Camargo
07ea56242a partial #1382 - added a method to control the age of javascript cached objects 2013-11-27 15:28:19 -02:00
Daniel Camargo
42302a4c6e partial # 2183 - No Call for 1am Max CB - removed the tests 2013-11-27 13:05:55 -02:00
Daniel Camargo
b5ccd75db3 partial # 2183 - No Call for 1am Max CB 2013-11-27 12:52:51 -02:00
Daniel Camargo
16f5340001 partial # 2183 - No Call for 1am Max CB 2013-11-27 12:46:42 -02:00
Daniel Camargo
926fc78a22 partial # 2183 - No Call for 1am Max CB - removed debugs 2013-11-27 12:41:48 -02:00
Daniel Camargo
924d0eb246 partial # 2183 - No Call for 1am Max CB - removed debugs 2013-11-27 12:34:28 -02:00
Daniel Camargo
1dc231ddcd partial # 2183 - No Call for 1am Max CB - added debugs 2013-11-27 12:24:46 -02:00
Daniel Camargo
b1b5dc78e9 partial # 2183 - No Call for 1am Max CB 2013-11-27 12:16:09 -02:00
Daniel Camargo
b53012daf5 partial # 2183 - No Call for 1am Max CB 2013-11-27 12:09:16 -02:00
Daniel Camargo
d96675b3de partial # 2183 - No Call for 1am Max CB - bug fixes 2013-11-27 11:00:59 -02:00
Daniel Camargo
653b47d0af partial # 2183 - No Call for 1am Max CB - testing 2013-11-27 10:50:57 -02:00
Daniel Camargo
535c4c5aca partial # 2183 - No Call for 1am Max CB - testing 2013-11-27 10:32:34 -02:00