Commit Graph

3120 Commits

Author SHA1 Message Date
Rob Harrington
262972a911 Adding basic angular to welcome form 2014-10-22 19:02:39 +11:00
Rob Harrington
fef97314cb Adding basic layout of welcome page for new users 2014-10-22 18:26:18 +11:00
Rob Harrington
7113875a45 Adding welcome page to overview controller 2014-10-22 16:49:32 +11:00
Rob Harrington
8120023094 Fixing indentation 2014-10-22 16:33:43 +11:00
Rob Harrington
ecaa2e6a51 Pull out override of 'visible' flag in enterprise serialiser 2014-10-22 15:53:25 +11:00
Rob Harrington
45ed3a4cff Only pushes activated enterprises through to the frontend 2014-10-22 15:39:49 +11:00
Rob Harrington
565d6739b3 Add 'activated' scope to enterprises 2014-10-22 15:13:52 +11:00
Rob Harrington
6798d394bb Use unspecified rather than unconfirmed 2014-10-22 14:50:22 +11:00
Rob Harrington
7ff4306991 Adding 'unspecified' option to 'sells' on Enterprise 2014-10-22 13:13:21 +11:00
Rob Harrington
3d938b3450 Shifting dashboard rendering from partials to templates 2014-10-22 12:30:07 +11:00
Rob Harrington
8bf472e970 Split dashboard into single and multiple enterprise views 2014-10-22 12:21:25 +11:00
Rob Harrington
338ba74652 Only show enterprise partial when no enterprises exist 2014-10-17 17:15:49 +11:00
Rob Harrington
b2565991e6 Merge branch 'master' into reg_and_ent_types 2014-10-17 12:33:21 +11:00
Rob Harrington
eda0b16a5f Make state abbreviations upper case 2014-10-17 12:29:51 +11:00
Rob Harrington
e9a3f8ce91 Require user to choose producer or not 2014-10-17 12:29:51 +11:00
Rob Harrington
a6bc9e66f6 Only send one enterprise creation confirmation email 2014-10-17 12:29:51 +11:00
summerscope
b671543a95 Style and make pretty the finished step of profile creation 2014-10-17 12:25:04 +11:00
summerscope
4abc59f66d Change styling on the enterprise name because we dont know what type it is yet 2014-10-17 12:02:21 +11:00
summerscope
4aa2aa5aee Tweaking layout, text, styling for registration box 2014-10-17 11:56:25 +11:00
summerscope
2c5208ce6b Change ent type page, simplify! 2014-10-17 11:17:53 +11:00
Rob Harrington
81715aaf5d Remove unrequired store registration action 2014-10-17 11:01:39 +11:00
Rob Harrington
c4d47ccc20 Change enterprise attributes defined in reg controller 2014-10-17 11:01:38 +11:00
summerscope
4884734ab5 Align Continue buttons right consistently 2014-10-17 10:43:19 +11:00
Rob Harrington
28807d4f4d Merge migrate_ent_types into reg 2014-10-17 10:20:48 +11:00
Rafael Schouten
1150e69500 fix visible bug 2014-10-17 03:59:48 +11:00
Rob Harrington
c7145f8dcd Merge branch 'reg' of github.com:openfoodfoundation/openfoodnetwork into reg 2014-10-16 16:53:34 +11:00
Rafael Schouten
f145db46f1 use self.x 2014-10-16 16:49:49 +11:00
summerscope
8d01bb7ebf Pretty responsive email template!!!!!!!! 2014-10-16 16:45:15 +11:00
Rafael Schouten
425105174e return space remover 2014-10-16 16:26:50 +11:00
Rafael Schouten
c5afd8cebf move visible filter to pages, and use category 2014-10-16 16:26:50 +11:00
Rafael Schouten
027189ac3c rename check methods 2014-10-16 16:26:49 +11:00
Rafael Schouten
f0a3296e52 change enterprise category name ans use symbols instead of strings 2014-10-16 16:26:49 +11:00
Rob Harrington
7db68795a4 Redirect to admin root after confirmation 2014-10-16 16:06:54 +11:00
Rohan Mitchell
0e03b5f209 Admin can change the format that Spree::Images are stored/served in 2014-10-16 12:41:11 +11:00
Rob Harrington
a6480e6831 Merge in enterprise confirmation 2014-10-16 11:52:10 +11:00
Rob Harrington
63e50dc88c Fiddle with alert styling 2014-10-16 11:34:06 +11:00
Rob Harrington
96878f5dcb Don't require confirmation for enterprises where the email address has already been confirmed for another enterprise 2014-10-15 17:22:56 +11:00
Rob Harrington
0940af6b66 Remove bad pry 2014-10-15 16:21:11 +11:00
Rob Harrington
e0e8ba814f Show explanation of confirm process on final page of registration 2014-10-15 16:20:45 +11:00
Rob Harrington
c59662758c Add alerts for unconfirmed enterprises to overview page 2014-10-15 15:46:21 +11:00
Rob Harrington
c76a3815c0 Add unconfirmed scope 2014-10-15 15:45:47 +11:00
Rob Harrington
1bdc55cb33 Adding confirmed scope to enterprises 2014-10-15 13:03:39 +11:00
Rob Harrington
56f4d5af0f Visibility in the front end is contingent upon enterprise being confirmed 2014-10-15 12:27:55 +11:00
Rob Harrington
908c242d36 Confirmation email when creating enterprise 2014-10-15 10:48:05 +11:00
summerscope
a4e72f6fbc Making the header more semantically meaningful for HTML5. Add in row to make spacing consistent. Steps bar moves to top 2014-10-10 18:20:38 +11:00
summerscope
89a51bf1da Adjustments to layout, responsive logic, simplify column structure 2014-10-10 18:19:42 +11:00
summerscope
d4318263f6 Registration modals styling WIP 2014-10-10 18:18:33 +11:00
Rob Harrington
b8b19368df WIP: Making enterprise emails confirmable 2014-10-10 16:54:38 +11:00
Rohan Mitchell
d5ea2a0206 Make Enterprise and EnterpriseGroup promo images jpg format 2014-10-10 15:40:05 +11:00
Rob Harrington
9b275cc5f0 WIP: Shuffling around order of cards in registration 2014-10-09 17:26:31 +11:00