941 Commits

Author SHA1 Message Date
Daniel Camargo
3cd96ade27 issue #1154 2013-04-25 14:54:18 -03:00
Daniel Camargo
d9f81a3d3c #383 fixed a bug I've found here 2013-04-25 12:28:29 -03:00
Daniel Camargo
29765021a9 partial #1110 2013-04-25 12:05:13 -03:00
Daniel Camargo
a8b4ff271a issue #1110 2013-04-25 12:02:38 -03:00
Daniel Camargo
618a1f041b issue #1110 - removed temporally this closed verification 2013-04-25 11:58:41 -03:00
Daniel Camargo
8b53443d17 Issue #1110 - testing at beta 2013-04-25 11:49:58 -03:00
arzynik
4a8f3f48d5 wtf merge fail 2013-04-24 18:32:13 -07:00
arzynik
77d56da2b1 woops 2013-04-24 18:29:28 -07:00
arzynik
39e91f0fc9 Merge branch 'master' of github.com:crunchbutton/crunchbutton
Conflicts:
	include/library/Crunchbutton/Order.php
2013-04-24 18:28:19 -07:00
arzynik
cd6e9b6332 fixes stuff 2013-04-24 21:20:14 -04:00
arzynik
f3b1d73296 fixes stuff 2013-04-24 18:19:17 -07:00
BDC
d13b77e232 restaurant open 2013-04-24 20:59:56 -04:00
BDC
daca8b7823 orders export includes ids 2013-04-24 15:06:05 -04:00
BDC
6e4138a348 main restaurants page sucks less 2013-04-24 14:51:37 -04:00
BDC
fa71945da1 main restaurants page sucks less 2013-04-24 14:51:18 -04:00
Daniel Camargo
9b8c3ad598 partial #383 - removed the tests 2013-04-24 15:39:09 -03:00
Daniel Camargo
8226d02752 partial #383 - testing at beta (sms / email) 2013-04-24 15:11:23 -03:00
Daniel Camargo
50f1c3513d Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-04-24 14:45:51 -03:00
Daniel Camargo
c1ddddc202 partial #383 - testing at beta 2013-04-24 14:45:18 -03:00
Daniel Camargo
dca0948785 partial #383 2013-04-24 14:44:23 -03:00
BDC
b5c2d8e11e merge master 2013-04-24 12:40:31 -04:00
BDC
b2fb26b8ec admin css 2013-04-24 12:40:02 -04:00
Daniel Camargo
644c09a83d issue #1080 2013-04-23 15:38:23 -03:00
BDC
68b38708ea admin adjustments 2013-04-22 18:34:25 -04:00
BDC
61c0f5cefe restaurant revert doesnt save automatically 2013-04-21 17:10:20 -04:00
BDC
8f3998ec5d merge admin 2013-04-21 13:03:50 -04:00
BDC
2ce7e0ce38 admin restaurant 2013-04-21 13:02:24 -04:00
Daniel Camargo
d49434309a partial #27 2013-04-19 15:37:01 -03:00
Daniel Camargo
ffeb21309a #1018 - it will create a new support issue only if it has a phone number 2013-04-19 14:00:09 -03:00
Daniel Camargo
f809732916 fixed #1018 2013-04-19 13:44:34 -03:00
Daniel Camargo
848f2006a6 issue #1018 - changed the test number 2013-04-19 12:53:27 -03:00
Daniel Camargo
b053aceac2 issue #1018 - testing at beta 2013-04-19 12:42:54 -03:00
BDC
95d1ac0da4 restaurant with no hours is by default closed not open 2013-04-19 00:51:48 -04:00
BDC
ef2ceaa1c1 hc notification 2013-04-18 23:57:26 -04:00
BDC
b89fa8ecd0 more detailed notification 2013-04-18 23:55:04 -04:00
BDC
f53602294f support 2013-04-18 23:27:37 -04:00
BDC
1aa5b6e650 admin and notify 2013-04-18 22:50:00 -04:00
BDC
e15f219501 admin and notify 2013-04-18 22:49:21 -04:00
Daniel Camargo
30cff28c6f partial #586 - It is working for chrome/firefox/safari. 2013-04-18 17:20:00 -03:00
BDC
4a0b1d61d2 restaurant admin 2013-04-18 12:58:01 -04:00
BDC
b09b254d19 restaurant admin 2013-04-18 12:57:28 -04:00
Daniel Camargo
4464d2fc1c partial #470 2013-04-18 12:41:57 -03:00
Daniel Camargo
39e3879c9e partial #910 2013-04-18 12:26:56 -03:00
Daniel Camargo
5bc525bfd7 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2013-04-18 11:39:10 -03:00
Daniel Camargo
eb63987658 partial #363 2013-04-18 11:31:30 -03:00
BDC
970550aa64 admin restaurant 2013-04-17 18:40:40 -04:00
BDC
dec644c891 merge admin 2013-04-17 16:50:41 -04:00
BDC
c29c90b19e merge admin master 2013-04-17 16:49:52 -04:00
BDC
f798a69ac4 admin restaurant 2013-04-17 16:47:40 -04:00
Daniel Camargo
f438557e7c partial #1055 - let users who registered with email or facebook also log in with their phone number and be able to reset password with their phone number 2013-04-17 14:14:34 -03:00