raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 21 Branches 450 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

276 Commits

Author SHA1 Message Date
Rohan Mitchell
bf61d12bfa Merge branch 'simple-order-cycles' 
Conflicts:
	app/views/admin/order_cycles/_row.html.haml
 2014-10-23 12:11:34 +11:00
Rohan Mitchell
f7c1340f99 Admin can view an order cycle in the simple edit form 2014-10-23 11:08:27 +11:00
Rohan Mitchell
d47db903fb Add basic styling to simple order cycle interface 2014-10-22 19:12:51 +11:00
Rafael Schouten
96ff387d1f fix navigation check on submission 2014-10-22 15:34:31 +11:00
Rafael Schouten
08cd273be3 Merge branch 'migrate_ent_types' into bugfix 
Conflicts:
	app/models/spree/ability_decorator.rb
 2014-10-18 07:37:41 +11:00
Rafael Schouten
b71a40ae6d show all permitted enterprises in order cycle summery 2014-10-18 03:26:57 +11:00
Rafael Schouten
577cb06371 make navCallback actually versatile 2014-10-18 01:42:29 +11:00
Rohan Mitchell
deedafde9a WIP: Simple order cycle form loads and displays correct info 2014-10-17 16:55:55 +11:00
Rohan Mitchell
d8b648d531 Extract name and timing form from order cycles 2014-10-17 16:51:03 +11:00
Rohan Mitchell
f060da9c8d Rename angular app order_cycle -> admin.order_cycles 2014-10-17 14:13:27 +11:00
Rohan Mitchell
694dd0c329 Enterprise user selling own produce only sees simple order cycle listing 2014-10-17 10:52:36 +11:00
Rafael Schouten
245c1eb305 use a directive for navigation check to attach it to the page instead of the controller 2014-10-17 07:40:08 +11:00
Rafael Schouten
f0a3296e52 change enterprise category name ans use symbols instead of strings 2014-10-16 16:26:49 +11:00
Rafael Schouten
01c179856a set maxlength for short description field 2014-10-12 21:19:59 +11:00
Rafael Schouten
20a94b4365 Merge branch 'master' into migrate_ent_types 
Conflicts:
	app/serializers/api/admin/enterprise_serializer.rb
 2014-10-07 10:52:26 +11:00
Rafael Schouten
9eb770aed7 fix sidebar show/hide 2014-10-05 01:44:40 +10:00
Rafael Schouten
f3fc70ebf0 Merge branch 'master' into raf_bugfix 
Conflicts:
	app/assets/stylesheets/admin/openfoodnetwork.css.scss
 2014-10-04 12:51:55 +10:00
Rafael Schouten
526ab8b80f use is_distributor bool 2014-10-02 16:28:01 +10:00
Rafael Schouten
3a14a26bc6 refactor wysiwyg 2014-10-01 16:07:10 +10:00
Rafael Schouten
726340fc86 configure textAngular on enterprise edit page 2014-09-30 18:20:45 +10:00
Rafael Schouten
5c0d846643 bugfix sells and is_distributor specs and code 2014-09-28 11:55:46 +10:00
Rafael Schouten
b821107c27 bugfix migration ad specs 2014-09-27 18:14:10 +10:00
Rafael Schouten
beb85e862a get type > sells migration mostly working 2014-09-27 15:21:27 +10:00
Rafael Schouten
dee869a273 move checks and links in sidebars 2014-09-26 17:58:00 +10:00
Rafael Schouten
e480d3a135 rearrange admin sidebars 2014-09-26 13:06:29 +10:00
Rob Harrington
07275574b6 Manager can't bulk update owner 2014-09-19 18:31:50 +10:00
Rob H
60297eb5c8 Hide 'New Enterprise' link on index page when user has reached limit 2014-09-11 15:19:23 +10:00
Rob H
41b286f80f Delete specific E2ER in spec 2014-09-11 14:54:51 +10:00
Rob H
3e1f4628e3 Can change owner of enterprises from index page 2014-09-11 14:51:22 +10:00
Rob H
e106c7a0cd Initialise user autocomplete element using data from element itself rather than AJAX request 2014-09-11 14:39:15 +10:00
Rob H
13d814ff23 Adding user autocomplete directive to speed up specification of owner for enterprises 2014-09-11 14:39:15 +10:00
Rob H
73a32fdaf1 Remove distributor_info: 'how does it work' from enterprises edit page 2014-09-11 14:39:14 +10:00
Rob H
8e91e4513d Remove rich text editors from about us in enterprise editor 2014-09-11 14:39:14 +10:00
Rob H
4bde6a0a3d WIP: VERY SLOW PAGE LOAD: Super admin can edit owner of enterprise from edit screen 2014-09-11 14:39:14 +10:00
Rob H
138e0281a3 Specify owner for enterprise create action 2014-09-11 14:39:14 +10:00
Rob H
58f28f112a Enterprise index type selection is only visible to super admin 2014-09-11 14:22:47 +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
780df6bfe0 Hide 'profile type' form element for non super-admin users 2014-09-05 18:38:43 +10:00
Rob H
20bfcd6e48 Switching enterprise relationships form around 2014-09-05 17:11:57 +10:00
Rohan Mitchell
7247e65115 Merge branch 'master' into enterprise-fee-naming-example 2014-09-02 13:36:50 +10:00
Rohan Mitchell
7f74854a2f For OC, fetch all enterprises we have access to, including those via E2E relationships 2014-08-29 16:38:23 +10:00
Rohan Mitchell
0b61872d96 Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-08-29 16:38:10 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +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