Christophe Vilayphiou bebb8a1c1e Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard ... Conflicts: app/views/layouts/_side_bar.html.erb vendor/built_in_modules/archive/app/models/archive_file.rb vendor/built_in_modules/archive/app/views/panel/archive/back_end/archive_files/_form.html.erb		2012-08-10 15:30:33 +08:00
..
assets	demo site widget	2012-07-26 16:39:29 +08:00
controllers	widget & frontend field	2012-08-09 15:25:30 +08:00
helpers	Clean up code , cache other auths. Fix sidebar	2012-05-29 17:17:26 +08:00
jobs	add script for cache user	2012-05-29 17:17:26 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	widget & frontend field	2012-08-09 15:25:30 +08:00
uploaders	demo site widget	2012-07-26 16:39:29 +08:00
views	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-08-10 15:30:33 +08:00