Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config ...

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-11-26 17:55:53 +08:00

..

_drop_down_menu.html.erb

Changes for i18n yml

2012-09-24 09:02:45 +08:00

_guest_orbit_menu.erb

fix and hide for visitors,except for album

2012-11-21 18:31:57 +08:00

_lang_menu.html.erb

Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)

2011-04-13 18:19:51 +08:00

_member_orbit_menu.erb

fix and hide for visitors,except for album

2012-11-21 18:31:57 +08:00

_orbit_bar.html.erb

fix and hide for visitors,except for album

2012-11-21 18:31:57 +08:00

_side_bar_content.html.erb

Remove news and fix default_url in ImageUploader

2012-11-22 09:30:25 +08:00

_side_bar.html.erb

first version of confined sidebar render

2012-11-20 15:56:52 +08:00

_users_checkbox_ary.html.erb

fix for not working cache

2012-07-13 18:32:17 +08:00

admin.html.erb

new code for attribute fields and values for new member interface

2012-10-26 11:19:55 +08:00

application.html.erb

Merge server and rails_3_1

2011-08-18 13:43:33 +08:00

desktop.html.erb

Desktop Commit

2012-04-06 17:47:02 +08:00

devise.html.erb

Changes for IE9 with html5

2012-03-21 15:51:55 +08:00

module_widget.html.erb

Changes for widgets

2012-05-13 21:55:39 +08:00

new_admin.html.erb

first version of confined sidebar render

2012-11-20 15:56:52 +08:00

page_layout.html.erb

Error popup only shows on flash[:error]

2012-08-15 15:55:29 +08:00

site_editor.html.erb

Changes for structure

2012-05-22 14:45:49 +08:00