Commit Graph

  • b853f908d3 bugfix email dummy Rafael Schouten 2014-10-17 08:08:10 +11:00
  • 1a40c83a48 update chema with indexes Rafael Schouten 2014-10-17 07:59:51 +11:00
  • 9536b3e764 add navigation directive default Rafael Schouten 2014-10-17 07:58:08 +11:00
  • f1280a31a6 Merge branch 'reports' into bugfix Rafael Schouten 2014-10-17 07:41:30 +11:00
  • 245c1eb305 use a directive for navigation check to attach it to the page instead of the controller Rafael Schouten 2014-10-17 07:40:08 +11:00
  • bda1eafcec add migrating for dummy emails Rafael Schouten 2014-10-17 06:37:22 +11:00
  • dd3101f27a remove some bangs Rafael Schouten 2014-10-17 06:14:39 +11:00
  • 45b0581b7b Merge branch 'master' into bugfix Rafael Schouten 2014-10-17 05:35:10 +11:00
  • 3234bc328f Merge branch 'master' into reports Rafael Schouten 2014-10-17 04:02:29 +11:00
  • 4defb38cf4 update karma config Rafael Schouten 2014-10-17 04:01:36 +11:00
  • 1150e69500 fix visible bug Rafael Schouten 2014-10-17 03:59:48 +11:00
  • c7145f8dcd Merge branch 'reg' of github.com:openfoodfoundation/openfoodnetwork into reg Rob Harrington 2014-10-16 16:53:34 +11:00
  • 6fd9741daf use build instead of create, and reorganise code Rafael Schouten 2014-10-16 16:51:09 +11:00
  • a1d74649f3 rename spec and clear todo Rafael Schouten 2014-10-16 16:50:19 +11:00
  • f145db46f1 use self.x Rafael Schouten 2014-10-16 16:49:49 +11:00
  • 1b0000a1de use bangs Rafael Schouten 2014-10-16 16:48:01 +11:00
  • 8d01bb7ebf Pretty responsive email template!!!!!!!! summerscope 2014-10-16 16:45:15 +11:00
  • 425105174e return space remover Rafael Schouten 2014-10-16 16:25:18 +11:00
  • c5afd8cebf move visible filter to pages, and use category Rafael Schouten 2014-10-16 16:24:34 +11:00
  • 027189ac3c rename check methods Rafael Schouten 2014-10-16 16:23:20 +11:00
  • f0a3296e52 change enterprise category name ans use symbols instead of strings Rafael Schouten 2014-10-16 16:22:18 +11:00
  • 7db68795a4 Redirect to admin root after confirmation Rob Harrington 2014-10-16 16:06:54 +11:00
  • 2e8417d9e8 bugfix migration and add indexes Rafael Schouten 2014-10-16 16:05:07 +11:00
  • 0e03b5f209 Admin can change the format that Spree::Images are stored/served in Rohan Mitchell 2014-10-16 12:41:11 +11:00
  • 7e23479f3a Consistency Rohan Mitchell 2014-10-16 12:08:12 +11:00
  • a6480e6831 Merge in enterprise confirmation Rob Harrington 2014-10-16 11:52:10 +11:00
  • 63e50dc88c Fiddle with alert styling Rob Harrington 2014-10-16 11:34:06 +11:00
  • fd7191f476 add missing orders_and_distributors perm Rafael Schouten 2014-10-16 05:26:38 +11:00
  • 9343c3608b allow supplier enterprise manager to see bulk coop reports Rafael Schouten 2014-10-12 22:22:35 +11:00
  • 1577c01a77 add reports abilities specs Rafael Schouten 2014-10-12 22:21:59 +11:00
  • 46df14c0d9 refator reports controller a little Rafael Schouten 2014-10-12 14:13:52 +11:00
  • e44fed2ff0 add authorization to reports listings on index page Rafael Schouten 2014-10-12 14:00:32 +11:00
  • 0d715ce615 split report permissions Rafael Schouten 2014-10-10 19:36:37 +11:00
  • 96878f5dcb Don't require confirmation for enterprises where the email address has already been confirmed for another enterprise Rob Harrington 2014-10-15 17:22:56 +11:00
  • 20cb11a298 Update registration spec Rob Harrington 2014-10-15 16:28:52 +11:00
  • 0940af6b66 Remove bad pry Rob Harrington 2014-10-15 16:21:11 +11:00
  • e0e8ba814f Show explanation of confirm process on final page of registration Rob Harrington 2014-10-15 16:20:45 +11:00
  • c59662758c Add alerts for unconfirmed enterprises to overview page Rob Harrington 2014-10-15 15:46:21 +11:00
  • c76a3815c0 Add unconfirmed scope Rob Harrington 2014-10-15 15:45:47 +11:00
  • 1bdc55cb33 Adding confirmed scope to enterprises Rob Harrington 2014-10-15 13:03:39 +11:00
  • 56f4d5af0f Visibility in the front end is contingent upon enterprise being confirmed Rob Harrington 2014-10-15 12:27:55 +11:00
  • 6e699b2e8b Mailer tests Rob Harrington 2014-10-15 11:52:04 +11:00
  • 908c242d36 Confirmation email when creating enterprise Rob Harrington 2014-10-15 10:48:05 +11:00
  • 5e41865871 add utils angular module and navigation check factory Rafael Schouten 2014-10-14 00:25:46 +11:00
  • 5dd9879b96 validate description max lenth Rafael Schouten 2014-10-12 21:57:01 +11:00
  • 01c179856a set maxlength for short description field Rafael Schouten 2014-10-12 21:19:59 +11:00
  • 9a6958573a Merge branch 'master' into bugfix Rafael Schouten 2014-10-12 21:19:02 +11:00
  • a4e72f6fbc Making the header more semantically meaningful for HTML5. Add in row to make spacing consistent. Steps bar moves to top summerscope 2014-10-10 18:20:38 +11:00
  • 89a51bf1da Adjustments to layout, responsive logic, simplify column structure summerscope 2014-10-10 18:19:42 +11:00
  • d4318263f6 Registration modals styling WIP summerscope 2014-10-10 18:18:33 +11:00
  • 3ad7165fd6 add checkout subbmission directive Rafael Schouten 2014-10-10 17:53:28 +11:00
  • b8b19368df WIP: Making enterprise emails confirmable Rob Harrington 2014-10-10 16:54:38 +11:00
  • d5ea2a0206 Make Enterprise and EnterpriseGroup promo images jpg format Rohan Mitchell 2014-10-10 15:40:05 +11:00
  • 01aa8cb761 Use serialiser instead of rabl for current order injection Rafael Schouten 2014-10-10 15:30:53 +11:00
  • b68754d634 put payment description in panel Rafael Schouten 2014-10-10 15:22:21 +11:00
  • 9b275cc5f0 WIP: Shuffling around order of cards in registration Rob Harrington 2014-10-09 17:26:31 +11:00
  • d1e3f74c03 Add loading gif to image uploaders Rob Harrington 2014-10-09 15:56:54 +11:00
  • fc3a132c12 Closing auth dialog on pages other than home returns the user to home Rob Harrington 2014-10-09 13:46:32 +11:00
  • 31c4aad9e1 JS for closing alerts works Rob Harrington 2014-10-09 13:21:30 +11:00
  • 49c8e2f8cb Remove used styling for inline flash Rob Harrington 2014-10-09 13:16:09 +11:00
  • 83f9867632 Move registration login into own folder, reinstate ofn-inline-alert Rob Harrington 2014-10-09 13:15:19 +11:00
  • 65ac9d7226 Merge branch 'master' into reg Rob Harrington 2014-10-09 09:26:17 +11:00
  • e7b847542f bugfix tab selection Rafael Schouten 2014-10-08 00:05:55 +11:00
  • 20a94b4365 Merge branch 'master' into migrate_ent_types Rafael Schouten 2014-10-07 10:52:26 +11:00
  • 9b6db2bff4 simplify tab selection Rafael Schouten 2014-10-07 10:49:17 +11:00
  • 6fc36a3e6c swap redundant producer modal for general enterprise modal Rafael Schouten 2014-10-07 10:48:04 +11:00
  • e476324c60 fix for_order_cycle test Rafael Schouten 2014-10-07 00:22:45 +11:00
  • ec6805f573 use shared partial for no results Rafael Schouten 2014-10-06 23:51:19 +11:00
  • 7805d46743 more angular documentation Rafael Schouten 2014-10-06 23:20:43 +11:00
  • 881e82e825 add some angular documentation Rafael Schouten 2014-10-06 22:59:06 +11:00
  • 2ae325455a fix producer taxon filtering bug Rafael Schouten 2014-10-06 22:58:48 +11:00
  • 922e335e83 add is_hub to model Rafael Schouten 2014-10-06 15:42:23 +11:00
  • cc6af82823 move reports abilitiy to can manage products block, producers need to use this too Rafael Schouten 2014-10-06 15:40:41 +11:00
  • 76e170eb3a move icons into cached, for now Rafael Schouten 2014-10-06 10:44:49 +11:00
  • c495e967cb bugfix and extend angular enterprise spec Rafael Schouten 2014-10-06 01:36:18 +11:00
  • 017d6b1273 move for order cycles permission, for now, but needs review Rafael Schouten 2014-10-06 01:35:46 +11:00
  • 9eb770aed7 fix sidebar show/hide Rafael Schouten 2014-10-05 01:44:40 +10:00
  • 2f76a7ba80 add comment for hub sells own case Rafael Schouten 2014-10-05 01:44:12 +10:00
  • 58c39b340d remove duplicate default value assignment Rafael Schouten 2014-10-05 01:43:50 +10:00
  • f0c9e7cd44 fix for tests, remove open in new tab Rafael Schouten 2014-10-04 13:12:36 +10:00
  • f3fc70ebf0 Merge branch 'master' into raf_bugfix Rafael Schouten 2014-10-04 12:51:55 +10:00
  • 884c111240 fix failing tests Rafael Schouten 2014-10-04 11:56:35 +10:00
  • 698126edb2 specifify visible enterprises in tests Rafael Schouten 2014-10-04 01:01:04 +10:00
  • b3482a087b separate enterprises from visible enterprises Rafael Schouten 2014-10-04 01:00:37 +10:00
  • a552fb18da style profile check Rafael Schouten 2014-10-04 01:00:02 +10:00
  • 2670d2b0ad cleanup serializer Rafael Schouten 2014-10-04 00:59:41 +10:00
  • 01063367c4 clickable show profiles label Rafael Schouten 2014-10-04 00:59:17 +10:00
  • a0494b136f test that email is validated Rafael Schouten 2014-10-03 17:32:04 +10:00
  • c088c47a49 add email to enterprise params Rafael Schouten 2014-10-03 17:31:46 +10:00
  • 77e354f9f6 Merge branch 'master' into wys Rafael Schouten 2014-10-03 16:47:11 +10:00
  • dee471b1c7 move text angular files Rafael Schouten 2014-10-03 16:43:56 +10:00
  • bdd9e19efe specs - add text angular dep and long descrioption provider Rafael Schouten 2014-10-03 16:42:37 +10:00
  • 34ceb9c226 style text box Rafael Schouten 2014-10-03 16:06:15 +10:00
  • bb24e1ce88 sanitize long_description html before injection Rafael Schouten 2014-10-03 16:06:04 +10:00
  • e75a964703 Merge branch 'master' into raf_bugfix Rafael Schouten 2014-10-03 14:26:08 +10:00
  • 8805079faa use attubutes instead of save! Rafael Schouten 2014-10-03 14:03:34 +10:00
  • 7313aecd19 add route checking, not working yet... Rafael Schouten 2014-10-03 12:19:58 +10:00
  • 929839cb9f hide configuration on Rafael Schouten 2014-10-03 11:46:00 +10:00
  • d707ba1a70 remove nokugiri from gemfile.lock Rafael Schouten 2014-10-02 19:08:37 +10:00
  • ff4f8f63af Merge branch 'master' into raf_bugfix Rafael Schouten 2014-10-02 19:06:30 +10:00