1692 Commits

Author SHA1 Message Date
Daniel Camargo
7fe8d7c329 added my local server 2014-11-25 12:09:11 -02:00
Daniel Camargo
0f34306ef2 partial #3490 2014-11-25 12:08:58 -02:00
Devin Smith
7106aaaae1 fix. 2014-11-24 23:09:03 -08:00
Daniel Camargo
17fb967879 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2014-11-25 01:29:35 -02:00
Daniel Camargo
b5d4529b1c partial #3490 2014-11-25 01:29:26 -02:00
Devin Smith
6f7b4a3202 dont ssl staging 2014-11-24 16:39:38 -08:00
Devin Smith
e6e5ba4292 removed strip lib to fix bundling 2014-11-24 16:18:42 -08:00
Devin Smith
4fd889e072 temp fix 2014-11-24 16:13:35 -08:00
Devin Smith
1f349b624c fixed #4170 2014-11-24 16:07:29 -08:00
Devin Smith
3f0d5cfda0 testing 2014-11-24 15:48:36 -08:00
Devin Smith
a11eea61f0 more call stuff 2014-11-24 15:39:06 -08:00
Devin Smith
f9e0edf8e2 call changes 2014-11-24 15:20:04 -08:00
Devin Smith
18268246bf better call logging 2014-11-24 14:32:41 -08:00
Devin Smith
6fba70fa7f testing calls 2014-11-24 14:09:39 -08:00
Devin Smith
6e3e36279d order eta stuff 2014-11-24 13:47:04 -08:00
Daniel Camargo
c0f3feddea partial #3849 2014-11-24 18:22:28 -02:00
Devin Smith
a4863b04da fixes #4154 2014-11-24 11:39:49 -08:00
Devin Smith
52bc4d6bfe added some comments and fixed a hot callback issue 2014-11-24 09:06:46 -08:00
Devin Smith
bbd4d750ed rearanged lots of app configuration.
potentialy very breaking
2014-11-24 08:53:54 -08:00
Daniel Camargo
719e5e29eb partial #3979 2014-11-24 11:28:01 -02:00
Devin Smith
6204686213 #4160 2014-11-22 11:44:25 -08:00
Devin Smith
321adcf290 fixes #4077 2014-11-21 15:48:56 -08:00
Daniel Camargo
df4f3a719f partial #3975 2014-11-21 13:56:59 -02:00
Devin Smith
2f78360bb3 added customers and customer page 2014-11-20 15:47:17 -08:00
Daniel Camargo
cb9eea4608 closed #4004 2014-11-20 11:01:18 -02:00
Daniel Camargo
9bd4a4f771 closed #3901 2014-11-19 20:11:42 -02:00
Devin Smith
6dda2e3de4 lots of staff page changes
partial #4116
2014-11-19 12:16:55 -08:00
Daniel Camargo
1cdb089011 closed #4121 2014-11-19 15:50:44 -02:00
Daniel Camargo
ccf1d647a7 closed #3714 2014-11-19 13:35:24 -02:00
Devin Smith
3e5a776106 fixed host callback issue 2014-11-18 20:19:50 -08:00
Devin Smith
fb2e002126 fixes #4129 2014-11-18 20:05:10 -08:00
Devin Smith
41e8600690 more deployment changes
partial #3787
added support for deployment to any repo path.
added tagging system
2014-11-18 16:08:23 -08:00
arzynik
52ababd2dc added phaxio test notification 2014-11-18 14:37:39 -05:00
arzynik
1f7501417b test 2014-11-17 20:28:49 -08:00
Daniel Camargo
cb99d893e9 partial #4017 2014-11-17 19:32:38 -02:00
arzynik
d1a5f17eb0 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2014-11-17 12:56:15 -08:00
arzynik
2b06022279 fixed debug email 2014-11-17 12:56:07 -08:00
Daniel Camargo
7e7fbc1171 partial #4055 2014-11-17 18:53:26 -02:00
Daniel Camargo
4a84a4b1f5 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2014-11-17 18:38:07 -02:00
Daniel Camargo
2a27ebaf23 Big Payment Mess #4055 2014-11-17 18:38:01 -02:00
arzynik
03ea588bca converted to mailgun
fixes #2065
2014-11-17 11:46:53 -08:00
Daniel Camargo
ea6733c3fe Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	include/library/Crunchbutton/Order/Status.php
2014-11-17 15:22:16 -02:00
Daniel Camargo
deea4e8d17 fixed delivery status issue 2014-11-17 15:19:13 -02:00
arzynik
10447e9ade fixed path issue 2014-11-16 20:44:12 -08:00
arzynik
bb66ec9173 log phaxio error data 2014-11-16 20:36:09 -08:00
arzynik
396bc64908 orders fix 2014-11-16 14:11:23 -08:00
arzynik
45ccffbe07 fixes #4123 2014-11-16 13:19:52 -08:00
arzynik
59287de2fe fixed additional status things 2014-11-15 16:06:42 -08:00
arzynik
acf0a1d5fd fixed rejected from showing 2014-11-15 15:53:22 -08:00
arzynik
e5717ef9e9 EXPERIMENTAL order status changes
changed how we get and manage the status of orders and order actions. please be careful as this might break both cockpit.la, cbtn.io, and settlement
2014-11-15 15:14:09 -08:00