filter activity by desk
filter activity by desk
SD-1208 : The content view switch(list vs card) is not working
fix(tests: unit): added phantomjs dependency; updated dockerfile
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 pull request #625 from actionless/fix-phantom-docker

fix(tests: unit): added phantomjs dependency; updated dockerfile
Merge pull request #624 from ioanpocol/devel

SD-1208 : The content view switch(list vs card) is not working
Merge remote-tracking branch 'sjunaid/devel' into devel
Merge remote-tracking branch 'mugur/activity' into devel
fix(CSS): Introduce state colors and remove stage colors
feat(states): Display states through system
fix(dashboard): Fix article dashboard

adn add state info on dashboard items
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 'nikola/states' into feat-workflow