|  Fu Matthew | 32c6f17613 | fix object auth. show error message if user try to do object auth in a wrong way. | 2013-01-02 14:34:34 +08:00 | 
				
					
						|  Rueshyna | b4633a2ccb | .not_guest_user | 2012-12-19 19:48:13 +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 | 
				
					
						|  Matthew K. Fu JuYuan | 6dfe10040b | fix object auth without app_auth | 2012-10-16 14:23:44 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e67ca84282 | object_auth change to reload | 2012-10-04 18:20:21 +08:00 | 
				
					
						|  Christophe Vilayphiou | bdd5a1a047 | Changes for i18n yml | 2012-09-24 09:02:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | d480a10661 | fix for object_auth update | 2012-09-19 11:12:22 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 959b6aee12 | fix for listing object error | 2012-09-19 10:45:03 +08:00 | 
				
					
						|  Harry Bomrah | 8dd69a140f | frontend commits | 2012-09-12 02:12:15 +08:00 | 
				
					
						|  Fu Matthew | 8bd5481b3f | fix object_auth security problem | 2012-09-07 17:53:43 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | fc4e2ceba5 | fix for 403 for new interface | 2012-08-31 18:56:26 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 49862e70f9 | hide category at front end | 2012-07-09 12:05:21 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6f0cf0e92e | cache privilege user list. | 2012-05-29 15:23:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a31a9c4792 | Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb | 2012-05-16 12:13:07 +08:00 | 
				
					
						|  Christophe Vilayphiou | e54f4409fb | Add impressionist | 2012-05-15 21:26:09 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 3f744dab05 | First version of app and object auth for web_resource module. Basic fund is ok.  backend need to be secued | 2012-05-15 18:55:16 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 9ba4c2cf2f | Change to apply page to had object_auth | 2012-05-14 12:40:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | e1450ec748 | Change to apply page to had object_auth | 2012-05-14 12:34:15 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0119ab1a74 | New Interface for App Auth and Object Auth | 2012-05-14 00:50:12 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 20a1a6e30f | New Interface for App Auth and Object Auth | 2012-05-11 16:44:40 +08:00 |