Rohan Mitchell
|
fec375fbea
|
Decrease padding on brand story
|
2015-05-11 16:52:39 +10:00 |
|
Rohan Mitchell
|
5498d03660
|
Add zoomed-in tile
|
2015-05-11 16:52:01 +10:00 |
|
Rohan Mitchell
|
82334036d1
|
Orange-styled tile
|
2015-05-11 16:43:53 +10:00 |
|
Rohan Mitchell
|
fa6b0fac3f
|
Add landscape hero image
|
2015-05-11 16:36:26 +10:00 |
|
Rohan Mitchell
|
f99333dbd5
|
Remove trailing whitespace
|
2015-05-11 16:35:50 +10:00 |
|
Rohan Mitchell
|
9ee6ef06da
|
Return logo to smaller size
This reverts commit 460d0c9907.
|
2015-05-11 16:14:30 +10:00 |
|
Rohan Mitchell
|
460d0c9907
|
Increase size of logo to fill page above the fold. Remove cta1 pane.
|
2015-05-11 15:53:46 +10:00 |
|
Rohan Mitchell
|
14afe932c1
|
Resize menu logo, make it always fully opaque
|
2015-05-11 14:39:53 +10:00 |
|
Rohan Mitchell
|
978c176cf6
|
Remove filter on hero image, set up superimposed logo and shop now CTA
|
2015-05-11 14:37:28 +10:00 |
|
Rohan Mitchell
|
3e82deb1f5
|
Add new home hero images
|
2015-05-11 14:32:07 +10:00 |
|
Rick Giner
|
b7c1a43125
|
Issue #540 Fix up hub list navigation
|
2015-05-10 18:13:30 +10:00 |
|
Rick Giner
|
98c1a95bd1
|
Issue #531 remove Google map road markers
|
2015-05-10 16:51:56 +10:00 |
|
Rick Giner
|
9c3ec950fc
|
Revert "ginerr_#531_remove Google map road markers"
This reverts commit 3e2117134f.
|
2015-05-10 16:50:58 +10:00 |
|
Rick Giner
|
3e2117134f
|
ginerr_#531_remove Google map road markers
|
2015-05-10 16:50:00 +10:00 |
|
Lynne
|
90dd1ea4a2
|
Merge pull request #1 from openfoodfoundation/variable_weights
Merging
|
2015-05-09 19:25:30 +01:00 |
|
Lynne Davis
|
26ee5c49b2
|
Fixing merge conflicts
|
2015-05-09 19:14:50 +01:00 |
|
Lynne Davis
|
3179887842
|
Do not allow line_item.unit_value to be updated if the variant.unit_value is zero
|
2015-05-09 19:12:24 +01:00 |
|
Lynne Davis
|
4d025ee7a9
|
Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.
|
2015-05-09 19:10:55 +01:00 |
|
Lynne Davis
|
521834bd76
|
Populate the line item unit value, when line_item created and update old data in migration
|
2015-05-09 19:10:55 +01:00 |
|
Lynne Davis
|
662c7fe368
|
Removing notes to myself from this file
|
2015-05-09 19:10:55 +01:00 |
|
Lynne Davis
|
54da7ae241
|
Adding additional logic for if the line_item unit_value is nil
|
2015-05-09 19:10:55 +01:00 |
|
Lynne Davis
|
2a991ad130
|
Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.
|
2015-05-09 19:10:55 +01:00 |
|
Lynne Davis
|
2f463474fb
|
Adding specs for variable weight adjustment via builk order management
|
2015-05-09 19:10:55 +01:00 |
|
Lynne Davis
|
f7ade48e86
|
Update DB schema to store updatable weight on items sold
|
2015-05-09 19:10:55 +01:00 |
|
Paul Mackay
|
fd37324359
|
#536: Add permissions checking for Notify producers action.
|
2015-05-09 11:02:25 +01:00 |
|
Continuous Integration
|
3d0880857a
|
Auto-merge from CI [skip ci]
|
2015-05-08 16:24:39 +10:00 |
|
Rohan Mitchell
|
8cb8aacefe
|
Switch logo for white menu
|
2015-05-08 16:07:59 +10:00 |
|
Rohan Mitchell
|
6fc9789477
|
Invert colours on top menu
|
2015-05-08 15:11:54 +10:00 |
|
Rohan Mitchell
|
6322fdc1f0
|
Disable top alert
|
2015-05-08 15:03:37 +10:00 |
|
Continuous Integration
|
df14c10608
|
Auto-merge from CI [skip ci]
|
2015-05-08 13:45:56 +10:00 |
|
Rohan Mitchell
|
1531c476e3
|
Merge branch 'master' into require_standard_variant
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
|
2015-05-08 13:45:31 +10:00 |
|
Rohan Mitchell
|
e8c8d8885c
|
Merge branch 'master' into single-order-patches
|
2015-05-08 12:42:56 +10:00 |
|
Rohan Mitchell
|
768c9f24a2
|
Make topbar height configurable
|
2015-05-08 11:22:55 +10:00 |
|
Rohan Mitchell
|
a450d3af81
|
Variables can now be used to override foundation vars
|
2015-05-08 11:15:27 +10:00 |
|
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 |
|