raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 18 Branches 451 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

182 Commits

Author SHA1 Message Date
Rohan Mitchell
0e03b5f209 Admin can change the format that Spree::Images are stored/served in 2014-10-16 12:41:11 +11: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
929839cb9f hide configuration on 2014-10-03 11:46:00 +10:00
Rafael Schouten
726340fc86 configure textAngular on enterprise edit page 2014-09-30 18:20:45 +10:00
Rob H
bcca8c5c0d Merging master into all the things 2014-09-12 13:28:30 +10:00
Rohan Mitchell
e50bbeaefb Edit product form shows permitted suppliers 2014-09-12 11:33:47 +10:00
Rohan Mitchell
033fe88513 New product form shows permitted suppliers 2014-09-12 11:07:59 +10:00
Rob H
c0e4a22a6e Adding enterprise_limit form element to user edit page 2014-09-11 15:19:24 +10:00
Rob H
7780046d71 Clicking on user email takes me to the edit page rather than the annoying 'show' intermediary 2014-09-11 15:19:24 +10:00
Rob H
a3f7fc1202 Adding column for enterprise limit on users index page 2014-09-11 15:19:23 +10:00
Rob H
9085741f3c Removing enterprises form from user edit page 2014-09-11 15:19:23 +10:00
Rob H
73a32fdaf1 Remove distributor_info: 'how does it work' from enterprises edit page 2014-09-11 14:39:14 +10:00
Rohan Mitchell
1d77812ab8 Admin can list enterprise roles 2014-08-15 16:09:04 +10:00
Rob H
c20369919c Can change hub after changing pm type 2014-08-09 11:23:05 +10:00
Rob H
d6aae0050f Angularise payment method provider UI 2014-08-08 17:47:50 +10:00
Rob H
55e29832e1 Make name of payment_methods more human readable 2014-08-08 17:47:50 +10:00
Rob H
1cbdd9a5fa WIP: rearrange payment methods page 2014-08-08 17:47:49 +10:00
Rob H
25d7adac83 WIP: Replace configuration menu on payment methods edit page 2014-08-08 17:47:49 +10:00
Rob H
3d57e0a7a7 Add 'new' buttons to shipping and payment method edit pages 2014-07-24 13:46:35 +10:00
Rohan Mitchell
edeb820c64 Send distributor and order cycle id to order add variant autocomplete search 2014-07-16 09:33:59 +10:00
Rob H
29fde37ba3 Merge branch 'bug-herd' into working 2014-07-03 14:24:39 +10:00
Rob H
934f960336 Add display as to new product page 2014-06-26 15:27:24 +10:00
Rob H
44fb34d7be Rearrange admin title 2014-06-26 12:20:42 +10:00
Rob H
51d3f65934 Remove spree's product tab for all but admin users 2014-06-23 22:01:19 +10:00
Rob H
753a867142 'Back to Products List' on product edit page returns user to BPE 2014-06-23 15:54:53 +10:00
Rob H
7d1acc23ad Cancel button on new product form redirects to BPE 2014-06-23 15:54:14 +10:00
Rob H
a21c2c20f7 Change 'Spree' in admin page title to 'OFN' 2014-06-23 11:26:46 +10:00
Rob H
0d7c682b85 Remove shipping category from admin edit shipping methods 2014-06-19 18:31:52 +10:00
Rob H
004548a4fe Rearrange shipping method edit page 2014-06-18 10:21:21 +10:00
Rob H
8412d740ff Move distributors into sidebar for new & edit shipping methods screen 2014-06-12 16:10:30 +10:00
Rob H
4e98ee6e56 Remove sidebar from admin edit shipping methods 2014-06-12 14:48:36 +10:00
Rob H
4aae6be9b7 Remove unused overrides for primary taxons and product/new 2014-05-30 15:48:36 +10:00
Rob H
66d6de9dfc Merge master (with primary taxons restored) 2014-05-30 15:45:48 +10:00
Rob H
69376e7f4b Merge in master 2014-05-30 15:10:13 +10:00
Will Marshall
a979334f2a Adding primary taxon 2014-05-30 14:31:36 +10:00
Will Marshall
b736145552 Adding primary taxon to admin forms 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
 2014-05-30 14:31:27 +10:00
Rob H
d9f7865572 Can add an image from redesigned new product page 2014-05-30 11:31:53 +10:00
Rob H
9b10a2cb94 Added 'Add Another' link to new product page. Altered redirects 2014-05-29 12:13:55 +10:00
Rob H
e110677b3b WIP: Rearrange new product form 2014-05-29 12:11:06 +10:00
Rohan Mitchell
2a630a855a Move primary taxon field into Rob's new product form 2014-05-29 09:28:08 +10:00
Rob H
4a9a1029a1 Fixed a typo 2014-05-23 22:33:59 +10:00
Rob H
14611896c0 Simplify new product form 2014-05-23 18:08:29 +10:00
Maikel Linke
7d30d8e28f old deface files deleted. spec for enterprise form updated 2014-03-19 20:42:21 +11:00
Will Marshall
c6f1d43dbd Reworking the shipping confirmation 2014-03-19 16:09:45 +11:00
Will Marshall
96ce982ea3 Reworking the checkout into Darkswarm, patching up tests 2014-03-18 15:58:22 +11:00
Will Marshall
2ac7fe3652 Tweaking checkout links 2014-03-14 11:56:24 +11:00
Will Marshall
0c18a9c790 Changing links on cart 2014-03-13 11:56:55 +11:00
Rohan Mitchell
93a661ac08 Do not show product unit fields when creating a new product - make this interface less confusing 2014-03-12 12:35:52 +11:00
Will Marshall
e146bb0dd0 Adding Quick Checkout link 2014-03-06 11:01:25 +11:00
Will Marshall
66866f09b5 Adding the require ship address flag to admin UI: 2014-03-05 11:12:23 +11:00