|  Christophe Vilayphiou | 0f60ab9fc2 | Add ad_banner to nokogiri | 2012-03-27 18:58:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7eff06a378 | Trying nokogiri | 2012-03-27 18:58:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | cf297fc424 | Changed inherited controller in module_apps to OrbitBackendController | 2012-03-27 18:58:04 +08:00 | 
				
					
						|  Christophe Vilayphiou | d02bbdbaa5 | Nokogiri in parsers | 2012-03-27 18:58:04 +08:00 | 
				
					
						|  Christophe Vilayphiou | b134e690e9 | Delete new_blog | 2012-03-27 18:58:04 +08:00 | 
				
					
						|  Christophe Vilayphiou | 07ba457dd7 | admin now can post without fact check | 2012-03-27 18:58:03 +08:00 | 
				
					
						|  Christophe Vilayphiou | 55d12e50f2 | Ray's changes in announcenment back-end | 2012-03-27 18:58:03 +08:00 | 
				
					
						|  Christophe Vilayphiou | 97adf94e15 | fix with what ray needs for the fact_check form | 2012-03-27 18:56:18 +08:00 | 
				
					
						|  Matt Fu | 3ba89ecbcf | Fact check program completed,Lin checked | 2012-03-27 18:54:03 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7efaddf57c | Add ad_banner to nokogiri | 2012-03-27 18:42:22 +08:00 | 
				
					
						|  Christophe Vilayphiou | f5fd3dec7a | Trying nokogiri | 2012-03-27 18:42:22 +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 | 
				
					
						|  Christophe Vilayphiou | 48d1d45ced | Nokogiri in parsers | 2012-03-27 17:57:50 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 1451c3ac1d | changing to new admin_layout | 2012-03-27 15:34:21 +08:00 | 
				
					
						|  Christophe Vilayphiou | 436c866a6f | admin now can post without fact check | 2012-03-27 15:10:29 +08:00 | 
				
					
						|  Christophe Vilayphiou | 422a49f56c | Ray's changes in announcenment back-end | 2012-03-27 15:03:00 +08:00 | 
				
					
						|  unknown | e8d1352890 | fix announcement | 2012-03-27 14:29:11 +08:00 | 
				
					
						|  Christophe Vilayphiou | 33955b4554 | Delete files with Chinese characters in name | 2012-03-27 14:21:32 +08:00 | 
				
					
						|  Christophe Vilayphiou | c4299245de | Delete files with Chinese characters in name | 2012-03-27 14:19:58 +08:00 | 
				
					
						|  unknown | a30bc499c7 | fix announcement & links | 2012-03-27 14:19:58 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7765f0d2e1 | Delete files with Chinese characters in name | 2012-03-27 14:17:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | 74636fb16d | Delete file with Chinese character in the name | 2012-03-27 14:16:04 +08:00 | 
				
					
						|  Christophe Vilayphiou | f37eb5bf43 | Add missing file | 2012-03-23 18:27:41 +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 | 
				
					
						|  Christophe Vilayphiou | 662c8c7a8a | fix with what ray needs for the fact_check form | 2012-03-23 12:00:48 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 2e2647af42 | change layout from old admin to new_admin. not complete code | 2012-03-23 11:18:29 +08:00 | 
				
					
						|  Christophe Vilayphiou | bb14a7736f | Merge branch 'announcement_fact_check' of github.com:Rulingcom/orbit into announcement_fact_check | 2012-03-22 20:04:42 +08:00 | 
				
					
						|  Matt Fu | 34a4e47057 | Fact check program completed,Lin checked | 2012-03-22 14:33:59 +08:00 | 
				
					
						|  Christophe Vilayphiou | b109410a7a | Add ad_banner to nokogiri | 2012-03-22 10:11:02 +08:00 | 
				
					
						|  Christophe Vilayphiou | 4f741418a0 | Trying nokogiri | 2012-03-22 01:51:16 +08:00 | 
				
					
						|  Christophe Vilayphiou | a126935d2c | Clean the parsers and introduce the metas | 2012-03-21 18:30:12 +08:00 | 
				
					
						|  Christophe Vilayphiou | 472744fc87 | Changes for IE9 with html5 | 2012-03-21 15:51:55 +08:00 | 
				
					
						|  Christophe Vilayphiou | 0e8f8b3424 | Add missing category when redirect to front-end for bulletin back-end index | 2012-03-21 12:58:13 +08:00 | 
				
					
						|  Christophe Vilayphiou | 3aa7c5120d | Put tinymce in its own js file. To use on a text area just add the class "tinymce_textarea". | 2012-03-21 12:41:32 +08:00 | 
				
					
						|  Christophe Vilayphiou | 5d7202af8b | Modify bulletin back-end index to show announcement in front-end | 2012-03-21 12:37:52 +08:00 | 
				
					
						|  Christophe Vilayphiou | c4d541d3b9 | Remove code from back_end/bulletins/show | 2012-03-21 12:36:52 +08:00 | 
				
					
						|  Christophe Vilayphiou | e953344965 | Fix before_filter order for object_auth | 2012-03-20 14:17:28 +08:00 | 
				
					
						|  Christophe Vilayphiou | 7cc075e124 | Change the monkey picture | 2012-03-19 15:49:40 +08:00 | 
				
					
						|  Christophe Vilayphiou | b58db48d26 | Changes in Gemfile | 2012-03-19 14:04:28 +08:00 | 
				
					
						|  Christophe Vilayphiou | fdb3707024 | Merge branch 'announcement_fact_check' of github.com:Rulingcom/orbit into announcement_fact_check | 2012-03-19 10:57:44 +08:00 | 
				
					
						|  Matt Fu | 6700114955 | after merge | 2012-03-19 10:55:58 +08:00 | 
				
					
						|  Matt Fu | 9c8b0235b0 | add new files | 2012-03-19 10:55:58 +08:00 | 
				
					
						|  unknown | a755eb184b | fix announcement links & files | 2012-03-16 16:49:25 +08:00 | 
				
					
						|  unknown | 7d553acaec | fix announcement link & files | 2012-03-16 15:53:57 +08:00 | 
				
					
						|  Matt Fu | c7a333f990 | after merge | 2012-03-16 15:51:59 +08:00 | 
				
					
						|  Matt Fu | 50a9f66269 | Merge branch 'design_team' of https://github.com/Rulingcom/orbit into announcement_fact_check | 2012-03-16 15:50:43 +08:00 | 
				
					
						|  Matt Fu | eb2b4b80b7 | add new files | 2012-03-16 15:48:13 +08:00 | 
				
					
						|  Christophe Vilayphiou | 07edf44643 | Merge branches 'design_team' and 'design_team' of github.com:Rulingcom/orbit into design_team | 2012-03-16 15:13:06 +08:00 | 
				
					
						|  Christophe Vilayphiou | 29ec36130e | css and js changes | 2012-03-16 15:06:45 +08:00 |