Commit Graph

  • 9db602f031 Patching the visible flag in admin Will Marshall 2014-05-05 16:26:03 +10:00
  • dcd2e39f2c Tweaking for a moved partial Will Marshall 2014-05-05 15:57:16 +10:00
  • dd25bfd345 Starting to rework menu Will Marshall 2014-05-05 15:43:33 +10:00
  • 1774bc1e19 Adding producers filtering and more Angular magic Will Marshall 2014-05-05 15:43:11 +10:00
  • 27728d6f0e Adding our first request spec Will Marshall 2014-05-05 12:08:45 +10:00
  • 6ba0d6c5f9 WIP: Split out admin angularjs Rob H 2014-05-02 21:38:39 +10:00
  • 1e7e1a3127 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork Will Marshall 2014-05-02 16:12:41 +10:00
  • 5a2a43a060 Create angularjs admin module Rob H 2014-05-02 15:56:20 +10:00
  • 901c9abe38 Increase wait time for failing spec Rohan Mitchell 2014-05-02 15:39:17 +10:00
  • bbb70342b3 Merging Will Marshall 2014-05-02 15:35:43 +10:00
  • 23fa1c7b7b Patching a couple more issues Will Marshall 2014-05-02 15:17:44 +10:00
  • b907616749 Renaming our partials Will Marshall 2014-05-02 14:47:12 +10:00
  • ceada3596b Merge master into cleanup Rob H 2014-05-02 14:43:06 +10:00
  • db653682b1 Add capybara-screenshot - automatic screenshots for test fails Rohan Mitchell 2014-05-02 14:25:19 +10:00
  • 1d5f0042d4 Remove sleeps - these should be covered by increased capybara wait time now Rohan Mitchell 2014-05-02 14:25:06 +10:00
  • 930bc2b7ce Set increased Capybara.default_wait_time globally Rohan Mitchell 2014-05-02 14:09:42 +10:00
  • 4480c75494 Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway Rohan Mitchell 2014-05-01 17:13:07 +10:00
  • c9aefa507a Remove chili Rohan Mitchell 2014-05-01 10:25:34 +10:00
  • d707624525 Fix warnings - faker clash with ffaker, i18n enforce_available_locales Rohan Mitchell 2014-04-30 12:50:56 +10:00
  • 9fb4b2f9d8 Ctrl-C now cancels karma Will Marshall 2014-05-02 14:04:43 +10:00
  • dfd1dd609d Re-engaging checkout spec Will Marshall 2014-05-02 14:13:00 +10:00
  • d74265e44d Ctrl-C now cancels karma Will Marshall 2014-05-02 14:04:43 +10:00
  • 3d06caf1e3 Merging in master Will Marshall 2014-05-02 13:10:31 +10:00
  • 123bd7963d Adding tests for hub filter Will Marshall 2014-05-02 13:07:12 +10:00
  • 19137ce309 Adding state to home page filtering Will Marshall 2014-05-02 12:57:33 +10:00
  • 9bd76df116 That wasn't actually a bug! Sorry Will Marshall 2014-05-02 12:52:51 +10:00
  • 794d7b69ae Restoring our toggle option Will Marshall 2014-05-02 12:50:32 +10:00
  • 705e247eb8 Tweaking the bulk order management spec again Will Marshall 2014-05-02 12:41:04 +10:00
  • 8c319334db Cleaning out the spree auth stuff Will Marshall 2014-05-02 12:34:19 +10:00
  • de369ae32b WIP: Can manage taxons in BPE Rob H 2014-05-02 10:28:33 +10:00
  • 34f170d4f7 Bugged thing in the shop spec Will Marshall 2014-05-02 10:18:57 +10:00
  • b755733812 Removing chili spec Will Marshall 2014-05-01 17:47:16 +10:00
  • c5e6b24779 Removing specs that accidentally got in here Will Marshall 2014-05-01 17:46:00 +10:00
  • 1703f7503b Removing dead weight Will Marshall 2014-05-01 17:43:02 +10:00
  • 2d536e01e7 Patching some deadlocks Will Marshall 2014-05-01 17:21:46 +10:00
  • 59d2bc908e Adding quick login, more test refactoring Will Marshall 2014-05-01 17:11:56 +10:00
  • 0956aa2532 Patching a bug in order cycle partial Will Marshall 2014-05-01 17:08:15 +10:00
  • 6ad30d901d Tidying down shop/checkout test Will Marshall 2014-05-01 16:22:11 +10:00
  • e65924c50f Removing a dud reference to active' Will Marshall 2014-05-01 15:52:27 +10:00
  • 2ff2d3dcbd Starting to work on test format Will Marshall 2014-05-01 15:51:40 +10:00
  • 56204d4ea6 Upgrade Admin AngularJS Rob H 2014-05-01 13:01:52 +10:00
  • c1ab0c0f0b Renaming sass files for relevance. Style tweaks for large input to fix firefox bug. summerscope 2014-04-30 16:12:39 +10:00
  • 8a5b93ace9 Adding a couple of basic feature tests for the sake of demonstration Will Marshall 2014-04-30 16:10:02 +10:00
  • 4ed81da022 Updates to styling homepage and active table summerscope 2014-04-30 15:36:42 +10:00
  • dcacf01c1d Tweaking copy for food hubs modals. summerscope 2014-04-30 15:05:41 +10:00
  • e901f3439a Starting to partialize and test the RABL partials Will Marshall 2014-04-30 13:52:06 +10:00
  • 0f6bd7049c Starting to build out producers Angular page Will Marshall 2014-04-30 12:52:47 +10:00
  • e7d6e7e564 Removing the sidebar before filter stuff, since we're not using it anymore Will Marshall 2014-04-30 12:15:57 +10:00
  • f68a637609 Renaming Enterprise.active to Enterprise.visible Will Marshall 2014-04-30 12:09:22 +10:00
  • 4ca148ee93 Starting on the producers controller Will Marshall 2014-04-30 12:05:53 +10:00
  • 563976c084 Adding an active scope and test to Enterprise Will Marshall 2014-04-30 12:02:11 +10:00
  • 137c265885 Merge branch 'darkswarm' Will Marshall 2014-04-30 11:44:30 +10:00
  • b6ffb863ce Adding mailto directive Will Marshall 2014-04-30 11:41:53 +10:00
  • 149d0fc9b5 Merging in master and adding footer email changeS Will Marshall 2014-04-30 11:18:38 +10:00
  • 1ef317c17b Adding reversed email address to footer Will Marshall 2014-04-30 11:12:29 +10:00
  • 22aaa24962 Disabling scroll increment/decrement on Number inputs Will Marshall 2014-04-30 10:57:30 +10:00
  • e08f0a5feb Removing a feature spec BECAUSE we've got the same tests in the controller spec baby Will Marshall 2014-04-30 10:06:46 +10:00
  • 06c10515dc Patching a bug Will Marshall 2014-04-29 16:40:23 +10:00
  • df73e8f63c new SVGs summerscope 2014-04-29 16:39:45 +10:00
  • 31f7d51c2f More homepage styling, updated svgs, remove unused images, more styling and markup summerscope 2014-04-29 16:38:25 +10:00
  • 6f0d6cda3d Adding back Rspec profiling Will Marshall 2014-04-29 16:20:30 +10:00
  • 3e1dce4d18 Removing an archived spec Will Marshall 2014-04-29 16:19:21 +10:00
  • 9d0d7f85f6 Styling footer and beta sections. summerscope 2014-04-29 15:10:50 +10:00
  • a3252283af Re-engaging the authentication specs for checkout Will Marshall 2014-04-29 15:29:37 +10:00
  • ef6fe2b181 Refactoring all interactions with the home/hub table into UIHelper Will Marshall 2014-04-29 15:22:04 +10:00
  • d7f8d2f5c7 Reworking some broken tests Will Marshall 2014-04-29 15:10:55 +10:00
  • 26adada506 Reworking UI tests Will Marshall 2014-04-29 14:31:29 +10:00
  • 9415c4e3ab Patching our integration tests to use the new home page mechanics Will Marshall 2014-04-29 12:45:40 +10:00
  • 5e6ac747b3 More styling for active table. tweak naming conventions to make appropriate - more generic for active_table, more specific for home_panes. summerscope 2014-04-29 14:24:18 +10:00
  • f13ca0a40d More homepage styling for panes summerscope 2014-04-29 13:35:44 +10:00
  • 1de5efb172 Changing color naming convention and updating all stylesheets summerscope 2014-04-29 12:37:49 +10:00
  • c615a805f3 More styling for active table so nodes which are inactive have different interactive states summerscope 2014-04-29 11:45:08 +10:00
  • fa68f49898 Slicing pictures for web production summerscope 2014-04-29 10:37:54 +10:00
  • c33fa03736 Merging into master Will Marshall 2014-04-29 10:35:05 +10:00
  • c60836af64 Adding modernizr to Will Marshall 2014-04-25 17:16:07 +10:00
  • 126ddd0a75 Add explicit wait before inconsistently failing lookup Rohan Mitchell 2014-04-25 18:59:33 +10:00
  • c8f50216ab Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI Rohan Mitchell 2014-04-25 18:06:09 +10:00
  • c9f75f2933 Homepage pretty background image and active table styling summerscope 2014-04-25 17:19:48 +10:00
  • ad6021a116 Revert "In specs, correctly disable referential integrity for postgres" Rohan Mitchell 2014-04-25 17:14:25 +10:00
  • 9117b1f516 Adding some notes for future refactoring and a couple of pending integration tests for the new home Will Marshall 2014-04-25 17:14:18 +10:00
  • 28230f0436 Adding a current user service, refactoring various consequences of this change: Will Marshall 2014-04-25 16:59:46 +10:00
  • 1610e1448a In specs, correctly disable referential integrity for postgres Rohan Mitchell 2014-04-25 16:58:25 +10:00
  • 8f539aca1f Removing some console logs Will Marshall 2014-04-25 16:20:01 +10:00
  • c35112a40c Migration works without countries or states (ie. in CI) Rohan Mitchell 2014-04-25 16:18:30 +10:00
  • 22b87cc236 Adding active flag to enterprises Will Marshall 2014-04-25 16:08:22 +10:00
  • 91d9b546d2 Merge branch 'foreign-keys' Rohan Mitchell 2014-04-25 16:06:54 +10:00
  • 5505f3aa06 More styling for panels and buttons summerscope 2014-04-25 15:56:05 +10:00
  • b0ecadcb28 Moving our sidebar to a service for maximum awesomesauce Will Marshall 2014-04-25 13:49:44 +10:00
  • 57a65f815e Downcasing it all baby Will Marshall 2014-04-25 13:01:02 +10:00
  • b413acfa2e Printing out the taxons baby Will Marshall 2014-04-25 12:56:45 +10:00
  • 776a8db7ae Adding new panes summerscope 2014-04-25 12:47:59 +10:00
  • 980efd5793 Adding new panes and making it pretty summerscope 2014-04-25 12:46:57 +10:00
  • cf67b5fcac Adding a taxon collection mechanism to Enterprise Will Marshall 2014-04-25 12:45:03 +10:00
  • dbf15c03d3 Refactoring how we change window.location Will Marshall 2014-04-25 12:13:50 +10:00
  • b7f28c8d82 Popup dialog when changing hub: Will Marshall 2014-04-25 12:11:09 +10:00
  • 22dc8cbfa0 Unbreaking karma karma lama Will Marshall 2014-04-25 12:04:02 +10:00
  • c91e3aaa79 Removing useless hubs requirement in Hub service summerscope 2014-04-25 11:41:41 +10:00
  • 386908a947 Adding in copy for modals summerscope 2014-04-25 11:32:25 +10:00
  • 2212156f00 Adding handling of 'current hub' Will Marshall 2014-04-25 11:32:02 +10:00
  • f57020d190 Fixing a bug with modals Will Marshall 2014-04-24 17:26:11 +10:00