Rohan Mitchell
|
f6c1be97a8
|
WIP: Fix apostrophes, add TODO
|
2015-05-07 15:03:27 +10:00 |
|
Rohan Mitchell
|
6fb3fa55a1
|
Allow extended time for all parts of this spec to fix intermittent fails
|
2015-05-07 14:23:58 +10:00 |
|
Rob Harrington
|
f3f0766279
|
Adding a distributor to order cycle to fix broken feature spec
|
2015-05-07 12:50:57 +10:00 |
|
Rob Harrington
|
0d5ce5ff57
|
Fixing issues with reports controller spec
|
2015-05-07 12:50:57 +10:00 |
|
Rob Harrington
|
68b4cb59be
|
Fixing bulk management specs broken by making order_cycles filter update dates
|
2015-05-07 12:50:57 +10:00 |
|
Rob Harrington
|
f88fdac710
|
Adding module - doh!
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
a7019e7e78
|
Adding permissions method for order report enterprises
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
bd66091d75
|
Push logic for checking of user super admin status down into private method
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
d8f5669fbb
|
Renaming granted > related_enterprises_granted
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
5806f50a84
|
Renaming granting > related_enterprises_granting
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
5cd528a87d
|
Removing obsolete related_enterprises_with permission method
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
f0f7e0ee2f
|
Making permissions method managed_and_related_enterprise_with method more specific
|
2015-05-07 12:50:56 +10:00 |
|
Rob Harrington
|
7ffe0f042e
|
Moving accessible_by scope on Enterprise to permissions
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
f79fba52be
|
Hiding personal details of customers, where the user does not manage the distributor of the order or the coordinator of the order cycle
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
4259b466f5
|
Using new order and line item permissions to fetch items to display in Orders and Fullfillment reports
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
0a03483e36
|
Adding permissions methods for visible and editable orders and line_items
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
28bf7037db
|
Updating methods for retrieving allowed producers, distributors and order cycles for order and fulfillment reports
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
ed9bbe2c45
|
Sorting Hub and Producer filter selectors by name
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
b5c7607d67
|
Order cycle filter resets date filters on BOM
|
2015-05-07 12:50:55 +10:00 |
|
Rob Harrington
|
e640376d63
|
Don't load cancelled orders into bulk order management
|
2015-05-07 12:50:54 +10:00 |
|
Rob Harrington
|
9ab16d8cec
|
Allowing calls to Api::OrderCyclesController#accessible to specify :as => 'distributor' or 'producer'
|
2015-05-07 12:50:54 +10:00 |
|
Rob Harrington
|
d8c23d37ac
|
Update accessible_by scope on enterprise, to read from permissions
|
2015-05-07 12:50:54 +10:00 |
|
Rob Harrington
|
89b153dc2c
|
Update AJAX request to use sells instead of deprecated is_distributor attribute
|
2015-05-07 12:50:54 +10:00 |
|
Rohan Mitchell
|
bd6bac8874
|
Display deployment output in real time
This reverts commit 485eee4bdd.
|
2015-05-06 20:02:22 +10:00 |
|
Rohan Mitchell
|
50d2ddc05f
|
Add progress comments
|
2015-05-06 20:00:50 +10:00 |
|
Rohan Mitchell
|
10b7a86745
|
Add debugging to merge script
|
2015-05-06 19:50:06 +10:00 |
|
Rohan Mitchell
|
6d33dc5070
|
Add script to merge master into the current branch if required before running specs
|
2015-05-06 19:41:36 +10:00 |
|
Rohan Mitchell
|
d109e898d2
|
Preserve newlines when displaying deploy script output
|
2015-05-06 19:38:20 +10:00 |
|
Rohan Mitchell
|
3dee29cd12
|
Remove build badge - master branch is always green
|
2015-05-06 19:37:21 +10:00 |
|
Rohan Mitchell
|
0921cd2dfa
|
Merge branch 'master' into single-order-patches
|
2015-05-06 18:13:55 +10:00 |
|
Rohan Mitchell
|
7b4130972b
|
Fix first feature spec sometimes timing out
|
2015-05-06 18:12:17 +10:00 |
|
Rohan Mitchell
|
485eee4bdd
|
Deploy scripts display their output
|
2015-05-06 18:07:50 +10:00 |
|
Rohan Mitchell
|
f84e704d99
|
Retry simple push-to-master script
|
2015-05-06 17:59:36 +10:00 |
|
Rohan Mitchell
|
ad7e5a45bb
|
Add updated merge script
|
2015-05-06 17:58:36 +10:00 |
|
Rohan Mitchell
|
d9404d3332
|
Merge branch 'master' into single-order-patches
|
2015-05-06 17:29:23 +10:00 |
|
Rohan Mitchell
|
f024f62970
|
Content-manage footer fields
|
2015-05-06 16:36:10 +10:00 |
|
Rohan Mitchell
|
bf435a8f3d
|
Make home page what's happening text and about URL configurable
|
2015-05-06 15:17:28 +10:00 |
|
Rohan Mitchell
|
01d1e84f85
|
Update global links
|
2015-05-06 15:15:09 +10:00 |
|
Rohan Mitchell
|
e43d726b97
|
Merge branch 'master' into payments-report-fix
|
2015-05-06 14:55:10 +10:00 |
|
Rohan Mitchell
|
b5a6f9c1bc
|
Add infrastructure so admin can configure content. Make homepage tagline CTA configurable.
|
2015-05-06 14:54:16 +10:00 |
|
Rohan Mitchell
|
1ffba674b3
|
Show real stats on home page
|
2015-05-06 14:54:16 +10:00 |
|
Rohan Mitchell
|
e662aab004
|
Brand story can be expanded and contracted
|
2015-05-06 14:54:16 +10:00 |
|
Rohan Mitchell
|
abee9c8198
|
Update security text and licensing
|
2015-05-06 14:54:15 +10:00 |
|
summerscope
|
3bca1f2070
|
Tweaks to homepage styling
|
2015-05-06 11:32:47 +10:00 |
|
Rob Harrington
|
8788322492
|
Alllowing payments in payment reports to access soft-deleted payment methods
|
2015-05-06 11:10:50 +10:00 |
|
summerscope
|
808979a8e0
|
Add a to do note for Rohan in css
|
2015-05-06 09:44:45 +10:00 |
|
summerscope
|
b0f76330b7
|
Changing order of events on homepage to make shopping the most obvious thing on homepage.
|
2015-05-06 09:38:49 +10:00 |
|
summerscope
|
216f99d1c7
|
New link for footer - updated URL
|
2015-05-05 16:14:18 +10:00 |
|
summerscope
|
31c4af154e
|
Applying Jay's copy to homepage
|
2015-05-05 15:44:36 +10:00 |
|
summerscope
|
e7d09f1b55
|
Change copy as supplied by Jay
|
2015-05-05 15:32:04 +10:00 |
|