raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,900 Commits 20 Branches 451 Tags
7cc2bc4fde83d2c4c059c19afee3242afc01e821
Commit Graph

1243 Commits

Author SHA1 Message Date
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
9b6db2bff4 simplify tab selection 2014-10-07 10:49:57 +11:00
Rafael Schouten
7805d46743 more angular documentation 2014-10-06 23:20:43 +11:00
Rafael Schouten
881e82e825 add some angular documentation 2014-10-06 22:59:06 +11:00
Rafael Schouten
2ae325455a fix producer taxon filtering bug 2014-10-06 22:58:48 +11:00
Rafael Schouten
58c39b340d remove duplicate default value assignment 2014-10-05 01:43:50 +10: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
b3482a087b separate enterprises from visible enterprises 2014-10-04 01:00:37 +10:00
Rafael Schouten
dee471b1c7 move text angular files 2014-10-03 16:43:56 +10:00
Rafael Schouten
7313aecd19 add route checking, not working yet... 2014-10-03 12:19:58 +10:00
Rafael Schouten
ff4f8f63af Merge branch 'master' into raf_bugfix 
Conflicts:
	app/views/spree/order_mailer/confirm_email.text.haml
 2014-10-02 19:06:30 +10:00
Rafael Schouten
f29898886d return basic css and js for oldskool login that somehow still exists 2014-10-02 13:24:59 +10:00
Rafael Schouten
ce9b132ab5 only show visible enterprises 2014-10-02 13:10:46 +10:00
Rafael Schouten
62f7114fa1 Merge branch 'cleanup' into migrate_ent_types 
Conflicts:
	app/views/home/_hubs.html.haml
 2014-10-02 10:02:08 +10:00
Rafael Schouten
47dc001735 merge has_shopfront and is_distibutor 2014-10-01 20:27:53 +10:00
Rafael Schouten
ccdcf16cec rename file 2014-10-01 18:47:50 +10:00
Rafael Schouten
54b138b2cc add transclusion to modal directive by default 2014-10-01 18:47:22 +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
summerscope
0c99007323 Tweak the modal styling for register modals 2014-09-26 17:45:15 +10:00
summerscope
237d129710 Changing the markup to give a class where is a producer 2014-09-26 15:01:23 +10:00
summerscope
dee503befb Tweak language around the long description 2014-09-26 15:01:22 +10:00
Rafael Schouten
4b576d1590 refactor enterprise specs 2014-09-26 00:15:33 +10:00
Rafael Schouten
55f4415c0d Merge branch 'master' into cleanup 
Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml
 2014-09-25 19:42:20 +10:00
Rob Harrington
b55b4e9a0c Merge branch 'master' into ent_types_frontend 2014-09-25 17:20:15 +10:00
Rob Harrington
1e31dd88ee Remove unrequired functions, add has_hub_listing 2014-09-25 17:19:57 +10:00
Rafael Schouten
bab9123ca8 delete unused javascript 2014-09-25 14:01:06 +10:00
Rafael Schouten
0e2774882f dry enterprise angular 2014-09-25 13:06:02 +10:00
Rob Harrington
f5849e91dc Adding limit reached modal to registration 2014-09-25 12:25:32 +10:00
Rafael Schouten
3775cd29cb generalise search filter to any enterprise 2014-09-25 11:34:49 +10:00
Rafael Schouten
da620f3723 Merge branch 'master' into ent_types_frontend 2014-09-25 10:09:42 +10:00
Rafael Schouten
a058af8211 open products in new tab 2014-09-24 17:00:12 +10:00
Rob Harrington
5bceb81479 Fixing image upload in onboarding 2014-09-19 23:37:02 +10:00
summerscope
5e4e939087 Return template markup which was accidentally removed in Rafs merge 2014-09-19 17:47:49 +10:00
Rafael Schouten
559d3b0e4b fixup the header but needs some styling 2014-09-19 17:24:41 +10:00
Rafael Schouten
883e5f1095 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 
Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml
 2014-09-19 17:22:29 +10:00
Rafael Schouten
abc5a215a2 add map modals, profile filters and bugfixes 2014-09-19 17:07:07 +10:00
summerscope
5a7175e75d Tweak markup to make modals fit headers nicely across small sizes 2014-09-19 16:43:31 +10:00
summerscope
4c7fa4eb9f Fix markup so that text is not nested inside icon markup 2014-09-19 15:19:47 +10:00
Rob Harrington
d3e72b5a2a Adding images to registration process 2014-09-19 12:41:24 +10:00
Rafael Schouten
0d5106d571 refactor enterprise type logic and fix icons 2014-09-18 18:15:28 +10:00
Rafael Schouten
bd922085c4 icons and entity category logic 2014-09-18 15:14:55 +10:00
Rafael Schouten
01c98bf6e4 refactor and bugfix for tests 2014-09-17 01:07:34 +10:00
Rafael Schouten
1aa80e53b1 Merge branch 'master' into currency 
Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb
 2014-09-16 10:25:22 +10:00
summerscope
799bfae6e4 Revert "Add commented-out scrolling code. Return false from click handlers." 
This reverts commit dbefd43f07.
 2014-09-12 15:51:20 +10:00
Rohan Mitchell
dbefd43f07 Add commented-out scrolling code. Return false from click handlers. 2014-09-12 15:33:02 +10:00