Commit Graph

  • 94e3946d52 producer list view styling summerscope 2014-09-05 17:54:16 +10:00
  • 0b74242f49 make classes more generic for more use-cases summerscope 2014-09-05 17:53:52 +10:00
  • bb82fc4b20 move generic things into active table summerscope 2014-09-05 17:53:27 +10:00
  • 6e10c416e2 hub view styling summerscope 2014-09-05 17:53:14 +10:00
  • ab44046658 skinny view producers remove unnecessary spacer element summerscope 2014-09-05 17:52:36 +10:00
  • a9619a6dca Changes to markup on producer page to adjust layout summerscope 2014-09-05 17:50:50 +10:00
  • 20bfcd6e48 Switching enterprise relationships form around Rob H 2014-09-05 17:11:57 +10:00
  • 60ac3f29a5 Producers page WIP summerscope 2014-09-05 16:38:05 +10:00
  • adb8b6b02f Styling for help icon summerscope 2014-09-05 16:37:49 +10:00
  • b3f97479d3 Hide profile filter from search for the mo summerscope 2014-09-05 16:36:16 +10:00
  • 097367a9f8 Map modals for 'profile' enterprises do not display shopping options Rob H 2014-09-05 16:28:08 +10:00
  • 1e1ddedfb2 Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend Rob H 2014-09-05 16:18:45 +10:00
  • 428e4c63d4 Profile hubs don't show up in hubs list Rob H 2014-09-05 16:18:25 +10:00
  • 0d0ffa1cd0 Making CTA links consistent with modals, adding in logic to force space holding for producer fat view summerscope 2014-09-05 15:47:41 +10:00
  • a092e97294 Adding a little bit of spacing between each row for active table summerscope 2014-09-05 15:47:14 +10:00
  • 26bd1000de Changing placeholder for search input summerscope 2014-09-05 15:28:50 +10:00
  • 59adae5c9c Working on space placeholders for fat view summerscope 2014-09-05 15:28:32 +10:00
  • 233532a85f Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend Rob H 2014-09-05 15:14:48 +10:00
  • 99fb9c1966 Adding in markup and styling for new layout of hubs list view summerscope 2014-09-05 15:09:44 +10:00
  • 3a12f9a7c8 Extract bulk product edit interface into partials Rohan Mitchell 2014-09-02 15:27:33 +10:00
  • 4d766a29ab Convert admin login nav to haml Rohan Mitchell 2014-09-02 13:45:11 +10:00
  • c43c35601b Set product.largeImage in JS, use for product modal Rohan Mitchell 2014-09-01 16:21:23 +10:00
  • fe1c60ba47 Enterprise manager can edit products from enterprises it has manage_products permission on Rohan Mitchell 2014-09-01 11:49:09 +10:00
  • b7708d750b Check authorisation for bulk update products Rohan Mitchell 2014-09-01 11:15:00 +10:00
  • fbd4f98fa9 Include producers I have permission to in BPE producers choice Rohan Mitchell 2014-09-01 10:44:09 +10:00
  • 9ec5dc6466 Find enterprises that we manage products for Rohan Mitchell 2014-09-01 10:36:59 +10:00
  • e023a66167 Bulk product edit lists managed products Rohan Mitchell 2014-09-01 10:13:59 +10:00
  • 4af704b1d0 Fetch managed products via OpenFoodNetwork::Permissions Rohan Mitchell 2014-09-01 09:42:50 +10:00
  • 1ea63bca6e Name test enterprises semantically Rohan Mitchell 2014-09-01 09:17:38 +10:00
  • 503fb53750 Fix #242 - foreign key constraint error on load_sample_data digital dreamer 2014-08-29 13:42:27 +02:00
  • 6ff6e4248c Rename spec to match view name change Rohan Mitchell 2014-08-29 17:37:56 +10:00
  • 57af658e7c For OC, fetch all enterprises we have access to, including those via E2E relationships Rohan Mitchell 2014-08-28 15:06:55 +10:00
  • 913c167fdf Revert 5ede8d1, reinstating a4be0ff..7b89e6a Rohan Mitchell 2014-08-29 16:38:10 +10:00
  • 7603ea867f Store links to root_path instead of product_path Maikel Linke 2014-08-22 16:10:23 +10:00
  • c5cfda5283 Adding login_nav partial from spree_auth_devise Maikel Linke 2014-08-22 16:04:46 +10:00
  • aaa32528ea Giving an example name for an enterprise fee. Maikel Linke 2014-07-31 15:21:13 +10:00
  • 602dfbe002 ng_text_field handling options parameter Maikel Linke 2014-07-31 15:20:22 +10:00
  • 14aada1808 Add 'profile only' logic to maps icons Rob H 2014-09-05 15:09:15 +10:00
  • 32ee8afdce logic for producer shop icon in list view Rob H 2014-09-05 14:46:04 +10:00
  • 7b9ff9b6dd Merge branch 'ent_types_frontend' of github.com:openfoodfoundation/openfoodnetwork into ent_types_frontend summerscope 2014-09-05 12:48:05 +10:00
  • 658c27408e Styling for hub listing page and tweaks to markup to accomodate new icons and styling summerscope 2014-09-05 12:32:45 +10:00
  • 8f6d04a129 Adding properties to enterprise serialiser to allow differentiation between profile, shopfront and aggregators Rob H 2014-09-05 12:30:52 +10:00
  • b487c9848b Add checkbox for show / hide profiles summerscope 2014-09-05 12:15:14 +10:00
  • 94fbb624f5 Make CTA links separate from hub link styling summerscope 2014-09-05 12:14:55 +10:00
  • ed0f2de2f3 More styling for CTA links on modals summerscope 2014-09-05 11:56:21 +10:00
  • c64ef39e22 Ran a DB:micrate, this is a change to the order summerscope 2014-09-05 11:39:43 +10:00
  • 0138fded17 Styling for modals summerscope 2014-09-05 11:39:04 +10:00
  • 116eb6a2c6 template updates for modals - links not buttons summerscope 2014-09-05 11:38:19 +10:00
  • 0fd496aa97 Extract bulk product edit interface into partials Rohan Mitchell 2014-09-02 15:27:33 +10:00
  • 4d57a73ee3 Merge branch 'digital-dreamer-fix-242-foreign-key' Rohan Mitchell 2014-09-02 14:08:45 +10:00
  • 7d6dbeba28 Merge branch 'fix-242-foreign-key' of https://github.com/digital-dreamer/openfoodnetwork into digital-dreamer-fix-242-foreign-key Rohan Mitchell 2014-09-02 14:02:14 +10:00
  • f53ed4bf31 Merge branch 'admin-panel-store-link' Rohan Mitchell 2014-09-02 13:45:25 +10:00
  • 818a0f8595 Convert admin login nav to haml Rohan Mitchell 2014-09-02 13:45:11 +10:00
  • a347152490 Merge branch 'master' into admin-panel-store-link Rohan Mitchell 2014-09-02 13:39:46 +10:00
  • fce2147dc1 Merge branch 'enterprise-fee-naming-example' Rohan Mitchell 2014-09-02 13:39:11 +10:00
  • 7247e65115 Merge branch 'master' into enterprise-fee-naming-example Rohan Mitchell 2014-09-02 13:36:50 +10:00
  • 2cd5afbf9c Set product.largeImage in JS, use for product modal Rohan Mitchell 2014-09-01 16:21:23 +10:00
  • e72c3d861b Enterprise manager can edit products from enterprises it has manage_products permission on Rohan Mitchell 2014-09-01 11:49:09 +10:00
  • 94683f1eaa Check authorisation for bulk update products Rohan Mitchell 2014-09-01 11:15:00 +10:00
  • c81503d95f Include producers I have permission to in BPE producers choice Rohan Mitchell 2014-09-01 10:44:09 +10:00
  • 4d8d74dec7 Find enterprises that we manage products for Rohan Mitchell 2014-09-01 10:36:59 +10:00
  • cfb31b46e4 Bulk product edit lists managed products Rohan Mitchell 2014-09-01 10:13:59 +10:00
  • e0645dfbd9 Fetch managed products via OpenFoodNetwork::Permissions Rohan Mitchell 2014-09-01 09:42:50 +10:00
  • 66f20a6b8a Name test enterprises semantically Rohan Mitchell 2014-09-01 09:17:38 +10:00
  • ac48613556 Fix #242 - foreign key constraint error on load_sample_data digital dreamer 2014-08-29 13:42:27 +02:00
  • a4aa949499 Applying new icons for map view summerscope 2014-08-29 18:04:06 +10:00
  • ae442769b5 New version of icon font for OFN system summerscope 2014-08-29 18:03:47 +10:00
  • a31e8ff82f New map icons summerscope 2014-08-29 18:03:15 +10:00
  • 4efe3fdf88 Remove old map icons summerscope 2014-08-29 18:01:54 +10:00
  • 62e6cacfd0 Rename spec to match view name change Rohan Mitchell 2014-08-29 17:37:56 +10:00
  • 7f74854a2f For OC, fetch all enterprises we have access to, including those via E2E relationships Rohan Mitchell 2014-08-28 15:06:55 +10:00
  • 0b61872d96 Revert 5ede8d1, reinstating a4be0ff..7b89e6a Rohan Mitchell 2014-08-29 16:38:10 +10:00
  • ef639b9535 Adjusting columns for 16 column layout. Maikel Linke 2014-08-28 17:06:26 +10:00
  • a379f88add making asterisk 10% bigger Maikel Linke 2014-08-28 16:41:10 +10:00
  • a0d6ec988e make asterisk red Maikel Linke 2014-08-28 16:38:44 +10:00
  • 8da98ce19c Adding asterisks to required fields. Maikel Linke 2014-08-28 16:26:30 +10:00
  • ba3f97ca1f Fixing enterprise relationships spec Rob H 2014-08-28 14:45:24 +10:00
  • 5ede8d169f Revert a4be0ff..7b89e6a for deployment Rob H 2014-08-28 14:32:57 +10:00
  • bfd9ffd84a Adding missing data-bindings for country/state Rob H 2014-08-28 10:03:53 +10:00
  • 7b89e6aa80 Revert "Comment out ERPs which have confusing names, use old 'permits'" Rohan Mitchell 2014-08-28 10:12:06 +10:00
  • 1871d42e68 Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page Rohan Mitchell 2014-08-26 15:42:35 +10:00
  • a5debc19dc Permit edits to exchanges involving enterprises permitted via E2E relationships Rohan Mitchell 2014-08-26 15:25:17 +10:00
  • 628d87b69a Add to OC permission allows adding distributors to order cycle Rohan Mitchell 2014-08-26 15:00:13 +10:00
  • 5ef13d3c5a Change 'add products to OC' permission into the more general 'add enterprise to OC' Rohan Mitchell 2014-08-26 14:46:23 +10:00
  • 099a5b0b7b Show E2E related enterprise exchanges in OC Rohan Mitchell 2014-08-26 11:38:31 +10:00
  • 34602244ca Show permitted suppliers in order cycle add supplier select box Rohan Mitchell 2014-08-26 11:03:16 +10:00
  • b9e5821497 Add EnterpriseRelationship scopes permitting and with_permission Rohan Mitchell 2014-08-26 10:32:31 +10:00
  • 8548a1a67e Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class Rohan Mitchell 2014-08-26 09:51:18 +10:00
  • a7689973be Semantically name enterprises in spec Rohan Mitchell 2014-08-26 09:23:48 +10:00
  • 5e8bdce67d Refactor spec Rohan Mitchell 2014-08-26 09:10:39 +10:00
  • a4be0ff55a Comment out ERPs which have confusing names, use old 'permits' Rob H 2014-08-27 17:07:30 +10:00
  • 7124dc57fd Requiring a state in checkout Rob H 2014-08-27 16:59:26 +10:00
  • 400f2ea9b9 Don't add payment forms to checkout DOM unless required Rob H 2014-08-27 15:09:41 +10:00
  • 0462b3e55d Prevent duplicate enterprise roles Rohan Mitchell 2014-08-26 14:40:34 +10:00
  • 435819acc4 Removing unit text from total units column Rob H 2014-08-25 17:57:33 +10:00
  • 310d1b3726 Zeus server does not crash when editing controllers Rob H 2014-08-15 18:15:01 +10:00
  • 0d9e07d484 Make restore script compatible with OSX Rob H 2014-08-15 15:10:44 +10:00
  • 45a44844ca Remove old rabl spec Rohan Mitchell 2014-08-25 16:38:17 +10:00
  • 1a995aedda Simplify enterprise_relationship factory - leverage permissions_list= model method Rohan Mitchell 2014-08-25 15:20:46 +10:00
  • c3224ce668 Style permission list items, order perms consistently by name Rohan Mitchell 2014-08-25 15:05:49 +10:00