chris 1857ad428c Fix for user and role relationship ... Conflicts: lib/tasks/migrate.rake		2013-09-12 15:35:53 +08:00
..
assets	Updated with loader	2013-08-27 14:29:53 +08:00
controllers	fix announcement language	2013-09-09 17:35:22 +08:00
errors	show error message when trying to show a not existed page	2013-01-03 13:50:27 +08:00
helpers	fix counter for recording request.	2013-08-28 17:56:03 +08:00
jobs	fix counter for recording request.	2013-08-28 17:56:03 +08:00
mailer	mail_cron add send_mail_now and mail cron log fix	2013-07-19 17:18:48 +08:00
models	Fix for user and role relationship	2013-09-12 15:35:53 +08:00
uploaders	features and widgets added	2013-04-17 14:14:23 +08:00
views	Change get_item	2013-07-19 18:39:13 +08:00