Harry Bomrah d7107f02f4 change in parser and widget rendering completed with also lot of changes in kernel ... Conflicts: app/helpers/orbit_helper.rb		2014-05-22 19:26:50 +08:00
..
assets_controller.rb	Filemanager for CKeditor	2014-05-16 14:49:42 +08:00
authorizations_controller.rb	Fixes user display.	2014-05-05 14:20:58 +08:00
categories_controller.rb	removed pagination in categories controller	2014-05-21 16:16:34 +08:00
dashboards_controller.rb	Template loading & switching, Log user actions and more...	2014-05-20 10:31:44 +08:00
designs_controller.rb	Template loading & switching, Log user actions and more...	2014-05-20 10:31:44 +08:00
items_controller.rb	Added Login, authenticate_user, current_user	2014-04-14 18:40:17 +08:00
members_controller.rb	Reset password, member roles	2014-05-09 14:03:55 +08:00
module_apps_controller.rb	fix for production mode	2014-05-21 11:43:43 +08:00
module_store_controller.rb	rescue nil for site in_use_locales	2014-05-20 12:14:52 +08:00
roles_controller.rb	Reset password, member roles	2014-05-09 14:03:55 +08:00
sites_controller.rb	change in parser and widget rendering completed with also lot of changes in kernel	2014-05-22 19:26:50 +08:00
tags_controller.rb	Tags & Categories	2014-05-12 16:18:35 +08:00