summerscope
|
60ac3f29a5
|
Producers page WIP
|
2014-09-05 16:41:00 +10:00 |
|
summerscope
|
adb8b6b02f
|
Styling for help icon
|
2014-09-05 16:40:59 +10:00 |
|
summerscope
|
b3f97479d3
|
Hide profile filter from search for the mo
|
2014-09-05 16:40:59 +10:00 |
|
Rob H
|
097367a9f8
|
Map modals for 'profile' enterprises do not display shopping options
|
2014-09-05 16:28:08 +10:00 |
|
Rob H
|
1e1ddedfb2
|
Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend
|
2014-09-05 16:18:45 +10:00 |
|
Rob H
|
428e4c63d4
|
Profile hubs don't show up in hubs list
|
2014-09-05 16:18:25 +10:00 |
|
summerscope
|
0d0ffa1cd0
|
Making CTA links consistent with modals, adding in logic to force space holding for producer fat view
|
2014-09-05 15:47:41 +10:00 |
|
summerscope
|
a092e97294
|
Adding a little bit of spacing between each row for active table
|
2014-09-05 15:47:14 +10:00 |
|
summerscope
|
26bd1000de
|
Changing placeholder for search input
|
2014-09-05 15:28:50 +10:00 |
|
summerscope
|
59adae5c9c
|
Working on space placeholders for fat view
|
2014-09-05 15:28:32 +10:00 |
|
Rob H
|
233532a85f
|
Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend
|
2014-09-05 15:14:48 +10:00 |
|
summerscope
|
99fb9c1966
|
Adding in markup and styling for new layout of hubs list view
|
2014-09-05 15:10:17 +10:00 |
|
Rohan Mitchell
|
3a12f9a7c8
|
Extract bulk product edit interface into partials
|
2014-09-05 15:10:17 +10:00 |
|
Rohan Mitchell
|
4d766a29ab
|
Convert admin login nav to haml
|
2014-09-05 15:10:16 +10:00 |
|
Rohan Mitchell
|
c43c35601b
|
Set product.largeImage in JS, use for product modal
|
2014-09-05 15:10:16 +10:00 |
|
Rohan Mitchell
|
fe1c60ba47
|
Enterprise manager can edit products from enterprises it has manage_products permission on
|
2014-09-05 15:10:16 +10:00 |
|
Rohan Mitchell
|
b7708d750b
|
Check authorisation for bulk update products
|
2014-09-05 15:10:15 +10:00 |
|
Rohan Mitchell
|
fbd4f98fa9
|
Include producers I have permission to in BPE producers choice
|
2014-09-05 15:10:15 +10:00 |
|
Rohan Mitchell
|
9ec5dc6466
|
Find enterprises that we manage products for
|
2014-09-05 15:10:14 +10:00 |
|
Rohan Mitchell
|
e023a66167
|
Bulk product edit lists managed products
|
2014-09-05 15:10:14 +10:00 |
|
Rohan Mitchell
|
4af704b1d0
|
Fetch managed products via OpenFoodNetwork::Permissions
|
2014-09-05 15:10:14 +10:00 |
|
Rohan Mitchell
|
1ea63bca6e
|
Name test enterprises semantically
|
2014-09-05 15:10:14 +10:00 |
|
digital dreamer
|
503fb53750
|
Fix #242 - foreign key constraint error on load_sample_data
|
2014-09-05 15:10:14 +10:00 |
|
Rohan Mitchell
|
6ff6e4248c
|
Rename spec to match view name change
|
2014-09-05 15:10:14 +10:00 |
|
Rohan Mitchell
|
57af658e7c
|
For OC, fetch all enterprises we have access to, including those via E2E relationships
|
2014-09-05 15:10:13 +10:00 |
|
Rohan Mitchell
|
913c167fdf
|
Revert 5ede8d1, reinstating a4be0ff..7b89e6a
|
2014-09-05 15:10:12 +10:00 |
|
Maikel Linke
|
7603ea867f
|
Store links to root_path instead of product_path
|
2014-09-05 15:10:12 +10:00 |
|
Maikel Linke
|
c5cfda5283
|
Adding login_nav partial from spree_auth_devise
Preparing to change 'Store' link for Bugherd #443.
|
2014-09-05 15:10:12 +10:00 |
|
Maikel Linke
|
aaa32528ea
|
Giving an example name for an enterprise fee.
The example is displayed as input placeholder. See bugherd #439.
|
2014-09-05 15:10:11 +10:00 |
|
Maikel Linke
|
602dfbe002
|
ng_text_field handling options parameter
|
2014-09-05 15:10:10 +10:00 |
|
Rob H
|
14aada1808
|
Add 'profile only' logic to maps icons
|
2014-09-05 15:09:15 +10:00 |
|
Rob H
|
32ee8afdce
|
logic for producer shop icon in list view
|
2014-09-05 14:46:04 +10:00 |
|
summerscope
|
7b9ff9b6dd
|
Merge branch 'ent_types_frontend' of github.com:openfoodfoundation/openfoodnetwork into ent_types_frontend
Conflicts:
app/views/home/_skinny.html.haml
|
2014-09-05 12:48:05 +10:00 |
|
summerscope
|
658c27408e
|
Styling for hub listing page and tweaks to markup to accomodate new icons and styling
|
2014-09-05 12:32:45 +10:00 |
|
Rob H
|
8f6d04a129
|
Adding properties to enterprise serialiser to allow differentiation between profile, shopfront and aggregators
|
2014-09-05 12:30:52 +10:00 |
|
summerscope
|
b487c9848b
|
Add checkbox for show / hide profiles
|
2014-09-05 12:15:14 +10:00 |
|
summerscope
|
94fbb624f5
|
Make CTA links separate from hub link styling
|
2014-09-05 12:14:55 +10:00 |
|
summerscope
|
ed0f2de2f3
|
More styling for CTA links on modals
|
2014-09-05 11:56:21 +10:00 |
|
summerscope
|
c64ef39e22
|
Ran a DB:micrate, this is a change to the order
|
2014-09-05 11:39:43 +10:00 |
|
summerscope
|
0138fded17
|
Styling for modals
|
2014-09-05 11:39:04 +10:00 |
|
summerscope
|
116eb6a2c6
|
template updates for modals - links not buttons
|
2014-09-05 11:38:19 +10:00 |
|
Rohan Mitchell
|
0fd496aa97
|
Extract bulk product edit interface into partials
|
2014-09-02 15:27:51 +10:00 |
|
Rohan Mitchell
|
4d57a73ee3
|
Merge branch 'digital-dreamer-fix-242-foreign-key'
|
2014-09-02 14:08:45 +10:00 |
|
Rohan Mitchell
|
7d6dbeba28
|
Merge branch 'fix-242-foreign-key' of https://github.com/digital-dreamer/openfoodnetwork into digital-dreamer-fix-242-foreign-key
|
2014-09-02 14:02:14 +10:00 |
|
Rohan Mitchell
|
f53ed4bf31
|
Merge branch 'admin-panel-store-link'
|
2014-09-02 13:45:25 +10:00 |
|
Rohan Mitchell
|
818a0f8595
|
Convert admin login nav to haml
|
2014-09-02 13:45:11 +10:00 |
|
Rohan Mitchell
|
a347152490
|
Merge branch 'master' into admin-panel-store-link
|
2014-09-02 13:39:46 +10:00 |
|
Rohan Mitchell
|
fce2147dc1
|
Merge branch 'enterprise-fee-naming-example'
|
2014-09-02 13:39:11 +10:00 |
|
Rohan Mitchell
|
7247e65115
|
Merge branch 'master' into enterprise-fee-naming-example
|
2014-09-02 13:36:50 +10:00 |
|
Rohan Mitchell
|
2cd5afbf9c
|
Set product.largeImage in JS, use for product modal
|
2014-09-01 16:21:23 +10:00 |
|