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
3,663 Commits 21 Branches 450 Tags
a5debc19dce91abeaebcd7de4bc74f119124b4a1
Commit Graph

223 Commits

Author SHA1 Message Date
Rob H
d80166e80d Restrict access to show_provider_preferences action on payment methods controller 2014-08-08 17:47:50 +10:00
Rob H
f19af52556 WIP: angularised provider settings for payment method works on create (for admin only at this stage) 2014-08-08 17:47:50 +10:00
Rob H
f430267304 Specs for show_provider_preferences 2014-08-08 17:47:50 +10:00
Will Marshall
8496609cc2 Fixing up a couple of regressions 2014-07-29 13:46:38 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
 2014-07-28 13:43:31 +10:00
Rohan Mitchell
3b28981400 Adapt cancel redirect for better spree paypal express 2014-07-25 12:44:14 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-18 17:02:19 +10:00
Will Marshall
a2da7f7ede Merge branch 'caching' into new_cart 
Conflicts:
	app/serializers/api/variant_serializer.rb
 2014-07-18 11:23:25 +10:00
Will Marshall
cd033c300e Reworking order populator and controller to handle replacement of line items rather than addition 2014-07-16 16:00:28 +10:00
Rohan Mitchell
42b951c972 Variants controller #search filters by distribution 2014-07-16 10:31:12 +10:00
Rohan Mitchell
f18141c9bb Use controller login helpers 2014-07-16 10:29:58 +10:00
Will Marshall
26e8a1fd91 Uncaching some parts and adding specs 2014-07-10 14:49:21 +10:00
Rohan Mitchell
ba964d54d9 Update spree and spree_auth_devise 2014-07-04 17:07:58 +10:00
Will Marshall
ed6bb2275a Fixing some regressions in tests, switching favicons 2014-06-26 15:04:32 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
b9561ecf20 Minor refactoring from code review with Rohan 2014-06-19 11:41:24 +10:00
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Rohan Mitchell
9dc02e5eac Add product soft-delete API action 2014-06-12 14:59:26 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray" 
This reverts commit c9d0091cd9.
 2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
Rob H
43c5c37326 Add fields for variant display name and display as to bpe 2014-06-06 10:10:41 +10:00
Rohan Mitchell
634af96a66 Update reports controller spec for multi-order-cycle params 2014-06-06 09:47:16 +10:00
Rob H
66a47f053c Amend products controller spec to include requirement for primary_taxon_id 2014-05-30 16:21:04 +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
20873b6e45 Patching a minor regression spec 2014-05-30 14:21:21 +10:00
Will Marshall
368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL 2014-05-30 12:52:14 +10:00
Will Marshall
5b58bf2c71 Adding our own custom unauthorized page 2014-05-30 11:24:37 +10:00
Rob H
9b10a2cb94 Added 'Add Another' link to new product page. Altered redirects 2014-05-29 12:13:55 +10:00
Will Marshall
391b1da04c adding session token to order test 2014-05-21 10:46:03 +10:00
Will Marshall
ef91f8d17f Redirecting if cart is empty and activating the empty cart link 2014-05-20 16:05:28 +10:00
Will Marshall
685ba3f63a Fixing my modal and the tests 2014-05-20 12:18:28 +10:00
Will Marshall
eab9c28d2e Adding groups to this branch, also tidying up the shop stuff for Laura 2014-05-16 14:00:33 +10:00
Will Marshall
9f169e6ef8 Adding a basic stub of the primary taxon 2014-05-16 10:23:31 +10:00
Will Marshall
5f712a8984 Removing code 2014-05-14 15:16:29 +10:00
Will Marshall
151702d685 Catching order cycle expiry and redirecting 2014-05-14 11:51:25 +10:00
Will Marshall
a3b5ba2257 Adding a spec for visiblity filtering 2014-05-13 16:38:52 +10:00
Will Marshall
23fa1c7b7b Patching a couple more issues 2014-05-02 15:17:44 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Will Marshall
59d2bc908e Adding quick login, more test refactoring 2014-05-01 17:11:56 +10:00
Will Marshall
0f6bd7049c Starting to build out producers Angular page 2014-04-30 12:52:47 +10:00
Will Marshall
4ca148ee93 Starting on the producers controller 2014-04-30 12:05:53 +10:00
Will Marshall
c33fa03736 Merging into master 2014-04-29 10:35:05 +10:00
Will Marshall
f9b7b602da Moving from darkswarm to home 2014-04-24 16:53:00 +10:00
Rohan Mitchell
b649d6ef69 Authorise access to OrderCycles API 2014-04-24 13:20:16 +10:00
Rohan Mitchell
3c8757034a Enterprise user can soft-delete a variant. BUT, only its own variants. 2014-04-24 13:20:16 +10:00