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
|
01c179856a
|
set maxlength for short description field
|
2014-10-12 21:19:59 +11:00 |
|
Rafael Schouten
|
20a94b4365
|
Merge branch 'master' into migrate_ent_types
Conflicts:
app/serializers/api/admin/enterprise_serializer.rb
|
2014-10-07 10:52:26 +11:00 |
|
Rafael Schouten
|
3a14a26bc6
|
refactor wysiwyg
|
2014-10-01 16:07:10 +10:00 |
|
Rafael Schouten
|
726340fc86
|
configure textAngular on enterprise edit page
|
2014-09-30 18:20:45 +10:00 |
|
Rafael Schouten
|
b821107c27
|
bugfix migration ad specs
|
2014-09-27 18:14:10 +10:00 |
|
Rafael Schouten
|
beb85e862a
|
get type > sells migration mostly working
|
2014-09-27 15:21:27 +10:00 |
|
Rob H
|
e106c7a0cd
|
Initialise user autocomplete element using data from element itself rather than AJAX request
|
2014-09-11 14:39:15 +10:00 |
|
Rob H
|
13d814ff23
|
Adding user autocomplete directive to speed up specification of owner for enterprises
|
2014-09-11 14:39:15 +10:00 |
|
Rob H
|
73a32fdaf1
|
Remove distributor_info: 'how does it work' from enterprises edit page
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
8e91e4513d
|
Remove rich text editors from about us in enterprise editor
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
4bde6a0a3d
|
WIP: VERY SLOW PAGE LOAD: Super admin can edit owner of enterprise from edit screen
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
138e0281a3
|
Specify owner for enterprise create action
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
780df6bfe0
|
Hide 'profile type' form element for non super-admin users
|
2014-09-05 18:38:43 +10:00 |
|
Rohan Mitchell
|
a858c21296
|
Enterprise has a type (full, single, profile), editable by admin
|
2014-08-19 11:37:31 +10:00 |
|
Rob H
|
6dbe2a3098
|
WIP: Angularise payment methods on enterprise edit page
|
2014-07-24 10:16:54 +10:00 |
|
Rob H
|
2200392031
|
Angularising Admin enterprises form
|
2014-07-24 10:16:54 +10:00 |
|
Rob H
|
4b437e2ab5
|
Realign enterprises social media form components
|
2014-06-20 16:38:10 +10:00 |
|
Rob H
|
1f72bade65
|
Changing promo image explanation text
|
2014-06-20 13:47:33 +10:00 |
|
Rob H
|
65a0e4707a
|
Add text which explains cropping of promo image
|
2014-06-18 12:58:32 +10:00 |
|
Rob H
|
3884b0cc1b
|
Adding a direct link to shopfront to enterprise edit page for distributor enterprises
|
2014-06-18 12:37:26 +10:00 |
|
Will Marshall
|
7abfb2f936
|
Showing the resizing logo as well
|
2014-05-30 15:32:47 +10:00 |
|
Will Marshall
|
3ddd7c31e8
|
Patching which image is rendered
|
2014-05-30 15:08:16 +10:00 |
|
Will Marshall
|
c69a4a5f1a
|
Adding social media links
|
2014-05-22 12:12:10 +10:00 |
|
Rob H
|
dafa89a2cc
|
Add placeholder for ACN and ABN
|
2014-05-16 10:07:30 +10:00 |
|
Rob H
|
c1c92d62e4
|
Adjust admin enterprise edit to improve scanning
|
2014-05-15 17:03:47 +10:00 |
|
Rob H
|
7cdfb4bab2
|
Add methods and fees to sidebar on enterprise edit page
|
2014-05-15 14:52:19 +10:00 |
|
Will Marshall
|
9db602f031
|
Patching the visible flag in admin
|
2014-05-05 16:26:03 +10:00 |
|
Will Marshall
|
f68a637609
|
Renaming Enterprise.active to Enterprise.visible
|
2014-04-30 12:09:22 +10:00 |
|
Will Marshall
|
22b87cc236
|
Adding active flag to enterprises
|
2014-04-25 16:17:37 +10:00 |
|
Will Marshall
|
35d590c926
|
Fixing a bug uploading promo images
|
2014-04-09 15:53:39 +10:00 |
|
Rohan Mitchell
|
51fdf86329
|
Polish the new enterprise form
|
2014-03-20 15:18:21 +11:00 |
|
Maikel Linke
|
f3789469b2
|
Feedback from Kerstin. Resolved issue comments removed. Pickup details removed.
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
9181f0243a
|
added old input fields, enterprises test passing
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
cc2ae2f464
|
moved fullwidth form css
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
aa7211dc7f
|
more tooltips
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
6689b0d93f
|
more tooltips
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
052782678e
|
working design. TODOs are optional now
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
e9506d1571
|
complete form with columns. two things to ask Kerstin.
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
4c0885277d
|
started to redesign form with css
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
6f1d41e020
|
new selection of input fields for enterprises form, not all datafields working yet
|
2014-03-19 20:42:21 +11:00 |
|
Maikel Linke
|
510333288c
|
first steps of new design
|
2014-03-19 20:42:21 +11:00 |
|
Will Marshall
|
aec5894c70
|
Adding a promo image to enterprises
|
2014-01-21 16:32:55 +11:00 |
|
Will Marshall
|
0ddef9626e
|
First working image upload for enterprise logos
|
2014-01-16 15:47:38 +11:00 |
|
Rohan Mitchell
|
2d80490d41
|
Update group membership for enterprise
|
2013-10-30 11:27:39 +11:00 |
|
Rohan Mitchell
|
2e1de9a6d3
|
Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210), fix nil state error
|
2013-08-23 14:00:31 +10:00 |
|
Rohan Mitchell
|
1d1c27701d
|
Add admin interface for enterprises
|
2012-10-31 14:25:00 +11:00 |
|