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
3,117 Commits 18 Branches 451 Tags
e4c8c19fea02db8a3297d7cb677391cb9ed24042
Commit Graph

1451 Commits

Author SHA1 Message Date
Rohan Mitchell
5a235be110 Fix regressed JS spec 2014-06-27 11:56:09 +10:00
Rohan Mitchell
4075854440 Navigation.go supports full URLs 2014-06-27 11:51:53 +10:00
Rohan Mitchell
b678a2f7fd Move navigation spec to services dir 2014-06-27 11:34:02 +10:00
Will Marshall
f8d51c3105 Fixing intermittent spec failure 2014-06-26 15:43:33 +10:00
Will Marshall
9eb43e6c09 Removing visible scopes from enteprise distributors and producers 2014-06-26 15:26:15 +10:00
Will Marshall
ed6bb2275a Fixing some regressions in tests, switching favicons 2014-06-26 15:04:32 +10:00
Will Marshall
a4e675e675 Refactoring visibility handling 2014-06-26 14:48:46 +10:00
Will Marshall
8862fd555c Removing ng-animate, changing our enterprise restriction 2014-06-26 14:36:16 +10:00
Will Marshall
9667b84c5c Finishing the transition to AMS from RABL 2014-06-26 11:07:53 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
369761ccc5 Minor regression bug 2014-06-24 17:15:31 +10:00
Will Marshall
c09555e380 Tab fixes, new tests, reworking modals 2014-06-24 17:15:31 +10:00
Rob H
9099fca11c Merge branch 'bug-herd' into working 2014-06-23 22:01:41 +10:00
Rob H
51d3f65934 Remove spree's product tab for all but admin users 2014-06-23 22:01:19 +10:00
Will Marshall
21589fd5b0 Hack patching home page modals 2014-06-20 16:31:49 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00
Rob H
1a0a8ec160 Merge branch 'master' into working 2014-06-20 13:54:52 +10:00
Will Marshall
8bb5f75ea0 Temporary fix to get staging working 2014-06-20 13:51:21 +10:00
Rob H
2861191ab7 Merge branch 'sm-desc' into working 2014-06-20 09:43:58 +10:00
Will Marshall
f8da754372 Patching Rabl helper 2014-06-19 21:26:51 +10:00
Rob H
0d7c682b85 Remove shipping category from admin edit shipping methods 2014-06-19 18:31:52 +10:00
Will Marshall
34e2170faf Patching some regressions 2014-06-19 14:36:47 +10:00
Will Marshall
6e5e202461 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/services/map_modal.js.coffee
	app/assets/javascripts/darkswarm/services/product.js.coffee
	app/assets/javascripts/templates/map_modal_hub.html.haml
	app/assets/javascripts/templates/map_modal_producer.html.haml
	app/assets/javascripts/templates/partials/contact.html.haml
	app/views/home/_fat.html.haml
	spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
 2014-06-19 14:22:23 +10:00
Will Marshall
a7f4256897 Fixing a minor regression 2014-06-19 14:19:15 +10:00
Will Marshall
4684c92c6e Minor refactoring from code review with Rohan 2014-06-19 14:19:14 +10:00
Will Marshall
841621a56f Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-19 14:19:13 +10:00
Will Marshall
e5c62e6c59 Refactoring JSON injection a bit further 2014-06-19 14:19:12 +10:00
Will Marshall
35d5dde5aa Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-19 14:19:11 +10:00
Will Marshall
a2965696da Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-19 14:19:11 +10:00
Will Marshall
c8384f1a71 Reworking the RABL templates for simplicity AND fixing up all the tests 2014-06-19 14:19:11 +10:00
Will Marshall
7f4816c9a5 Adding new producer modal and dereferencing shopfront 2014-06-19 14:00:37 +10:00
Will Marshall
738fdfcd49 Merge branch 'laura_and_will' 2014-06-19 12:11:12 +10:00
Will Marshall
8905b45333 Fixing a minor regression 2014-06-19 12:10:05 +10:00
Will Marshall
b9561ecf20 Minor refactoring from code review with Rohan 2014-06-19 11:41:24 +10:00
Rohan Mitchell
2f2e0d41af On customer reports, do not show orders through a hub that the current user does not manage 2014-06-19 10:35:32 +10:00
Rohan Mitchell
3b7fc9f105 Reword spec descriptions 2014-06-19 10:03:05 +10:00
Will Marshall
c02c7cf7ca Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-18 17:54:13 +10:00
Will Marshall
224a70c11f Refactoring JSON injection a bit further 2014-06-18 16:43:57 +10:00
Rohan Mitchell
4eee7d4901 Enterprise user can manage their enterprises' producer properties 2014-06-18 16:04:41 +10:00
Will Marshall
45404f1475 Adding dereferencing on construct to Enterprises service - this is MAGIC 2014-06-18 15:48:24 +10:00
Will Marshall
deb6c8a05a Refactoring the RABL injection and the Hubs/Producers/Enterprises services 2014-06-18 15:40:02 +10:00
Rohan Mitchell
c3cec34186 Redirect to enterprises page after updating producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
e6674d43fa Admin can reorder producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
27fa93dbb4 Admin can remove producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
94c42abf56 Admin can update producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
84cd56cfdc Admin can list and create producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
92e3546a76 Retrieve properties for a product as a hash 2014-06-18 15:22:03 +10:00
Rohan Mitchell
0139c4bda2 Set producer property 2014-06-18 15:22:03 +10:00
Rob H
6809d70397 Redirect user back to enterprise edit page after saving 2014-06-18 13:18:33 +10:00
Will Marshall
e7c301da83 Reworking the RABL templates for simplicity AND fixing up all the tests 2014-06-18 13:05:44 +10:00