3196 Commits

Author SHA1 Message Date
Devin Smith
3c9078c91b more minor ui2 tweaks 2015-04-03 02:09:05 -07:00
Devin Smith
a80f0b1925 updated order confirmation page 2015-04-03 01:23:53 -07:00
Devin Smith
4f89d56067 fixes #5226 2015-04-03 00:32:33 -07:00
Devin Smith
d337922820 order invite tweaks 2015-04-02 19:15:02 -07:00
Devin Smith
631a837cdc center text 2015-04-02 18:54:46 -07:00
Devin Smith
f49ee9cf1d some share tweaks 2015-04-02 18:03:44 -07:00
Pererinha
750786cfc5 Share with SMS contacts as only customer referral option on mobile #5092 2015-04-02 16:40:53 -03:00
Pererinha
454a6c2321 Share with SMS contacts as only customer referral option on mobile #5092 2015-04-02 15:43:18 -03:00
mnmeyers
560fe61d3a fixed #5236 2015-04-01 17:18:12 -07:00
Devin Smith
1f392444fc fixes #5249 2015-04-01 15:08:29 -07:00
Pererinha
389b08c572 Do not pay inactive drivers who shouldn't be paid anymore #5212 2015-04-01 17:48:28 -03:00
Pererinha
5bf6a489ee Driver accepting issues #5192 2015-04-01 13:57:25 -03:00
Pererinha
02b730934f function to unassign pex cards #5158 2015-04-01 10:26:23 -03:00
Pererinha
bcd95d1c56 fields don't save when onboarding driver #5173 2015-04-01 10:03:09 -03:00
Pererinha
017e9dadc3 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-04-01 07:34:03 -03:00
Devin Smith
a9ebda436a fixes #5217 2015-03-31 19:47:53 -07:00
Devin Smith
1cd1b8ce72 fixed up ui2 footer 2015-03-31 19:41:37 -07:00
Devin Smith
1a9acb06a8 ui2 2015-03-31 19:38:00 -07:00
Devin Smith
aa795cec8a ui2 gradient stuff 2015-03-31 19:36:45 -07:00
Devin Smith
5714bddcdc ui2 desktop tweaks 2015-03-31 19:05:10 -07:00
Devin Smith
432b78d827 fixed some restaurants page ui2 stuff 2015-03-31 19:01:39 -07:00
Devin Smith
7cfdadefd3 updated ui2 orders page 2015-03-31 18:30:17 -07:00
Pererinha
b01a08459e Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-03-31 21:30:17 -03:00
Pererinha
51c7f11f72 Credit card payment not working in app on Android phones #5180 2015-03-31 21:29:59 -03:00
Devin Smith
d95e1ec1cb fixed ribbon 2015-03-31 17:23:37 -07:00
Devin Smith
1ab076ebf8 changed signup 2015-03-31 17:12:28 -07:00
Devin Smith
b92d0a51a2 Merge branch 'master' of github.com:crunchbutton/crunchbutton 2015-03-31 13:19:53 -07:00
Devin Smith
9b40446b7c only show first line of address 2015-03-31 13:19:46 -07:00
Devin Smith
0762b4076b fixed issue with address fucking scroll 2015-03-31 13:17:09 -07:00
Pererinha
705284cb56 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton 2015-03-31 17:15:52 -03:00
Pererinha
71d770de47 partial #5191 2015-03-31 17:15:46 -03:00
Devin Smith
d2f95f3755 fixed padding issue 2015-03-31 11:47:10 -07:00
Pererinha
ce2350d5f9 partial #5191 2015-03-31 15:18:26 -03:00
Pererinha
3138c4bfe6 Open Android: Blank Page #5129 2015-03-30 15:12:00 -03:00
Pererinha
c3d3828cda cockpit.la: fix SLOW driver shift preference changes #4474 2015-03-30 11:25:58 -03:00
Pererinha
bd82bf2e74 cockpit.la: fix SLOW driver shift preference changes #4474 2015-03-28 18:48:30 -03:00
Pererinha
76554f140e add field to driver onboarding #4948 2015-03-27 12:19:03 -03:00
Pererinha
5cd0f4a1f1 pex report issues #5114 2015-03-26 21:47:10 -03:00
Devin Smith
6de8a555cb some partial ui2 footer stuff 2015-03-25 18:07:13 -07:00
Devin Smith
8be44eb050 fixes #4579 in ui2 2015-03-25 15:49:23 -07:00
mnmeyers
fa06340d92 fixed #5160 2015-03-25 11:49:42 -07:00
mnmeyers
3b1badae8e Merge remote-tracking branch 'origin/master'
* origin/master:
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  remove tests
  "offload pex cards" still not working right #5144
  "offload pex cards" still not working right #5144
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
  Finish up rewards system #4881
  fix config at pex card
  Finish up rewards system #4881
  changed several ui2 rewards things
  fixes #5147
  pex error: date and month switched in start date! #5145
  more null division fixes
  Finish up rewards system #4881
  yummy, fuckfinals codes not working #5125
  Finish up rewards system #4881

Conflicts:
	www/assets/scss/seven.scss
2015-03-25 11:31:44 -07:00
mnmeyers
a402e1b245 fixed #5142 2015-03-25 11:24:38 -07:00
Pererinha
8a362104f7 Finish up rewards system #4881 2015-03-24 15:57:11 -03:00
Pererinha
cd083ebcb6 Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
Conflicts:
	include/views/default/seven/frontend/orders.phtml
2015-03-24 15:43:42 -03:00
Pererinha
7db4691142 Finish up rewards system #4881 2015-03-24 15:40:19 -03:00
Devin Smith
f20154486b changed several ui2 rewards things 2015-03-24 11:35:27 -07:00
Devin Smith
c303a12c02 fixes #5147 2015-03-24 11:14:40 -07:00
Pererinha
70db3bd94d Finish up rewards system #4881 2015-03-24 10:15:21 -03:00
Pererinha
6aed676e07 Finish up rewards system #4881 2015-03-24 01:18:58 -03:00