|  Spen | d7d480ac12 | archive edit & plugins edit | 2013-03-07 21:12:31 +08:00 | 
				
					
						|  unknown | a7bc19768e | member list edit | 2013-02-20 11:12:08 +08:00 | 
				
					
						|  chris | 41dff814fb | Change icons | 2013-01-09 21:17:50 +08:00 | 
				
					
						|  chris | dc3be3c9a1 | Translation changes | 2012-12-03 23:00:04 +08:00 | 
				
					
						|  chris | 390da0e49a | Change icons | 2012-11-29 00:49:53 +08:00 | 
				
					
						|  chris | 65ac6980c4 | Merge branch 'various_bugs' into nccu_master Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb | 2012-10-29 16:10:07 +08:00 | 
				
					
						|  chris | cbfa659928 | Changes for side_bar | 2012-10-26 11:19:56 +08:00 | 
				
					
						|  unknown | 975523c8b2 | demo site plugin | 2012-09-24 14:10:44 +08:00 | 
				
					
						|  unknown | 42d50ae534 | Plugins | 2012-09-14 00:05:31 +08:00 |