Rob Harrington
|
d2efd25e8d
|
Pull out type change form into a partial
|
2014-10-24 08:54:08 +11:00 |
|
summerscope
|
cf06cab533
|
Tweak header to be consistent with other admin pages
|
2014-10-23 17:23:58 +11:00 |
|
Rohan Mitchell
|
ee5cd599aa
|
Add basic details for the single enterprise dashboard
|
2014-10-23 16:44:16 +11:00 |
|
Rob Harrington
|
e1cf5ceb57
|
Can set producer_profile_only using welcome page
|
2014-10-23 16:42:00 +11:00 |
|
Rohan Mitchell
|
7faf6e12ea
|
Clean up simple order cycle interface
|
2014-10-23 15:53:16 +11:00 |
|
summerscope
|
4f2327f05c
|
More styling for Next button and error message
|
2014-10-23 15:46:56 +11:00 |
|
Rob Harrington
|
e67f039791
|
Merging in remote changes
|
2014-10-23 14:53:21 +11:00 |
|
Rob Harrington
|
e9a6c9d0ce
|
Adding header to welcome page
|
2014-10-23 14:50:56 +11:00 |
|
Rob Harrington
|
67c82e81de
|
Fixing form on welcome page
|
2014-10-23 14:41:00 +11:00 |
|
summerscope
|
04af954432
|
Tweak language
|
2014-10-23 14:33:19 +11:00 |
|
Rob Harrington
|
bcc8198019
|
Merge in changes on remote branch
|
2014-10-23 14:30:56 +11:00 |
|
summerscope
|
d6947b119f
|
Welcome markup make alternative markup consistent
|
2014-10-23 14:28:53 +11:00 |
|
Rob Harrington
|
77c0e36ed6
|
Adding input validation to welcome page
|
2014-10-23 14:23:50 +11:00 |
|
summerscope
|
694724d177
|
Refactoring and styling Welcome screen dashboard admin WIP
|
2014-10-23 14:23:35 +11:00 |
|
Rohan Mitchell
|
bf61d12bfa
|
Merge branch 'simple-order-cycles'
Conflicts:
app/views/admin/order_cycles/_row.html.haml
|
2014-10-23 12:11:34 +11:00 |
|
Rob Harrington
|
7d9c5f9e2c
|
Adding form elements for submission of sells preferences on welcome page
|
2014-10-23 11:40:11 +11:00 |
|
Rohan Mitchell
|
f7c1340f99
|
Admin can view an order cycle in the simple edit form
|
2014-10-23 11:08:27 +11:00 |
|
summerscope
|
842e239893
|
Make selector containers anchors
|
2014-10-23 10:56:30 +11:00 |
|
Rohan Mitchell
|
94e1995469
|
Merge branch 'master' into simple-order-cycles
|
2014-10-23 09:36:03 +11:00 |
|
Rob Harrington
|
f60a9d7bd5
|
Fiddling with styling
|
2014-10-22 19:13:17 +11:00 |
|
Rohan Mitchell
|
d47db903fb
|
Add basic styling to simple order cycle interface
|
2014-10-22 19:12:51 +11:00 |
|
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 |
|
Rafael Schouten
|
69614d6cf1
|
fix accordion jumps
|
2014-10-22 17:23:06 +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 |
|
Rafael Schouten
|
96ff387d1f
|
fix navigation check on submission
|
2014-10-22 15:34:31 +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 |
|
Rafael Schouten
|
89ce4ba632
|
Merge branch 'master' into bugfix
Conflicts:
app/models/enterprise.rb
|
2014-10-21 08:51:23 +11:00 |
|
Rafael Schouten
|
08cd273be3
|
Merge branch 'migrate_ent_types' into bugfix
Conflicts:
app/models/spree/ability_decorator.rb
|
2014-10-18 07:37:41 +11:00 |
|
Rafael Schouten
|
b71a40ae6d
|
show all permitted enterprises in order cycle summery
|
2014-10-18 03:26:57 +11:00 |
|
Rafael Schouten
|
577cb06371
|
make navCallback actually versatile
|
2014-10-18 01:42:29 +11:00 |
|
Rob Harrington
|
338ba74652
|
Only show enterprise partial when no enterprises exist
|
2014-10-17 17:15:49 +11:00 |
|
Rohan Mitchell
|
deedafde9a
|
WIP: Simple order cycle form loads and displays correct info
|
2014-10-17 16:55:55 +11:00 |
|
Rohan Mitchell
|
d8b648d531
|
Extract name and timing form from order cycles
|
2014-10-17 16:51:03 +11:00 |
|
Rohan Mitchell
|
f060da9c8d
|
Rename angular app order_cycle -> admin.order_cycles
|
2014-10-17 14:13:27 +11:00 |
|
Rob Harrington
|
a6bc9e66f6
|
Only send one enterprise creation confirmation email
|
2014-10-17 12:29:51 +11:00 |
|
Rohan Mitchell
|
694dd0c329
|
Enterprise user selling own produce only sees simple order cycle listing
|
2014-10-17 10:52:36 +11:00 |
|
Rob Harrington
|
28807d4f4d
|
Merge migrate_ent_types into reg
|
2014-10-17 10:20:48 +11:00 |
|
Rafael Schouten
|
245c1eb305
|
use a directive for navigation check to attach it to the page instead of the controller
|
2014-10-17 07:40:08 +11:00 |
|
Rafael Schouten
|
1150e69500
|
fix visible bug
|
2014-10-17 03:59:48 +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
|
f0a3296e52
|
change enterprise category name ans use symbols instead of strings
|
2014-10-16 16:26:49 +11:00 |
|
Rob Harrington
|
c59662758c
|
Add alerts for unconfirmed enterprises to overview page
|
2014-10-15 15:46:21 +11:00 |
|
Rob Harrington
|
908c242d36
|
Confirmation email when creating enterprise
|
2014-10-15 10:48:05 +11:00 |
|
Rafael Schouten
|
01c179856a
|
set maxlength for short description field
|
2014-10-12 21:19:59 +11:00 |
|
Rafael Schouten
|
01aa8cb761
|
Use serialiser instead of rabl for current order injection
|
2014-10-10 15:30:53 +11:00 |
|