raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,695 Commits 18 Branches 452 Tags
fbd4f98fa9daa68a8ce99fe8046ac5ae29bb8582
Commit Graph

3695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
summerscope
a4aa949499 Applying new icons for map view 2014-08-29 18:04:06 +10:00
summerscope
ae442769b5 New version of icon font for OFN system 2014-08-29 18:03:47 +10:00
summerscope
a31e8ff82f New map icons 2014-08-29 18:03:15 +10:00
summerscope
4efe3fdf88 Remove old map icons 2014-08-29 18:01:54 +10:00
Rob H
ba3f97ca1f Fixing enterprise relationships spec 2014-08-28 14:45:24 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +10:00
Rob H
bfd9ffd84a Adding missing data-bindings for country/state 2014-08-28 14:25:21 +10:00
Rohan Mitchell
7b89e6aa80 Revert "Comment out ERPs which have confusing names, use old 'permits'" 
This reverts commit a4be0ff55a.
 2014-08-28 10:12:06 +10:00
Rohan Mitchell
1871d42e68 Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page 2014-08-28 10:09:50 +10:00
Rohan Mitchell
a5debc19dc Permit edits to exchanges involving enterprises permitted via E2E relationships 2014-08-28 10:09:50 +10:00
Rohan Mitchell
628d87b69a Add to OC permission allows adding distributors to order cycle 2014-08-28 10:09:50 +10:00
Rohan Mitchell
5ef13d3c5a Change 'add products to OC' permission into the more general 'add enterprise to OC' 2014-08-28 10:09:50 +10:00
Rohan Mitchell
099a5b0b7b Show E2E related enterprise exchanges in OC 2014-08-28 10:09:50 +10:00
Rohan Mitchell
34602244ca Show permitted suppliers in order cycle add supplier select box 2014-08-28 10:09:50 +10:00
Rohan Mitchell
b9e5821497 Add EnterpriseRelationship scopes permitting and with_permission 2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class 2014-08-28 10:09:50 +10:00
Rohan Mitchell
a7689973be Semantically name enterprises in spec 2014-08-28 10:09:50 +10:00
Rohan Mitchell
5e8bdce67d Refactor spec 2014-08-28 10:09:50 +10:00
Rob H
a4be0ff55a Comment out ERPs which have confusing names, use old 'permits' 2014-08-27 17:07:30 +10:00
Rob H
7124dc57fd Requiring a state in checkout 2014-08-27 16:59:26 +10:00
Rob H
400f2ea9b9 Don't add payment forms to checkout DOM unless required 2014-08-27 15:09:41 +10:00
Rohan Mitchell
0462b3e55d Prevent duplicate enterprise roles 2014-08-26 14:40:34 +10:00
Rob H
435819acc4 Removing unit text from total units column 2014-08-25 20:29:24 +10:00
Rob H
310d1b3726 Zeus server does not crash when editing controllers 2014-08-25 20:29:24 +10:00
Rob H
0d9e07d484 Make restore script compatible with OSX 2014-08-25 20:29:23 +10:00
Rohan Mitchell
45a44844ca Remove old rabl spec 2014-08-25 16:38:17 +10:00
Rohan Mitchell
1a995aedda Simplify enterprise_relationship factory - leverage permissions_list= model method 2014-08-25 15:20:46 +10:00