raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,187 Commits 18 Branches 451 Tags
e1cf5ceb57d71ad94d9cca79abfae2cb2fa1aff9
Commit Graph

330 Commits

Author SHA1 Message Date
Rob Harrington
e1cf5ceb57 Can set producer_profile_only using welcome page 2014-10-23 16:42:00 +11:00
Rob Harrington
77c0e36ed6 Adding input validation to welcome page 2014-10-23 14:23:50 +11:00
Rob Harrington
262972a911 Adding basic angular to welcome form 2014-10-22 19:02:39 +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
881e82e825 add some angular documentation 2014-10-06 22:59:06 +11:00
Rafael Schouten
f0c9e7cd44 fix for tests, remove open in new tab 2014-10-04 13:12:36 +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
dee471b1c7 move text angular files 2014-10-03 16:43:56 +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
823923f828 add textAngular javascript 2014-09-30 15:09:43 +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
a058af8211 open products in new tab 2014-09-24 17:00:12 +10:00
Rob H
bcca8c5c0d Merging master into all the things 2014-09-12 13:28:30 +10:00
Rohan Mitchell
4fb30f2942 When removing outgoing exchanges, do not removing variants from other outgoing exchanges 2014-09-12 12:50:04 +10:00
Rob H
3d4e00a03c Swtich API key injection over to helper 2014-09-11 17:07:05 +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
20bfcd6e48 Switching enterprise relationships form around 2014-09-05 17:11:57 +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
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
3932884dba Admin can create enterprise relationships with permissions 2014-08-25 14:59:10 +10:00
Rohan Mitchell
b4e89ad2c0 Convert enterprise relationship permission to string presentation 2014-08-25 13:27:01 +10:00
Rohan Mitchell
4b42c28bd5 Refactor admin enterpriseCtrl - variable naming, if x then true else false antipattern 2014-08-19 16:34:56 +10:00
Rohan Mitchell
6e17f0aaa2 Admin can create enterprise roles 2014-08-15 16:09:05 +10:00
Rohan Mitchell
8bc9def6ae Switch to AMS for enterprise role serialisation 2014-08-15 16:09:05 +10:00
Rohan Mitchell
1d77812ab8 Admin can list enterprise roles 2014-08-15 16:09:04 +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
d6aae0050f Angularise payment method provider UI 2014-08-08 17:47:50 +10:00
Rob H
5fea15e8a9 Better error reporting for failed save on BPE 2014-08-08 14:05:54 +10:00
Rob H
e6f7f26a95 Add loading gif to BPE, fiddle with interface 2014-08-08 14:05:53 +10:00
Rob H
32c8b9cdcd Switch Taxons input over to category selection on BPE, clean up interface 2014-08-08 14:05:53 +10:00
Rob H
1e68052711 Moving update button to top of BPE 2014-08-08 14:05:53 +10:00
Rob H
d27908fd2f Add ability to reset filters to BPE 2014-08-08 14:05:53 +10:00
Rob H
37ecadf6fc Taxons by ID converts id to string 2014-08-08 14:05:53 +10:00
Rob H
e76c2a215a Fix BPE spec around supplier conversion in filtering 2014-08-08 14:05:52 +10:00
Rob H
59a3fe11ad Fix taxon service specs 2014-08-08 14:05:52 +10:00
Rob H
d9692312ac WIP: swapping filters over to drop downs 2014-08-08 14:05:52 +10:00
Rob H
2f5b5e7ee5 Inject taxons into BPE 2014-08-08 14:05:52 +10:00
Rob H
aaddccfae4 Injecting producer information into BPE 2014-08-08 14:05:51 +10:00
Rob H
27e992ebcb Staggered loading of products in BPE 2014-08-08 14:05:51 +10:00
Rob H
b9f49344b4 BPE: Switch column toggle to dropdown, clean up specs 2014-08-08 14:05:51 +10:00
Rob H
9922dc6e79 Replace pagination with infinite scroll on BPE 2014-08-08 14:05:51 +10:00
Rob H
1abbc7fa86 Switch data injection for BPE over to AMS 2014-08-08 14:05:50 +10:00
Rob H
e02a742597 WIP: Removing requirment for refresh of products on BPE 2014-08-08 14:05:50 +10:00
Rohan Mitchell
5980234be0 Install better_spree_paypal_express 2014-07-25 12:44:14 +10:00
Rob H
508149fbca Adding shipping methods angularisation to enterprise edit view 2014-07-24 10:16:55 +10:00