Maikel Linke
|
903bd21577
|
Merge remote-tracking branch 'origin/master' into group-pages-merge
Conflicts:
README.markdown
db/schema.rb
|
2015-02-13 15:42:36 +11:00 |
|
Rob Harrington
|
a62f48441d
|
Restrict ability to change managers of enterprises using update action
|
2015-02-12 11:34:58 +11:00 |
|
Maikel Linke
|
d93a8b6428
|
Enterprise and Group controllers use default country instead of default country id
|
2015-01-22 16:22:34 +11:00 |
|
Rob Harrington
|
c3659612ed
|
enterprise routes use permalink
|
2015-01-22 10:19:42 +11:00 |
|
Rob Harrington
|
c330e49a7f
|
Moving permalink check action to enterprise controller
|
2015-01-22 10:19:42 +11:00 |
|
Rob Harrington
|
e2268e53bb
|
Adding action to check uniquness of enterprise permalink against existing routes
|
2015-01-22 10:19:41 +11:00 |
|
Rohan Mitchell
|
f6e9c9494c
|
Enterprise user can edit profiles it has permission to
|
2015-01-15 13:43:39 +11:00 |
|
Rob Harrington
|
f145a7ed65
|
Moving taxons into its own module, adding preferred shopfront taxon order to enterprise
|
2014-12-19 14:04:02 +11:00 |
|
Rob Harrington
|
51e768e722
|
Refactor EnterpriseSet to accept a collection as an argument
|
2014-11-06 16:29:09 +11:00 |
|
Rob Harrington
|
93e3d87fcb
|
Errors on bulk update for enterprise index do not allow user to list all enterprises
|
2014-11-06 11:01:44 +11:00 |
|
Rob Harrington
|
65d13e0490
|
Show error messages on enterprise index page
|
2014-10-30 13:02:16 +11:00 |
|
Rob Harrington
|
96516a8ff3
|
User can switch between trialling a shopfront and not trialling a shopfront
|
2014-10-24 14:12:47 +11:00 |
|
Rob Harrington
|
e1cf5ceb57
|
Can set producer_profile_only using welcome page
|
2014-10-23 16:42:00 +11:00 |
|
Rob Harrington
|
b11c291df1
|
Add set_sells controller action for enterprises
|
2014-10-23 11:39:33 +11:00 |
|
Rafael Schouten
|
027189ac3c
|
rename check methods
|
2014-10-16 16:26:49 +11:00 |
|
Rafael Schouten
|
5c0d846643
|
bugfix sells and is_distributor specs and code
|
2014-09-28 11:55:46 +10:00 |
|
Rafael Schouten
|
beb85e862a
|
get type > sells migration mostly working
|
2014-09-27 15:21:27 +10:00 |
|
Rob Harrington
|
07275574b6
|
Manager can't bulk update owner
|
2014-09-19 18:31:50 +10:00 |
|
Rob H
|
e83e2295ed
|
Adding some extra controller-level specs for enterprise ownership
|
2014-09-11 14:54:51 +10:00 |
|
Rob H
|
138e0281a3
|
Specify owner for enterprise create action
|
2014-09-11 14:39:14 +10:00 |
|
Rob H
|
6540bb8efc
|
Adding select field for enterprise type to index when super admin
|
2014-09-07 19:51:14 +10:00 |
|
Rob H
|
58dcdbd9c4
|
Restricting ability to change enterprise type at the controller level
|
2014-09-05 18:30:15 +10:00 |
|
Rohan Mitchell
|
7f74854a2f
|
For OC, fetch all enterprises we have access to, including those via E2E relationships
|
2014-08-29 16:38:23 +10:00 |
|
Rohan Mitchell
|
94902268e2
|
Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated.
|
2014-07-04 14:39:27 +10:00 |
|
Rohan Mitchell
|
cf4e7b18b4
|
Redirect to enterprises index page after updating producer properties
|
2014-06-18 15:43:22 +10:00 |
|
Rohan Mitchell
|
c3cec34186
|
Redirect to enterprises page after updating producer properties
|
2014-06-18 15:28:41 +10:00 |
|
Rohan Mitchell
|
84cd56cfdc
|
Admin can list and create producer properties
|
2014-06-18 15:28:41 +10:00 |
|
Rob H
|
6809d70397
|
Redirect user back to enterprise edit page after saving
|
2014-06-18 13:18:33 +10:00 |
|
Rob H
|
45b16d52dd
|
Add visible checkbox to enterprises index page to allow bulk editing of visibility
|
2014-06-18 11:44:47 +10:00 |
|
Rob H
|
7cdfb4bab2
|
Add methods and fees to sidebar on enterprise edit page
|
2014-05-15 14:52:19 +10:00 |
|
Rob H
|
566704a968
|
Alter enterprise index order
|
2014-04-24 16:09:52 +10:00 |
|
Rohan Mitchell
|
f5b56617a0
|
As an enterprise user, when I create an enterprise, I should have management permission for it
|
2013-09-30 11:10:20 +10:00 |
|
Rohan Mitchell
|
f870e70560
|
Enterprise manager can edit and bulk edit enterprises they have access to
|
2013-08-22 11:40:33 +10:00 |
|
Andrew Spinks
|
38522e2b74
|
Fix order cycle permissions for enterprise user.
|
2013-08-18 19:41:04 +10:00 |
|
Rohan Mitchell
|
ff0d2bc983
|
Create EnterpriseSet as subclass of ModelSet
|
2012-11-21 09:08:41 +11:00 |
|
Rohan Mitchell
|
03764881c8
|
Generalise EnterpriseSet to ModelSet
|
2012-11-15 14:29:38 +11:00 |
|
Rohan Mitchell
|
8748a65031
|
Show role on admin enterprises listing page
|
2012-11-01 11:22:13 +11:00 |
|
Rohan Mitchell
|
1d1c27701d
|
Add admin interface for enterprises
|
2012-10-31 14:25:00 +11:00 |
|