Rohan Mitchell
|
80834a0c27
|
Merge branch 'master' into ginerr_bugfixes
|
2015-06-05 15:49:43 +10:00 |
|
Rob Harrington
|
439d122e93
|
Merge branch 'master' into customers
Conflicts:
app/assets/javascripts/admin/bulk_order_management.js.coffee
app/assets/javascripts/admin/bulk_product_update.js.coffee
app/assets/javascripts/admin/directives/line_item_upd_attr.js.coffee
app/views/spree/admin/orders/bulk_management.html.haml
db/schema.rb
spec/javascripts/unit/bulk_order_management_spec.js.coffee
|
2015-06-03 15:19:40 +08:00 |
|
Rohan Mitchell
|
7486daa2a3
|
Merge branch 'master' into require_standard_variant
Conflicts:
spec/controllers/spree/admin/variants_controller_spec.rb
spec/lib/open_food_network/permissions_spec.rb
spec/lib/open_food_network/products_and_inventory_report_spec.rb
spec/models/enterprise_spec.rb
|
2015-05-28 15:08:13 +10:00 |
|
Rick Giner
|
a5482c269f
|
#541 Fixed issue of showing negative 'more' numbers, and only working for current Hub
|
2015-05-24 09:52:34 +10:00 |
|
Rob Harrington
|
78fc3e376b
|
Fixing styling of inputs for with pending/success/error status
|
2015-05-14 11:39:37 +10:00 |
|
Rob Harrington
|
3bc69242ce
|
Style tweaks
|
2015-05-13 12:44:37 +10:00 |
|
Rob Harrington
|
a03c7a5f22
|
Adding ngTagsInput to admin assets
|
2015-05-13 12:44:36 +10:00 |
|
Rob Harrington
|
a60fd3d388
|
Installing ngTagInput
|
2015-05-13 12:44:36 +10:00 |
|
Rick Giner
|
62ae38372e
|
#541 add "show more" link to producers lists in hub on home page
|
2015-05-11 20:31:24 +10:00 |
|
Rick Giner
|
b7c1a43125
|
Issue #540 Fix up hub list navigation
|
2015-05-10 18:13:30 +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
|
0b652a2113
|
Add refund icon
|
2015-04-30 15:49:48 +10:00 |
|
Rob Harrington
|
992fb2347d
|
Merging master branch into require_standard_variant
|
2015-04-29 14:30:49 +10:00 |
|
Rob Harrington
|
ed15b95de0
|
Adding properties and taxons to producer modal
|
2015-04-23 12:31:20 +10:00 |
|
Rob Harrington
|
a75a76840d
|
Merging master into require_standard_variant
|
2015-04-17 21:18:24 +10:00 |
|
Rob Harrington
|
f13b52411d
|
Merge branch master into properties
|
2015-04-17 13:23:33 +10:00 |
|
Rob Harrington
|
8248e382f3
|
Greying out disabled action button
|
2015-04-17 11:25:18 +10:00 |
|
Rob Harrington
|
f8a9652333
|
Moving SASS comments to thier own lines
|
2015-03-27 15:56:07 +11:00 |
|
summerscope
|
7090bb518b
|
Tweaking logic for alert bar to make messages more human readable for all use cases.
|
2015-03-20 14:24:59 +11:00 |
|
summerscope
|
0b1857771e
|
Finally got this slide animation working. stupid angular documentation!
ref: http://www.yearofmoo.com/2013/08/remastered-animation-in-angularjs-1-2.html
|
2015-03-20 13:09:45 +11:00 |
|
summerscope
|
b99e94cecf
|
WIP on producer and product modals
|
2015-03-19 16:02:52 +11:00 |
|
summerscope
|
1f97052954
|
Add a min height to modals so they are not quite so stupidly small when not enough content suppied by users
|
2015-03-19 15:05:14 +11:00 |
|
summerscope
|
3c61bf9cc4
|
Styling for no image available on product modal overlay
|
2015-03-19 14:51:41 +11:00 |
|
summerscope
|
8a0bbb374c
|
Animation WIP
|
2015-03-19 14:51:23 +11:00 |
|
summerscope
|
7b1901253c
|
More work on filters for shopfront rewriting as compared to the rest of filter button styles
|
2015-03-13 17:32:33 +11:00 |
|
summerscope
|
864c9ec1da
|
This changes the user menu labels to show Account next to user email.
Small tweak to user account page to make it less awful.
|
2015-03-13 16:49:26 +11:00 |
|
summerscope
|
dc1dd2e243
|
Changing the class .filter-box for shopfront to .filter-shopfront
This prevents the issue with inheritance / styling crossover
|
2015-03-13 16:06:46 +11:00 |
|
summerscope
|
e3bc7cf894
|
Styling for search alert on shopfront page
|
2015-03-13 15:36:06 +11:00 |
|
summerscope
|
e5cc9063e8
|
Changing the medium input styling to make it same height as taxon filters, and no animation to get big as we want the next row space for tags eventually
|
2015-03-13 15:35:45 +11:00 |
|
summerscope
|
88edaceee0
|
Adding a new color to brand colors - yellow light
|
2015-03-13 15:34:38 +11:00 |
|
summerscope
|
bce64a1ead
|
WIP product modals for shopfront
|
2015-03-13 15:34:11 +11:00 |
|
summerscope
|
c8c07ed700
|
Adding position fixed to modals - got lost somehow with upgrading foundation zurb
|
2015-03-13 12:59:26 +11:00 |
|
summerscope
|
0258fc24f3
|
Moving comments to own line. New version of SASS does not like comments on same line as declarations.
|
2015-03-13 12:58:45 +11:00 |
|
Rob Harrington
|
274a7a3c73
|
Fixing up the one liner filter styling a bit
|
2015-03-12 09:56:06 +11:00 |
|
summerscope
|
d967905b83
|
Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos
|
2015-03-10 14:59:26 +11:00 |
|
summerscope
|
b9a0579397
|
Add styling for image thumbnail - hide for small, show small thumbnail for big screens.
|
2015-03-10 11:35:03 +11:00 |
|
summerscope
|
de6abc3464
|
Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere.
|
2015-03-10 11:34:31 +11:00 |
|
Rob Harrington
|
0a300d1802
|
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
|
2015-03-06 19:03:46 +11:00 |
|
Rob Harrington
|
578475a403
|
Filter products list on shop by active properties
|
2015-03-06 16:14:11 +11:00 |
|
summerscope
|
9a86e41942
|
Adding more helper classes
|
2015-03-05 17:20:02 +11:00 |
|
Rob Harrington
|
4afef8215a
|
Basic implementation of single line selectors
|
2015-03-05 12:12:36 +11:00 |
|
summerscope
|
235bb009e8
|
Tweaking styling for order confirmation page
|
2015-03-05 11:25:57 +11:00 |
|
summerscope
|
db2e5e7558
|
Add an extra class helper
|
2015-03-04 17:19:57 +11:00 |
|
summerscope
|
4867f45ee1
|
Add an extra style
|
2015-03-04 17:19:37 +11:00 |
|
summerscope
|
587e4ae86d
|
WIP getting all the confirmation details right for collection, delivery, etc.
|
2015-02-27 16:08:20 +11:00 |
|
summerscope
|
87842ecaf5
|
More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.
|
2015-02-27 14:00:49 +11:00 |
|
summerscope
|
469b383781
|
Properties and shopfront filters with taxons WIP.
|
2015-02-25 16:04:32 +11:00 |
|
summerscope
|
15144bdddd
|
WIP search input on shopfront page.
|
2015-02-25 13:18:45 +11:00 |
|
summerscope
|
d43f367f30
|
Shopfront Properties - WIP layout work
|
2015-02-25 11:11:09 +11:00 |
|
summerscope
|
122cf6c065
|
Groups index page styling for responsive use cases.
|
2015-02-25 10:22:33 +11:00 |
|