oidualc/eden — pull request #4 by nursix (2014-02-27 23:47:23+00:00)
Title: Minor fixes.

- activating event module in EVASS template
- hide other modules for now from menu
- activating security policy 7 (you will notice that anonymous has no longer access to anything)
- fix role list in s3aaa (trunk change)
- modify filter widget for persons to also search through fiscal_code (may become template-specific at some point)
- remove organisation from person list_fields (not needed)

I recommend you rebase your master and branch on trunk at least 1x/day to keep it in sync. This will prevent things from diverging too much (and avoid massive merge conflicts later), and you can benefit from recent fixes/updates ;)

Like:

git checkout master
git pull upstream master
git checkout EVASS
git rebase master

...or similar.