Rob H
|
b49a4cbc4f
|
Fix intermittent failing spec
|
2014-09-08 11:11:07 +10:00 |
|
Rob H
|
3ee0cf46e0
|
Merge branch 'working' into merging
|
2014-09-08 10:12:31 +10:00 |
|
Rob H
|
36891c73cb
|
Merge branch 'master' into merging
|
2014-09-08 10:09:51 +10:00 |
|
Rob H
|
a968aa9b91
|
Removing float:left which weirdly breaks specs
|
2014-09-08 10:09:00 +10:00 |
|
Rob H
|
5fb4110328
|
Adding distributor and producer checkboxes to enterprise index
|
2014-09-07 21:04:53 +10:00 |
|
Rob H
|
6540bb8efc
|
Adding select field for enterprise type to index when super admin
|
2014-09-07 19:51:14 +10:00 |
|
Rob H
|
b8fadb50ae
|
Special Instructions in checkout are actually wired up
|
2014-09-06 12:00:27 +10:00 |
|
Rob H
|
9dc2b248c7
|
Bulk management permissions make more sense
|
2014-09-06 09:37:34 +10:00 |
|
Rob H
|
ee4a1925fe
|
Bulk Order Management works with navigation helper override
|
2014-09-06 00:34:27 +10:00 |
|
Rob H
|
780df6bfe0
|
Hide 'profile type' form element for non super-admin users
|
2014-09-05 18:38:43 +10:00 |
|
Rob H
|
58dcdbd9c4
|
Restricting ability to change enterprise type at the controller level
|
2014-09-05 18:30:15 +10:00 |
|
summerscope
|
2e8ec3df18
|
Tweak placeholder messages for big inputs
|
2014-09-05 18:07:50 +10:00 |
|
summerscope
|
6271b83fad
|
Tweak placeholder messages for big inputs
|
2014-09-05 18:07:28 +10:00 |
|
summerscope
|
778cf0326b
|
Changing placeholder for
|
2014-09-05 18:04:02 +10:00 |
|
summerscope
|
94e3946d52
|
producer list view styling
|
2014-09-05 17:54:16 +10:00 |
|
summerscope
|
0b74242f49
|
make classes more generic for more use-cases
|
2014-09-05 17:53:52 +10:00 |
|
summerscope
|
bb82fc4b20
|
move generic things into active table
|
2014-09-05 17:53:27 +10:00 |
|
summerscope
|
6e10c416e2
|
hub view styling
|
2014-09-05 17:53:14 +10:00 |
|
summerscope
|
ab44046658
|
skinny view producers remove unnecessary spacer element
|
2014-09-05 17:52:36 +10:00 |
|
summerscope
|
a9619a6dca
|
Changes to markup on producer page to adjust layout
|
2014-09-05 17:50:50 +10:00 |
|
Rob H
|
20bfcd6e48
|
Switching enterprise relationships form around
|
2014-09-05 17:11:57 +10:00 |
|
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 |
|