Pererinha
98da7051f2
excessive notifications for orders after they are accepted #5139
2015-03-25 17:18:29 -03:00
Pererinha
898c79a98a
retroactive points fixer and script #4849
2015-03-25 16:26:18 -03:00
Pererinha
d9ce2ba125
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-25 16:15:11 -03:00
Pererinha
4e977747c8
Reward Retroactive Points
2015-03-25 16:15:01 -03:00
mnmeyers
61d1ebf717
fixed #5154
2015-03-25 12:03:23 -07:00
mnmeyers
fa06340d92
fixed #5160
2015-03-25 11:49:42 -07:00
mnmeyers
1da045c7ac
delete dup sql
2015-03-25 11:38:00 -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
a09650af27
support change set tables
2015-03-25 11:30:27 -07:00
mnmeyers
a402e1b245
fixed #5142
2015-03-25 11:24:38 -07:00
Pererinha
014e7abcb8
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-25 13:35:41 -03:00
Pererinha
a58553c31f
remove tests
2015-03-25 13:13:38 -03:00
Pererinha
ac9a43a15e
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
...
Conflicts:
include/library/Cockpit/Admin/Pexcard.php
2015-03-25 13:08:02 -03:00
Pererinha
04613462d0
"offload pex cards" still not working right #5144
2015-03-25 13:07:16 -03:00
Pererinha
2cb5c469c5
"offload pex cards" still not working right #5144
2015-03-25 12:49:44 -03:00
Pererinha
f305336eb6
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-24 17:05:24 -03:00
Pererinha
7f48661f70
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-24 17:02:26 -03:00
Pererinha
6fc3c3c19b
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-24 16:59:37 -03:00
Pererinha
4637ffc7df
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-24 16:57:55 -03:00
Pererinha
5aa8f49e86
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-24 16:51:41 -03:00
Pererinha
ec06376be7
100,000 $1 gift codes and 10,000 $3 gift codes in CSV #5100
2015-03-24 16:49:04 -03:00
Pererinha
8a362104f7
Finish up rewards system #4881
2015-03-24 15:57:11 -03:00
Pererinha
7b6de56ae2
fix config at pex card
2015-03-24 15:47:56 -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
5626561ceb
Merge branch 'master' of github.com:crunchbutton/crunchbutton
2015-03-24 11:14:49 -07:00
Devin Smith
c303a12c02
fixes #5147
2015-03-24 11:14:40 -07:00
Pererinha
fad6db9b97
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-24 15:08:31 -03:00
Pererinha
1459509cba
pex error: date and month switched in start date! #5145
2015-03-24 15:08:05 -03:00
Devin Smith
eba47fc262
more null division fixes
2015-03-24 10:18:20 -07:00
Pererinha
70db3bd94d
Finish up rewards system #4881
2015-03-24 10:15:21 -03:00
Pererinha
aec6e9fa83
yummy, fuckfinals codes not working #5125
2015-03-24 02:16:06 -03:00
Pererinha
6aed676e07
Finish up rewards system #4881
2015-03-24 01:18:58 -03:00
mnmeyers
8538e83b92
fixed #5016
2015-03-23 17:55:52 -07:00
Devin Smith
6f1dcb6469
shouldnt be lower
2015-03-23 17:12:41 -07:00
mnmeyers
6819d3e536
fixed #5016
2015-03-23 15:14:03 -07:00
Devin Smith
e816243c65
push fixes
2015-03-23 15:03:22 -07:00
Devin Smith
e885b260b2
push fixes
2015-03-23 14:58:26 -07:00
Devin Smith
6644f4a06b
config save things
2015-03-23 14:48:40 -07:00
Devin Smith
9c5a18d725
android push stuff
2015-03-23 14:19:38 -07:00
Devin Smith
9f9318ae01
fixed scope issue
2015-03-23 13:57:48 -07:00
Devin Smith
f225d3eac7
fixed some android push shit
2015-03-23 13:43:02 -07:00
mnmeyers
10db962246
fixed #5052
2015-03-23 13:35:35 -07:00
Devin Smith
d8a6453f4b
fuxed another null division error
2015-03-23 12:59:27 -07:00
Devin Smith
59e0b5e115
fixed a 0 division issue
2015-03-23 12:55:01 -07:00
Devin Smith
0040abdc6e
Merge branch 'master' of github.com:crunchbutton/crunchbutton
2015-03-23 12:40:12 -07:00
Devin Smith
62dbcbf0b8
minor styling
2015-03-23 12:40:04 -07:00
Pererinha
74d22af4a5
Merge branch 'master' of https://github.com/crunchbutton/crunchbutton
2015-03-23 16:34:54 -03:00
Pererinha
fec27ffd28
retroactive points fixer and script #4849
2015-03-23 16:34:46 -03:00
