Commit Graph

  • 32a898b6a2 Remove unnecessary db:schema:load db:seed, these are performed by db:setup Rohan Mitchell 2015-02-13 09:26:34 +11:00
  • 636ed2ad0d Make bi-directional relationships Rohan Mitchell 2015-02-12 09:59:55 +11:00
  • 1d61e91afd When enterprise created, grant permission to all co-owned enterprises, not just hubs Rohan Mitchell 2015-02-11 15:41:06 +11:00
  • 6b5a1255f8 fixing a bunch of tests Maikel Linke 2015-02-12 16:36:18 +11:00
  • 12dc0b93aa Scoping users correctly for realz this time Rob Harrington 2015-02-12 16:20:46 +11:00
  • 5503760ce3 Scoping users correctly Rob Harrington 2015-02-12 13:45:25 +11:00
  • 9fa5a9e766 Fix before_filter load order for enterprises#shop Rob Harrington 2015-02-12 10:58:32 +11:00
  • a62f48441d Restrict ability to change managers of enterprises using update action Rob Harrington 2015-02-11 15:31:16 +11:00
  • 5c09ebf138 Adding manager managment to enterprise edit form Rob Harrington 2015-02-11 14:03:04 +11:00
  • ee5ab22501 Moving interface for changing owner to new 'Users' tab Rob Harrington 2015-01-30 15:19:08 +11:00
  • ad1f837c44 Admin users can access all users through known_users Rob Harrington 2015-01-30 14:03:11 +11:00
  • dcb24cf06c Controller method to allow enterprise users to search for other users which share management of their enterprises Rob Harrington 2015-01-30 12:49:00 +11:00
  • b73619d168 Adding known_users method to Spree::User Rob Harrington 2015-01-30 12:48:21 +11:00
  • dde1a27d3a Adding ability to search for known users Rob Harrington 2015-01-30 12:47:39 +11:00
  • 57e838898f Update documentation of database setup Maikel Linke 2015-02-12 11:05:21 +11:00
  • 773a5480e9 Activate search input for groups again Maikel Linke 2015-02-12 10:44:20 +11:00
  • 0fdf313424 Fixing img display of producers if no logo present Maikel Linke 2015-02-12 10:31:13 +11:00
  • 46aee6f77c Upgrade Rails to 3.2.21 Rohan Mitchell 2015-02-11 14:30:49 +11:00
  • ca558a4ecc Fix admin tab to check correct permission Rohan Mitchell 2015-02-11 11:55:48 +11:00
  • edcef02017 link_to_service helper deals with nil Maikel Linke 2015-02-07 19:40:59 +11:00
  • 211e9c33a7 Fixing link to group website Maikel Linke 2015-02-07 19:31:16 +11:00
  • 2293623d2c Display default group logo if no logo was uploaded Maikel Linke 2015-02-07 19:24:36 +11:00
  • 9e51b19f98 right mapping of contributer's names in git Maikel Linke 2015-02-07 18:11:51 +11:00
  • 90ba1d2198 Updating the groups header to behave better with a square thumbnail logo image. summerscope 2015-02-06 17:15:40 +11:00
  • 78877f591b Fix template so website links work to push to external pages summerscope 2015-02-06 13:58:04 +11:00
  • f292be8c92 Making styling of underlines for contact same color as HRs, bit lighter and brigher summerscope 2015-02-06 13:50:34 +11:00
  • 755adf4287 Index page stop-gap improvements until we get more variables to display in this list. Commented out search field not working summerscope 2015-02-06 13:41:58 +11:00
  • 9547f91f46 Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue summerscope 2015-02-06 13:31:33 +11:00
  • 30601b9203 tidy up group contact with helpers Maikel Linke 2015-02-05 20:20:28 +11:00
  • 504a053693 link_to_ext helper for group pages Maikel Linke 2015-02-05 17:21:41 +11:00
  • 148333467f Groups styling and markup - finishing up contact info partial etc summerscope 2015-02-05 17:06:32 +11:00
  • 242fb49276 checking for undefined phone number in model Maikel Linke 2015-02-05 16:17:29 +11:00
  • 37dbd376e9 fixing indent Maikel Linke 2015-02-05 15:54:53 +11:00
  • b641de6ec9 Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages Maikel Linke 2015-02-05 15:52:00 +11:00
  • 313843d798 moving contact partial and giving example code Maikel Linke 2015-02-05 15:50:33 +11:00
  • 1b51ea0e3a Groups logo default image summerscope 2015-02-05 15:42:24 +11:00
  • f2e3d298fa More styling for responsive sizes groups header summerscope 2015-02-05 15:17:50 +11:00
  • e19aaf6be8 Styling tabs for responsive design, improving groups page layout summerscope 2015-02-05 14:53:09 +11:00
  • 28b2dd40dd Kill the pad top for Producers tab content too summerscope 2015-02-05 12:31:38 +11:00
  • c9bbe80738 Remove padding class to producers tab content summerscope 2015-02-05 12:28:24 +11:00
  • 0f7b880409 restoring groups hubs tab Maikel Linke 2015-02-05 12:23:08 +11:00
  • 78a8f8c1bb Merge remote-tracking branch 'origin/group-pages' into group-pages Maikel Linke 2015-02-05 12:07:52 +11:00
  • b1b1aa5b1e Groups page WIP with mikael and rob summerscope 2015-02-05 12:07:11 +11:00
  • a7c2a73fa8 make groups editable by group owners Maikel Linke 2015-02-05 12:05:39 +11:00
  • fce7714994 Load correct set of variant override producers, use variant_override_enterprises_per_hub, tighten specs Rohan Mitchell 2015-02-04 11:20:04 +11:00
  • 7ca9670073 Admin can access variant override only when it can add hub to order cycle and it can create variant overrides for the producer of the variant Rohan Mitchell 2015-02-04 11:09:48 +11:00
  • 22f6ece83f When fetching products for variant overrides admin, fetch all overridable products Rohan Mitchell 2015-02-04 10:16:34 +11:00
  • a7bb04b890 Find all producers for which we can create variant overrides Rohan Mitchell 2015-02-04 10:13:35 +11:00
  • 4c586d1b7e Fetching enterprises for which hubs can create variant overrides: allow all hubs that we can add to order cycle, find producers via create_variant_overrides permission Rohan Mitchell 2015-02-04 10:04:57 +11:00
  • 7ea143d19a Provide AR relation instead of array in stub Rohan Mitchell 2015-02-04 09:42:04 +11:00
  • 25189d190b Shift method Rohan Mitchell 2015-02-04 09:30:01 +11:00
  • 91b35d068c Adding owner to groups Maikel Linke 2015-02-02 15:58:34 +11:00
  • 8d9f8beff3 creating facebook url Maikel Linke 2015-02-02 10:33:13 +11:00
  • c0a7d22a50 Add permitted_by scope to EnterpriseRelationship Rohan Mitchell 2015-01-30 16:36:45 +11:00
  • fafbfe8735 Simplify, simplify Rohan Mitchell 2015-01-30 15:54:44 +11:00
  • 6fddb491db New partial for groups contact summerscope 2015-01-30 14:07:55 +11:00
  • 5ea3733c8a Groups page styling WIP summerscope 2015-01-30 14:07:38 +11:00
  • 7ac888ae00 Admin can grant create_variant_overrides permission Rohan Mitchell 2015-01-30 11:56:05 +11:00
  • ed4d78bca8 Decorators can't be in same file name as original file, otherwise the original file is ignored Rohan Mitchell 2015-01-30 11:23:49 +11:00
  • d99a54accf WIP groups individual page template markup - still needs alot of love. summerscope 2015-01-29 17:43:36 +11:00
  • fd363ff6c2 WIP Groups individual page styling summerscope 2015-01-29 17:43:10 +11:00
  • fcd9653a79 Add padding to groups homepage summerscope 2015-01-29 15:52:40 +11:00
  • 8e42f29bde WIP groups page styling and markup updates summerscope 2015-01-29 15:52:20 +11:00
  • a25bf32156 Show extended variant name/unit info for admin variant overrides Rohan Mitchell 2015-01-29 15:15:28 +11:00
  • 7a5c56cbca Do not show out of stock lines on order confirmation page Rohan Mitchell 2015-01-29 13:19:04 +11:00
  • cbae7dcc8e Adding visible to user and enterprises report, and sorting by confirmation date Rob Harrington 2015-01-29 10:46:44 +11:00
  • 9163b0c1ad Adding missing equals sign to test for equality in permalink migration 0.7.3 Rob Harrington 2015-01-28 11:37:02 +11:00
  • fd9f65f1b6 Merge branch 'shopfront-filters' into shop-url Rob Harrington 2015-01-28 10:57:11 +11:00
  • 713999c1d8 Merge branch 'master' into shop-url Rob Harrington 2015-01-28 10:53:42 +11:00
  • 21db56ce6c Rollback angularjs upgrade Rob Harrington 2015-01-28 08:41:14 +11:00
  • adbe127e76 Revert "Update bindonce" Rob Harrington 2015-01-25 14:08:29 +11:00
  • 3c4ad4121f LD adding whitespace to get my master version back in line with origin Lynne Davis 2015-01-22 14:00:48 +00:00
  • 8e8f38e484 app/controllers/spree/admin/reports_controller_decorator.rb Lynne Davis 2014-12-27 15:38:19 +00:00
  • d93a8b6428 Enterprise and Group controllers use default country instead of default country id Maikel Linke 2015-01-22 16:22:34 +11:00
  • 7a48d7fe22 Updating feature spec for groups Maikel Linke 2015-01-22 16:04:46 +11:00
  • b429be707c Split out payment and shipping methods from admin enterprises controller as services Rob Harrington 2015-01-22 12:19:41 +11:00
  • 87b092fdf7 Adding addresses to existing groups and make them changable Maikel Linke 2015-01-22 12:10:54 +11:00
  • 4829e59663 Fixing checkout controller spec Rob Harrington 2015-01-22 10:46:31 +11:00
  • d12fdd23fb Fixing navcheck callback Rob Harrington 2015-01-22 10:46:01 +11:00
  • b0a29801b6 Making spec controller product request spec a little bit more robust Rob Harrington 2015-01-22 09:25:34 +11:00
  • 6ebd58b67d Updating home spec to reflect new shopfront url Rob Harrington 2015-01-22 09:24:23 +11:00
  • 0791cc3c2a Making sure that we have a .path() in HashNavigation Rob Harrington 2015-01-21 16:59:32 +11:00
  • 76acbb6159 Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0) Rob Harrington 2015-01-21 16:03:27 +11:00
  • d7ea81e821 Prevent default form action from submitting ordercycle forms Rob Harrington 2015-01-21 14:46:03 +11:00
  • 9245af6a8f Producer properties routes use enterprise permalink Rob Harrington 2015-01-21 14:42:00 +11:00
  • 36430d3bad Enterprise permalink generator handles blank permalink case Rob Harrington 2015-01-21 14:40:28 +11:00
  • 7520552fd7 Removing spec for testing empty permalink, since we now force permalink to be created when empty Rob Harrington 2015-01-21 14:35:18 +11:00
  • 6991e5e6b1 Finally got all callbacks available to all action that need them Rob Harrington 2015-01-20 17:41:01 +11:00
  • 42d6695264 Fix permalink migration to handle blank auto-generated permalinks and fixed down migration Rob Harrington 2015-01-20 17:13:24 +11:00
  • 4d26b3d648 Make unused cart_controller happy Rob Harrington 2015-01-20 16:55:53 +11:00
  • 177181cd75 CurrentUser always returns a factory Rob Harrington 2015-01-20 16:24:05 +11:00
  • 4baa205cf9 before_filters for enterprise controller are run in the correct order, and put inside the shop action Rob Harrington 2015-01-20 16:19:01 +11:00
  • 60313f7a6a Replace delete with parameterize Rob Harrington 2015-01-20 14:33:19 +11:00
  • 3e5ea3fe63 Adding automatic permalink generation on enterprise creation Rob Harrington 2015-01-20 14:28:58 +11:00
  • b98c01b280 Updating permalink controller specs Rob Harrington 2015-01-20 10:53:02 +11:00
  • ff624e83eb Require distributor in enterprise controller, so that everything actually works Rob Harrington 2015-01-20 09:22:28 +11:00
  • 48dc85cfc2 Update bindonce Rob Harrington 2015-01-20 09:22:04 +11:00
  • a0990c107f Moving navigation check to controller Rob Harrington 2015-01-20 09:00:17 +11:00
  • 585c061fb0 Upgrade angularjs Rob Harrington 2015-01-20 08:48:31 +11:00
  • 83726eba63 Refactoring permalink checker to handle multiple requests elegantly Rob Harrington 2015-01-20 08:24:43 +11:00