Commit Graph

  • ecd32819a6 Remove unused matcher Maikel Linke 2016-04-13 14:47:11 +10:00
  • 9e4610f9bd Customers: enable change of hub if no customers Maikel Linke 2016-04-08 09:33:09 +10:00
  • df5b554f24 Merge branch 'issue-878' of https://github.com/elf-pavlik/openfoodnetwork into locale-patches Maikel Linke 2016-04-15 09:49:14 +10:00
  • ef0d6bd4d6 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override Maikel Linke 2016-04-15 08:27:09 +10:00
  • f15e948085 small i18n fixes #878 elf Pavlik 2016-04-14 15:26:55 -05:00
  • 53e6d391e3 Fix intermittent fail on insignificant result ordering Rohan Mitchell 2016-04-14 09:40:55 +10:00
  • a2c58c7ca1 Match array without order in ocm spec Maikel Linke 2016-04-13 16:59:54 +10:00
  • 0ac87b9e55 Override spree_i18n payment_state, shipment_state Maikel Linke 2016-04-13 16:50:01 +10:00
  • 59b564c4be Report job queue status via API Rohan Mitchell 2016-04-13 16:48:07 +10:00
  • 193580d5d9 Enqueue jobs directly via SQL rather than loading full Rails stack Rohan Mitchell 2016-04-13 16:01:21 +10:00
  • eb846e27fd Run a job queue heartbeat every 5 minutes Rohan Mitchell 2016-04-13 15:53:53 +10:00
  • e3ed831e30 Merge branch 'state_translation_override' of https://github.com/stveep/openfoodnetwork into state_translation_override Maikel Linke 2016-04-13 16:42:28 +10:00
  • e6b1d545a3 Merge branch 'default-logos' of https://github.com/bingxie/openfoodnetwork into default-logos Maikel Linke 2016-04-13 15:12:01 +10:00
  • b79b0d7586 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/state_translation_override Steve Pettitt 2016-04-11 22:31:56 +01:00
  • 39e3374ece Add comment Steve Pettitt 2016-04-11 22:27:47 +01:00
  • 1483023769 Add a sweet warning sign Steve Pettitt 2016-04-10 22:48:38 +01:00
  • bc048a943c Show all payments, format unsuccessful payments grey, add 'invalid' translation. Steve Pettitt 2016-04-10 22:23:39 +01:00
  • 4414a3f287 Fix spelling mistake Steve Pettitt 2016-04-09 10:05:45 +01:00
  • 27fdfb60af Override incorrect Spree GB translations for state/county Steve Pettitt 2016-04-09 09:41:21 +01:00
  • 852dce2dff Add default logos and home_hero Bing Xie 2016-04-08 10:43:23 +10:00
  • b050f27a84 Default logos for new installations Maikel Linke 2015-12-18 09:49:51 +11:00
  • 44077a2c6f Fixing styling (bottom margin for save-bar) on inventory page Rob Harrington 2016-04-06 15:43:55 +10:00
  • 0ed97d820c Removing unrequired Spree::Order#with_payment_method_name scope v1.6.0 Rob Harrington 2016-03-18 17:03:23 +11:00
  • 9b5bfdeb00 Allowing Order Management Report to filter by multiple payment / shipping methods at once Rob Harrington 2016-03-18 17:01:30 +11:00
  • f8e3f29d1a More bug fixes. Spec updated to reflect changes Lynne Davis 2016-03-11 16:50:55 +00:00
  • d844dc8e1b Bug fixes to Order Cycle Reports Lynne Davis 2016-02-16 17:47:51 +00:00
  • 6c5aaef86e Removing ability to create order discount rules Rob Harrington 2016-04-01 19:42:09 +11:00
  • d8c17d160a Applying shipping method rules in checkout Rob Harrington 2016-03-18 14:59:04 +11:00
  • c099711f97 Removing dialogOptions library, not required anymore Rob Harrington 2016-03-18 13:35:29 +11:00
  • d278b72289 Updating Tag Rules UI to allow management of new FilterShippingMethods rule type Rob Harrington 2016-03-18 12:22:54 +11:00
  • 82bc26fe90 Splitting tag rule feature specs out into their own spec file Rob Harrington 2016-03-18 11:33:36 +11:00
  • 47df106237 Refactor tragsWithTranslation directive to handle dynamic attr names Rob Harrington 2016-03-18 11:20:32 +11:00
  • f70b1f4572 Refactoring tag rule model and adding new rule type: FilterShippingMethod Rob Harrington 2016-03-18 11:17:28 +11:00
  • ed134bac84 Removing unrequired initSelection option from ofn-select2 Rob Harrington 2016-03-18 10:42:54 +11:00
  • 33aad10e73 Adding dialogOptions library for adding responsiveness to jquery dialog Rob Harrington 2016-03-18 10:32:22 +11:00
  • 3d78b375c6 Moving angularjs tag rule logic into its own module Rob Harrington 2016-03-17 15:24:08 +11:00
  • f9acee2be4 Shipping methods can be tagged Rob Harrington 2016-03-17 13:33:14 +11:00
  • 86c80124fc Moving tags-with-translation directive to admin.utils Rob Harrington 2016-03-17 11:47:32 +11:00
  • 443e232ea4 Renaming angular admin.shipping_methods and admin.payment_methods modules Rob Harrington 2016-03-17 11:11:47 +11:00
  • c74c274a9e Renaming shippingMethodCtrl to shippingMethodsCtrl Rob Harrington 2016-03-17 11:05:43 +11:00
  • f902474591 Relevant DiscountOrder tag rules are applied to orders on update Rob Harrington 2016-03-16 18:00:16 +11:00
  • bf72864c2b Tag Rules can be deleted Rob Harrington 2016-03-16 11:29:35 +11:00
  • 4c2552e0bf Enterprise users can create tag rules Rob Harrington 2016-03-11 15:56:54 +11:00
  • 066190c16f First cut at an interface for updating tag rules Rob Harrington 2016-03-10 12:09:27 +11:00
  • 3aea387b9a First iteration of a model for tag rules Rob Harrington 2016-03-04 15:29:48 +11:00
  • d12c486dd2 Use new spree_paypal_express branch to hide password Maikel Linke 2016-03-23 16:23:52 +11:00
  • 97bcbb81b9 Change text of register call in the dropdown Maikel Linke 2016-03-30 16:46:06 +11:00
  • 04f661f646 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops Maikel Linke 2016-04-01 13:02:53 +11:00
  • c4f92fd4cc Hide closed shops by default, add "show" button Maikel Linke 2016-03-31 15:45:25 +11:00
  • 813dff8af2 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login Maikel Linke 2016-04-01 11:04:36 +11:00
  • db0b345241 Add "Show all on map" button under shops Maikel Linke 2016-03-31 15:24:43 +11:00
  • 21be27d722 Remove duplicate filtering of visible enterprises Maikel Linke 2016-03-30 13:11:18 +11:00
  • 3d31a37dd3 Remove unused method Enterprise::find_near Maikel Linke 2016-03-30 12:02:25 +11:00
  • 17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances Maikel Linke 2016-03-30 13:30:44 +11:00
  • de35940341 Apply coding standards Maikel Linke 2016-03-30 09:45:45 +11:00
  • d67db76b88 Formatting credit/debit green/red stveep 2016-03-28 20:35:14 +01:00
  • 5a6caa294e Revert to Arel query and separate filtering stveep 2016-03-28 20:13:30 +01:00
  • c4f499d518 Allow admins and managers to see restricted shops Maikel Linke 2016-03-25 12:04:26 +11:00
  • 7b75fab7a1 Code tidying and currency symbol internationalisation Lynne Davis 2016-03-24 16:57:56 +00:00
  • 5149c5118b Change text and style for shops requiring login Maikel Linke 2016-03-24 18:40:38 +11:00
  • df36386757 Require customer instead of user Maikel Linke 2016-03-24 18:24:46 +11:00
  • 31302fb930 Translate unsaved products message correctly Maikel Linke 2016-03-23 17:57:22 +11:00
  • d51cfccd7e Auto-merged master into i18n-hackathon on deployment. Maikel 2016-03-23 10:09:36 +11:00
  • 79ad05d405 i18n group image help text Maikel Linke 2016-03-23 10:01:04 +11:00
  • 6d0dc438a7 i18n fixes after @sstead feedback in #799 elf Pavlik 2016-03-21 16:55:57 -06:00
  • ca0c677d46 Auto-merged master into uk/account-balances on deployment. Maikel 2016-03-19 07:16:41 +11:00
  • 276d3026c8 Adding specs for orders by ditributor query Steve Pettitt 2016-03-18 20:05:52 +00:00
  • 41970ecf07 Use auth directive for Login button Maikel Linke 2016-03-18 16:22:41 +11:00
  • 2a9e35355e Add auth directive to use AuthenticationService Maikel Linke 2016-03-18 16:13:20 +11:00
  • a48b992ec0 Shops can require users to login Maikel Linke 2016-03-18 14:28:47 +11:00
  • 599e39ce16 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/filter-producers-for-map Maikel Linke 2016-03-18 13:41:45 +11:00
  • d07daede68 Merge remote-tracking branch 'origin/master' into uk/filter-producers-for-map Maikel Linke 2016-03-18 11:04:42 +11:00
  • 16741598fd Merge branch 'master' into products-caching Rohan Mitchell 2016-03-18 09:59:56 +11:00
  • 56a6593dd6 Missing Specs Lynne Davis 2016-03-17 13:40:25 +00:00
  • 096962b778 Adding super admin configuration for the minimum billable turnover functionality Lynne Davis 2016-03-17 12:54:03 +00:00
  • 2d97bc49bd Updating specs to explore the cases around zero turnover with fixed rate and minimum billable turnover Lynne Davis 2016-03-17 12:36:38 +00:00
  • da10b5decf Updating spec with minimum_billable_turnover preference Lynne Davis 2016-03-17 12:24:34 +00:00
  • 430c6c0642 Adding preference def for minimum_billable_turnover Lynne Davis 2016-03-17 12:22:27 +00:00
  • bfaefa4dc9 Updating Bill Calculator to include a minimum billable turnover. Shopfronts are not charged if their tunrover is under the minimum billable. Lynne Davis 2016-03-17 11:15:06 +00:00
  • b43e770420 Removing incorrect angular watch Lynne Davis 2016-03-16 14:17:43 +00:00
  • 3a083723f0 Merge branch 'uk/trial-length' of https://github.com/openfoodfoundation/openfoodnetwork into uk/trial-length Lynne Davis 2016-03-16 12:36:25 +00:00
  • ba49a5a783 Adding translations for shop front trials Lynne Davis 2016-03-16 12:35:45 +00:00
  • 4adf332480 Auto-merged master into uk/trial-length on deployment. Maikel 2016-03-16 22:42:50 +11:00
  • d9d5d9cda5 Fixing wild typo Lynne Davis 2016-03-16 11:38:00 +00:00
  • a4efd3d44c Adding configurable Shop Trial Length in business model Lynne Davis 2016-03-16 11:35:31 +00:00
  • 6eb6a01339 Filter incomplete payments on database level Maikel Linke 2016-03-16 10:45:22 +11:00
  • 388b25ddf9 Auto-merged master into uk/account-balances on deployment. Maikel 2016-03-12 09:11:42 +11:00
  • e81ef564e3 Capitalize Spree state translations Steve Pettitt 2016-03-11 22:01:09 +00:00
  • e1fdd3a210 Apply style guide Steve Pettitt 2016-03-11 21:59:22 +00:00
  • 2546603a67 Remove what_is_this from locale Maikel Linke 2016-03-11 17:08:13 +11:00
  • e81343c8e4 Merge remote-tracking branch 'origin/master' into i18n-hackathon Maikel Linke 2016-03-11 16:50:48 +11:00
  • 51f94119ff Restore links_dropdown Maikel Linke 2016-03-11 16:39:07 +11:00
  • ac88817a34 Add translation for unsaved_changes_warning Maikel Linke 2016-03-11 15:46:29 +11:00
  • 2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon Maikel Linke 2016-03-11 15:38:28 +11:00
  • 711f525d98 Remove   from locale en.yml Maikel Linke 2016-03-11 14:45:43 +11:00
  • 21a7942de6 Merge remote-tracking branch 'origin/master' into indicate-required-fields-for-new-enterprise-form Maikel Linke 2016-03-11 14:14:45 +11:00
  • b7320a0bd7 Translate "Price" in Bulk Order Management Maikel Linke 2016-03-11 12:48:35 +11:00
  • 5225686d8f Re-merge bulk order view Maikel Linke 2016-03-11 12:23:12 +11:00
  • 3e5f53b082 Rename i18n key what_is_this Maikel Linke 2016-03-11 12:13:17 +11:00
  • 3595685f9a Merge text change in LineItemsCtrl into en.yml Maikel Linke 2016-03-11 11:46:06 +11:00