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

118 Commits

Author SHA1 Message Date
Rafael Schouten
89ce4ba632 Merge branch 'master' into bugfix 
Conflicts:
	app/models/enterprise.rb
 2014-10-21 08:51:23 +11:00
Rafael Schouten
08cd273be3 Merge branch 'migrate_ent_types' into bugfix 
Conflicts:
	app/models/spree/ability_decorator.rb
 2014-10-18 07:37:41 +11:00
Rob Harrington
b2565991e6 Merge branch 'master' into reg_and_ent_types 2014-10-17 12:33:21 +11:00
Rob Harrington
a6bc9e66f6 Only send one enterprise creation confirmation email 2014-10-17 12:29:51 +11:00
Rob Harrington
28807d4f4d Merge migrate_ent_types into reg 2014-10-17 10:20:48 +11:00
Rafael Schouten
f145db46f1 use self.x 2014-10-16 16:49:49 +11:00
Rafael Schouten
f0a3296e52 change enterprise category name ans use symbols instead of strings 2014-10-16 16:26:49 +11:00
Rob Harrington
96878f5dcb Don't require confirmation for enterprises where the email address has already been confirmed for another enterprise 2014-10-15 17:22:56 +11:00
Rob Harrington
c76a3815c0 Add unconfirmed scope 2014-10-15 15:45:47 +11:00
Rob Harrington
1bdc55cb33 Adding confirmed scope to enterprises 2014-10-15 13:03:39 +11:00
Rob Harrington
908c242d36 Confirmation email when creating enterprise 2014-10-15 10:48:05 +11:00
Rafael Schouten
5dd9879b96 validate description max lenth 2014-10-12 21:57:01 +11:00
Rob Harrington
b8b19368df WIP: Making enterprise emails confirmable 2014-10-10 16:54:38 +11:00
Rohan Mitchell
d5ea2a0206 Make Enterprise and EnterpriseGroup promo images jpg format 2014-10-10 15:40:05 +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
922e335e83 add is_hub to model 2014-10-06 15:42:23 +11:00
Rafael Schouten
2f76a7ba80 add comment for hub sells own case 2014-10-05 01:44:12 +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
4fde0ad2d7 Merge branch 'master' into migrate_ent_types 2014-10-01 16:11:20 +10:00
Rob Harrington
5497f229e1 Ignoring enterprise ownership before_validations when no owner set 2014-10-01 11:49:46 +10:00
Rafael Schouten
beb85e862a get type > sells migration mostly working 2014-09-27 15:21:27 +10:00
Rafael Schouten
e9c8547ca3 fix enterprsie model logic 2014-09-26 15:01:23 +10:00
Rob Harrington
1e31dd88ee Remove unrequired functions, add has_hub_listing 2014-09-25 17:19:57 +10:00
Rafael Schouten
6069127733 validate contact email 2014-09-25 15:16:50 +10:00
Rafael Schouten
da620f3723 Merge branch 'master' into ent_types_frontend 2014-09-25 10:09:42 +10:00
Rafael Schouten
f8d5b7ede8 refactor enterprise types to six options 2014-09-24 23:30:43 +10:00
Rafael Schouten
e4991d4528 reorganise and document enterprise categories 2014-09-19 16:44:28 +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
21628ed069 Merge branch 'master' into ent_types_frontend2 2014-09-17 17:45:55 +10:00
Rob H
f5048ecf7c Sends confirmation email when Enterprise is created 2014-09-12 13:24:17 +10:00
Rafael Schouten
309ddece89 make profile icons work 2014-09-12 10:38:04 +10:00
Rafael Schouten
3ea29df111 12 option entity categories 2014-09-12 10:11:59 +10:00
Rafael Schouten
f33a9e1a58 16 enterprise categories from four checks. 2014-09-12 01:50:36 +10:00
Rob H
f1c19ea64c Enterprise validates owner enterprise_limit 2014-09-11 14:54:51 +10:00
Rob H
138e0281a3 Specify owner for enterprise create action 2014-09-11 14:39:14 +10:00
Rob H
31de5d45ea Adding owner to enterprise 2014-09-11 14:36:09 +10:00
Rohan Mitchell
a858c21296 Enterprise has a type (full, single, profile), editable by admin 2014-08-19 11:37:31 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Rohan Mitchell
d7a5eb47f3 Store all images in a consistent path, compatible with development, and support S3 all round 2014-07-17 11:07:34 +10:00
Rohan Mitchell
94902268e2 Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated. 2014-07-04 14:39:27 +10:00
Rohan Mitchell
8f6a2575b7 Minor code formatting changes 2014-07-04 14:39:26 +10:00
Will Marshall
c57148340c Fixing spec regression 2014-07-04 14:39:26 +10:00
Will Marshall
6d4dfad336 OK address no longer being lazy-loaded 2014-07-04 14:39:26 +10:00
Will Marshall
23034a55d4 Adding tests and full touch behaviour for caching 2014-07-04 14:39:26 +10:00
Will Marshall
3195e20b65 cleaning up touches 2014-07-04 14:38:27 +10:00
Will Marshall
8b439c4e69 Temporary/demonstration caching behaviour, INCOMPLETE 2014-07-04 14:38:27 +10:00
Will Marshall
9eb43e6c09 Removing visible scopes from enteprise distributors and producers 2014-06-26 15:26:15 +10:00
Will Marshall
9cb6987645 Refactoring the supplied_taxons query to use SQL 2014-06-25 15:18:00 +10:00