Rob Harrington
|
d94ca0174a
|
Registration process sets sells to 'unspecified'
|
2014-10-23 16:42:00 +11:00 |
|
Rohan Mitchell
|
f09698be47
|
Select all works on simple order cycles edit interface
|
2014-10-23 15:54:52 +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
|
d50cd023d4
|
Adding login nav to header on bare_admin layout
|
2014-10-23 15:38:06 +11:00 |
|
summerscope
|
ce346d3bca
|
Styling stripes with CSS3, remove the image instead
|
2014-10-23 15:17:33 +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 |
|
summerscope
|
204c7d9690
|
Selected state push
|
2014-10-23 14:26:52 +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 |
|
summerscope
|
bf9cd4a12b
|
Tweak image add gradient blur and slightly less dark
|
2014-10-23 14:23:23 +11:00 |
|
summerscope
|
f5aae7d214
|
Pretty stripy background tile
|
2014-10-23 14:23:04 +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 |
|
Rob Harrington
|
b11c291df1
|
Add set_sells controller action for enterprises
|
2014-10-23 11:39:33 +11:00 |
|
Rohan Mitchell
|
ab76c66b68
|
Admin can update order cycles with simple interface
|
2014-10-23 11:38:15 +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
|
2f045203ab
|
Styling welcome page WIP
|
2014-10-23 10:56:40 +11:00 |
|
summerscope
|
842e239893
|
Make selector containers anchors
|
2014-10-23 10:56:30 +11:00 |
|
Rob Harrington
|
2e0d5eb829
|
Adding set_sells action to enterprises
|
2014-10-23 10:27:53 +11:00 |
|
Rohan Mitchell
|
56ebe688dc
|
Fix file naming
|
2014-10-23 10:22:03 +11:00 |
|
Rohan Mitchell
|
8b616e7d17
|
Add unit spec for order cycles simple create controller
|
2014-10-23 10:21:19 +11:00 |
|
Rohan Mitchell
|
94e1995469
|
Merge branch 'master' into simple-order-cycles
|
2014-10-23 09:36:03 +11:00 |
|
Rohan Mitchell
|
f74ec03cef
|
Rename
|
2014-10-23 09:26:55 +11:00 |
|
Rohan Mitchell
|
66e13d40f4
|
Select all works on simple order cycles interface
|
2014-10-22 19:17:28 +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 |
|
Rohan Mitchell
|
3e61aa7267
|
Simple interface remove coordinator fee
|
2014-10-22 17:26:22 +11:00 |
|
Rafael Schouten
|
69614d6cf1
|
fix accordion jumps
|
2014-10-22 17:23:06 +11:00 |
|
Rohan Mitchell
|
28352be729
|
Save pickup time and instructions
|
2014-10-22 17:17:05 +11:00 |
|
Rohan Mitchell
|
549ef4b79d
|
When saving an OC from the simple interface, include outgoing variants
|
2014-10-22 17:08:16 +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 |
|
Rafael Schouten
|
96ff387d1f
|
fix navigation check on submission
|
2014-10-22 15:34:31 +11:00 |
|
Rob Harrington
|
565d6739b3
|
Add 'activated' scope to enterprises
|
2014-10-22 15:13:52 +11:00 |
|
Rafael Schouten
|
175e430a2b
|
uss oop for nav check
|
2014-10-22 14:51:17 +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 |
|
Rafael Schouten
|
89ce4ba632
|
Merge branch 'master' into bugfix
Conflicts:
app/models/enterprise.rb
|
2014-10-21 08:51:23 +11:00 |
|