Harry Bomrah a72d5fbb48 change in parser and new template for 4.5 ... Conflicts: app/controllers/admin/dashboards_controller.rb config/application.rb		2014-05-02 18:26:21 +08:00
..
_delete_modal.html.erb	Update Announcement module	2014-05-01 16:44:01 +08:00
_left_menu.html.erb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
_orbit_bar_backend.html.erb	Added Items,Pages, Some UI for backend	2014-04-08 18:46:27 +08:00
_right_menu.html.erb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
_side_bar.html.erb	Added Items,Pages, Some UI for backend	2014-04-08 18:46:27 +08:00
_side_bar_content.html.erb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
application.html.erb	Added Signup	2014-04-10 12:01:34 +08:00
authentication.html.erb	added stylesto signup	2014-04-10 17:13:42 +08:00
back_end.html.erb	change in parser and new template for 4.5	2014-05-02 18:26:21 +08:00
member.html.erb	authorization, module auth, category auth, member roles	2014-05-01 15:14:16 +08:00
structure.html.erb	partial widget adding is completed. and some other changes in parser	2014-04-30 18:57:09 +08:00