filter activity by desk
filter activity by desk
filter activity by desk
[SD-988] - Custom limit for search results
[SD-988] Search results per page implemented by a drop down
[SD-988] decoupled basewidget from items per page
Merge remote-tracking branch 'sjunaid/devel' into devel
Merge remote-tracking branch 'mugur/activity' into devel
fix(activity): fix styling for activities
fix(rulesets): Improve error handling
fix(privileges): hide settings menu if empty

if user has no privileges for any activity in settings, hide the menu

SD-1124
fix(ruleset): save rules changes when editing ruleset

because it's a list it won't be changed but only its contents
so it would never make it into the child object

SD-1196
Merge remote-tracking branch 'upstream/devel' into devel