|  Christophe Vilayphiou | 486845460c | Filter and delete for bulletins | 2012-04-12 06:50:36 +08:00 | 
				
					
						|  Christophe Vilayphiou | f9c5ee5d18 | Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard Conflicts:
	app/assets/javascripts/bulletin_form.js.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/show.html.erb
	vendor/built_in_modules/announcement/config/routes.rb | 2012-03-27 18:37:14 +08:00 | 
				
					
						|  unknown | e8d1352890 | fix announcement | 2012-03-27 14:29:11 +08:00 | 
				
					
						|  unknown | a30bc499c7 | fix announcement & links | 2012-03-27 14:19:58 +08:00 | 
				
					
						|  unknown | 42519d9f78 | fix announcement & links | 2012-03-23 18:04:11 +08:00 | 
				
					
						|  Christophe Vilayphiou | 61698f3f2c | Remove quick_edit on bulletin index load | 2012-03-23 17:32:59 +08:00 | 
				
					
						|  unknown | 7d553acaec | fix announcement link & files | 2012-03-16 15:53:57 +08:00 | 
				
					
						|  unknown | 00ab773942 | fix dashboard & announcement | 2012-03-14 20:05:03 +08:00 | 
				
					
						|  unknown | f097f83f2b | announcement_category edit | 2012-02-06 16:20:51 +08:00 | 
				
					
						|  unknown | ec235bcaa3 | merge with master | 2012-01-11 20:31:52 +08:00 |