Christophe Vilayphiou de739d7d20 Merge branch 'design_team' into ldap ...

Conflicts:
	vendor/built_in_modules/web_resource/web_resource.json

2012-05-10 00:34:23 +08:00

..

assets

edit tags

2012-02-15 15:38:27 +08:00

controllers

Merge branch 'design_team' into ldap

2012-05-10 00:34:23 +08:00

helpers

edit tags

2012-02-15 15:38:27 +08:00

mailers

edit tags

2012-02-15 15:38:27 +08:00

models

Add sorting to web_links

2012-04-27 14:20:09 +08:00

views

Add list widgets for announcement, news and links with categories and tags

2012-05-10 00:25:30 +08:00