Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f8873267a2 
								
							 
						 
						
							
							
								
								Ray's fix for announcement list  
							
							 
							
							
							
						 
						
							2012-04-12 18:41:14 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6728c35023 
								
							 
						 
						
							
							
								
								Fix side_bar.  
							
							 
							
							... 
							
							
							
							In the case of tags, take the uri instead of controller name 
							
						 
						
							2012-04-12 18:14:00 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								015c0cb452 
								
							 
						 
						
							
							
								
								Delete useless code in items  
							
							 
							
							
							
						 
						
							2012-04-12 18:13:10 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								93ac99d235 
								
							 
						 
						
							
							
								
								Add missing css in "inc"  
							
							 
							
							
							
						 
						
							2012-04-12 18:12:46 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								b54578ce1e 
								
							 
						 
						
							
							
								
								ad banner preview  
							
							 
							
							
							
						 
						
							2012-04-12 07:14:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								83b4443910 
								
							 
						 
						
							
							
								
								add pic and js for permission checkbox and filter  
							
							 
							
							
							
						 
						
							2012-04-12 07:14:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								57402b8602 
								
							 
						 
						
							
							
								
								add permission-checkbox js  
							
							 
							
							
							
						 
						
							2012-04-12 07:14:06 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								e4c41ab54c 
								
							 
						 
						
							
							
								
								A filter UI for permission select. with Harry's JS  
							
							 
							
							
							
						 
						
							2012-04-12 07:14:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5417c6fec0 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team  
							
							 
							
							... 
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb 
							
						 
						
							2012-04-12 07:13:13 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								7bca339a5b 
								
							 
						 
						
							
							
								
								Ray's fix for columns width in bulletins  
							
							 
							
							
							
						 
						
							2012-04-12 07:01:34 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								486845460c 
								
							 
						 
						
							
							
								
								Filter and delete for bulletins  
							
							 
							
							
							
						 
						
							2012-04-12 06:50:36 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d2e77d6bf8 
								
							 
						 
						
							
							
								
								Merge branch 'ad_banner' of  https://github.com/Rulingcom/orbit  into ad_banner  
							
							 
							
							
							
						 
						
							2012-04-09 12:45:27 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d2a3a4d26e 
								
							 
						 
						
							
							
								
								ad banner preview  
							
							 
							
							
							
						 
						
							2012-04-09 12:44:08 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								0eab9ca8fa 
								
							 
						 
						
							
							
								
								add pic and js for permission checkbox and filter  
							
							 
							
							
							
						 
						
							2012-04-09 12:43:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								c7c3af91dd 
								
							 
						 
						
							
							
								
								add permission-checkbox js  
							
							 
							
							
							
						 
						
							2012-04-09 12:43:10 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								963a0cb604 
								
							 
						 
						
							
							
								
								Change filter to js with history for bulletins  
							
							 
							
							
							
						 
						
							2012-04-07 00:20:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								253f4bcb54 
								
							 
						 
						
							
							
								
								Ray's changes for orbit bar  
							
							 
							
							
							
						 
						
							2012-04-06 18:06:57 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								fa441814f3 
								
							 
						 
						
							
							
								
								A filter UI for permission select. with Harry's JS  
							
							 
							
							
							
						 
						
							2012-04-06 17:46:50 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6f9363ef54 
								
							 
						 
						
							
							
								
								Fix bugs in upload design and missing menu  
							
							 
							
							
							
						 
						
							2012-04-06 17:37:45 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ad740b0daf 
								
							 
						 
						
							
							
								
								Missing end tag in side_bar  
							
							 
							
							
							
						 
						
							2012-04-05 18:13:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								894f8764d8 
								
							 
						 
						
							
							
								
								Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb 
							
						 
						
							2012-04-05 17:42:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								01bda515a6 
								
							 
						 
						
							
							
								
								fact_check with Ray's permission check.  
							
							 
							
							... 
							
							
							
							needs Ray's new css 
							
						 
						
							2012-04-05 17:41:43 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ef8eb0450b 
								
							 
						 
						
							
							
								
								Changes in tinymce bar  
							
							 
							
							
							
						 
						
							2012-04-05 17:28:21 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								d45725cf3b 
								
							 
						 
						
							
							
								
								fix announcement & add lang tab  
							
							 
							
							
							
						 
						
							2012-04-05 15:23:20 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								ef88c2dbc2 
								
							 
						 
						
							
							
								
								fact_check with Ray's permission check.  
							
							 
							
							... 
							
							
							
							needs Ray's new css 
							
						 
						
							2012-04-05 15:06:01 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1259d62249 
								
							 
						 
						
							
							
								
								Fix mainTablePosition in js -> remove the notable class  
							
							 
							
							
							
						 
						
							2012-04-05 14:55:41 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								cedd782e7f 
								
							 
						 
						
							
							
								
								Sidebar fix for ad_banner  
							
							 
							
							
							
						 
						
							2012-04-05 13:55:03 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								d8b20ae993 
								
							 
						 
						
							
							
								
								fix ad_banner sidebar  
							
							 
							
							
							
						 
						
							2012-04-05 11:11:48 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								a9988a0d5c 
								
							 
						 
						
							
							
								
								Change for interface,form.  
							
							 
							
							
							
						 
						
							2012-04-02 11:00:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								8f28d45379 
								
							 
						 
						
							
							
								
								The new AdBanner.  
							
							 
							
							
							
						 
						
							2012-04-02 03:04:38 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								b17cd7570f 
								
							 
						 
						
							
							
								
								changing to new admin_layout  
							
							 
							
							
							
						 
						
							2012-04-02 02:58:02 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 
						
							 
							
							
							
							
								
							
							
								928c642840 
								
							 
						 
						
							
							
								
								change layout from old admin to new_admin. not complete code  
							
							 
							
							
							
						 
						
							2012-04-02 02:58:01 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								503f71e554 
								
							 
						 
						
							
							
								
								Ray's changes in tags, css and js  
							
							 
							
							
							
						 
						
							2012-04-02 02:55:36 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6c50aa5243 
								
							 
						 
						
							
							
								
								Add pagination to bulletin index and remove ajax to make it simple  
							
							 
							
							
							
						 
						
							2012-04-02 02:55:36 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								32519f308f 
								
							 
						 
						
							
							
								
								Fix several bus when there is no design  
							
							 
							
							
							
						 
						
							2012-04-02 02:41:42 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								32b7d95669 
								
							 
						 
						
							
							
								
								Fix parser_back_end & side_bar & meta  
							
							 
							
							
							
						 
						
							2012-03-30 15:51:29 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d6e4da6dad 
								
							 
						 
						
							
							
								
								Ray's fix for margin-top  
							
							 
							
							
							
						 
						
							2012-03-28 11:31:07 +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
							
						 
						
							 
							
							
							
							
								
							
							
								55d12e50f2 
								
							 
						 
						
							
							
								
								Ray's changes in announcenment back-end  
							
							 
							
							
							
						 
						
							2012-03-27 18:58:03 +08:00  
						
					 
				
					
						
							
							
								 
								Matt Fu
							
						 
						
							 
							
							
							
							
								
							
							
								3ba89ecbcf 
								
							 
						 
						
							
							
								
								Fact check program completed,Lin checked  
							
							 
							
							
							
						 
						
							2012-03-27 18:54:03 +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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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
							
						 
						
							 
							
							
							
							
								
							
							
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								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  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f4fda08e86 
								
							 
						 
						
							
							
								
								Replace PrototypeR4 by Orbit.  
							
							 
							
							... 
							
							
							
							Move session into mongoid_store.
Reset session when sing_in. 
							
						 
						
							2012-03-16 14:58:32 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								785ead5209 
								
							 
						 
						
							
							
								
								Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/views/layouts/_side_bar.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb 
							
						 
						
							2012-03-16 14:55:21 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								6f6e84b015 
								
							 
						 
						
							
							
								
								fix dashboard & announcement  
							
							 
							
							
							
						 
						
							2012-03-16 14:44:57 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								b6d49df145 
								
							 
						 
						
							
							
								
								Change Obit to Orbit  
							
							 
							
							
							
						 
						
							2012-03-16 11:54:31 +08:00  
						
					 
				
					
						
							
							
								 
								Matt Fu
							
						 
						
							 
							
							
							
							
								
							
							
								13b6892f87 
								
							 
						 
						
							
							
								
								code for new fact check  
							
							 
							
							
							
						 
						
							2012-03-16 11:09:44 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								00ab773942 
								
							 
						 
						
							
							
								
								fix dashboard & announcement  
							
							 
							
							
							
						 
						
							2012-03-14 20:05:03 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4dd9b7ffa4 
								
							 
						 
						
							
							
								
								Fix announcement pagination in front-end  
							
							 
							
							
							
						 
						
							2012-03-07 18:16:59 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0b1f83c042 
								
							 
						 
						
							
							
								
								Fix extra loaded js: the widgets only need to render layout when they need js.  
							
							 
							
							
							
						 
						
							2012-03-07 18:16:59 +08:00  
						
					 
				
					
						
							
							
								 
								Matt Fu
							
						 
						
							 
							
							
							
							
								
							
							
								cceb785a8d 
								
							 
						 
						
							
							
								
								change view and action for announcement ,Lin checked.  Also add validation for object_auth make sure for each object,the object will be unique for each action.  
							
							 
							
							
							
						 
						
							2012-02-29 18:58:33 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								8932615f05 
								
							 
						 
						
							
							
								
								add "all_user" for app&object auth  
							
							 
							
							
							
						 
						
							2012-02-29 18:56:42 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								2e58c63ff7 
								
							 
						 
						
							
							
								
								fix bugs with token  
							
							 
							
							
							
						 
						
							2012-02-29 18:56:42 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								cc550c5745 
								
							 
						 
						
							
							
								
								First version for App and Object auth.Taking Announcement as experiment  
							
							 
							
							
							
						 
						
							2012-02-29 18:55:55 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								3bcd7ea349 
								
							 
						 
						
							
							
								
								Exp with object_auth  
							
							 
							
							
							
						 
						
							2012-02-29 18:50:23 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6b2aeadde6 
								
							 
						 
						
							
							
								
								Changes for nccu  
							
							 
							
							
							
						 
						
							2012-02-29 16:01:50 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5223a7a3e9 
								
							 
						 
						
							
							
								
								Css and js changes  
							
							 
							
							
							
						 
						
							2012-02-29 12:45:47 +08:00  
						
					 
				
					
						
							
							
								 
								Matt Fu
							
						 
						
							 
							
							
							
							
								
							
							
								ccb61fc2dd 
								
							 
						 
						
							
							
								
								change Search bar  
							
							 
							
							
							
						 
						
							2012-02-29 11:29:13 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0fa5c3ba9d 
								
							 
						 
						
							
							
								
								Fix bug in orbit-bar  
							
							 
							
							
							
						 
						
							2012-02-29 04:56:52 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								344ec86c57 
								
							 
						 
						
							
							
								
								Remove class 'error' in devise forms  
							
							 
							
							
							
						 
						
							2012-02-29 04:56:32 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4b7b57bb3d 
								
							 
						 
						
							
							
								
								Add some missing translations  
							
							 
							
							
							
						 
						
							2012-02-29 04:48:21 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9aa4173933 
								
							 
						 
						
							
							
								
								Change orbit-bar for language but bug when user name is too long  
							
							 
							
							
							
						 
						
							2012-02-29 04:21:56 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								18617850e5 
								
							 
						 
						
							
							
								
								Add categories for all the widgets  
							
							 
							
							
							
						 
						
							2012-02-28 22:00:05 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6a30b0a1e4 
								
							 
						 
						
							
							
								
								Add RSS event  
							
							 
							
							
							
						 
						
							2012-02-28 18:29:13 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								fdf4cfad2d 
								
							 
						 
						
							
							
								
								Add category for announcement widget  
							
							 
							
							
							
						 
						
							2012-02-28 14:08:57 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								7f9a7edc98 
								
							 
						 
						
							
							
								
								Changes in bulletins widget and front-end, add categories to link  
							
							 
							
							
							
						 
						
							2012-02-28 04:24:09 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f13ebc6c46 
								
							 
						 
						
							
							
								
								Fix bugs and changes for nccu  
							
							 
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								dcc64a20d2 
								
							 
						 
						
							
							
								
								Finish sorting for announcements  
							
							 
							
							
							
						 
						
							2012-02-24 15:30:49 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								8f531a6fe5 
								
							 
						 
						
							
							
								
								Fix bus for pages and page content  
							
							 
							
							
							
						 
						
							2012-02-24 15:14:23 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f8d1d7242d 
								
							 
						 
						
							
							
								
								Merge branch 'design_team' into dashboard  
							
							 
							
							
							
						 
						
							2012-02-23 16:05:33 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1a6e497b3d 
								
							 
						 
						
							
							
								
								Ika's changes  
							
							 
							
							
							
						 
						
							2012-02-23 15:53:15 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								63d7810b35 
								
							 
						 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement  
							
							 
							
							
							
						 
						
							2012-02-23 15:52:58 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								53ed4b0404 
								
							 
						 
						
							
							
								
								Initial changes in announcement for sorting and filtering  
							
							 
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								22d9741ac8 
								
							 
						 
						
							
							
								
								Fix for orbit_bar  
							
							 
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ba4d71a026 
								
							 
						 
						
							
							
								
								Changes in orbit_bar and js in announcements  
							
							 
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								9b001aa6c3 
								
							 
						 
						
							
							
								
								new page_content app  
							
							 
							
							
							
						 
						
							2012-02-21 19:22:42 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1146506063 
								
							 
						 
						
							
							
								
								Fix bug when no bulletins or web_links  
							
							 
							
							
							
						 
						
							2012-02-20 15:56:17 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								c304819d6b 
								
							 
						 
						
							
							
								
								Commented out code for Windows  
							
							 
							
							
							
						 
						
							2012-02-20 08:55:21 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								cf038183b9 
								
							 
						 
						
							
							
								
								Ika's changes in modules  
							
							 
							
							
							
						 
						
							2012-02-20 08:48:27 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								a3f152b200 
								
							 
						 
						
							
							
								
								Changes for jquery 1.7 (.live -> .on), create module_layout  
							
							 
							
							
							
						 
						
							2012-02-20 03:24:05 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								3ff2e7867e 
								
							 
						 
						
							
							
								
								Fix bug when editing home  
							
							 
							
							
							
						 
						
							2012-02-20 03:22:53 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								44a346ffe9 
								
							 
						 
						
							
							
								
								Changes for orbit bar, login  
							
							 
							
							
							
						 
						
							2012-02-19 16:33:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								0b71714d44 
								
							 
						 
						
							
							
								
								Improve code in items, pages, links  
							
							 
							
							
							
						 
						
							2012-02-17 14:54:11 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								cf4a6c0b35 
								
							 
						 
						
							
							
								
								Remove useless destroy methods  
							
							 
							
							
							
						 
						
							2012-02-17 12:26:03 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9cd3cbc478 
								
							 
						 
						
							
							
								
								Modifications for design, pages, page_parts…  
							
							 
							
							... 
							
							
							
							Move orbit_bar out of kernel.js 
							
						 
						
							2012-02-17 02:09:32 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4389f0cf28 
								
							 
						 
						
							
							
								
								Add new created files to previous commit  
							
							 
							
							
							
						 
						
							2012-02-16 13:09:09 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								e0accbecaa 
								
							 
						 
						
							
							
								
								Changes into page_part edition.  
							
							 
							
							... 
							
							
							
							Can choose between 'text', 'public_r_tag' and 'widget' 
							
						 
						
							2012-02-16 13:09:09 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								edf236c1c7 
								
							 
						 
						
							
							
								
								edit tags  
							
							 
							
							
							
						 
						
							2012-02-15 15:38:27 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								af3a2547e1 
								
							 
						 
						
							
							
								
								Change ModuleAppTag into "Module name"Tag.  
							
							 
							
							
							
						 
						
							2012-02-15 15:18:11 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								d0c2856a3a 
								
							 
						 
						
							
							
								
								Fix relations error in tags  
							
							 
							
							
							
						 
						
							2012-02-15 11:42:19 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								778a85ca2b 
								
							 
						 
						
							
							
								
								add tags  
							
							 
							
							
							
						 
						
							2012-02-15 10:37:07 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1913f0aca8 
								
							 
						 
						
							
							
								
								Add tinymce  
							
							 
							
							
							
						 
						
							2012-02-15 10:02:05 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								3e70634add 
								
							 
						 
						
							
							
								
								Announcement modifications and tags  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								f57e9f19f7 
								
							 
						 
						
							
							
								
								Changes for multiple i18n_variable in bulletin  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								1f7dae9bee 
								
							 
						 
						
							
							
								
								Gemfile and bugs in js for orbit-bar  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								55ae7de01c 
								
							 
						 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								dcc6a53430 
								
							 
						 
						
							
							
								
								brief starting  for dashboard,adds i18n vars  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								436f039c1b 
								
							 
						 
						
							
							
								
								build interface to work with object auth. Go to panel/new_blog/back_end/posts/   ,click New Auth link  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								e20739e32b 
								
							 
						 
						
							
							
								
								Object Auth. Now object can be included with "include OrbitCoreLib::ObjectAuthable" to use kernel method,such as  
							
							 
							
							... 
							
							
							
							1.Object.authed_for_user(user,title_of_object_auth).  title_of_object_auth is optional
2.object.authed_users(user,title_of_object_auth) .  title_of_object_auth is optional
if title_of_object_auth is not given,then it will return calculation across all possiblity. 
							
						 
						
							2012-02-15 00:34:21 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								3ed9b81df9 
								
							 
						 
						
							
							
								
								first commit for object auth,will take new_blog for experiment  
							
							 
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								964d7b6054 
								
							 
						 
						
							
							
								
								announcement path error  
							
							 
							
							
							
						 
						
							2012-02-13 17:09:37 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								872a00b6a2 
								
							 
						 
						
							
							
								
								Forgot to change title in key in pages_controller  
							
							 
							
							
							
						 
						
							2012-02-06 22:09:33 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								f097f83f2b 
								
							 
						 
						
							
							
								
								announcement_category edit  
							
							 
							
							
							
						 
						
							2012-02-06 16:20:51 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								8b3b71ca58 
								
							 
						 
						
							
							
								
								fix js bugs,partial bugs  
							
							 
							
							
							
						 
						
							2012-02-06 16:17:07 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								394099c388 
								
							 
						 
						
							
							
								
								Ad banner close complete,need validation  
							
							 
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								68cea1ea49 
								
							 
						 
						
							
							
								
								AdBanner is now working  
							
							 
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								f530eb7112 
								
							 
						 
						
							
							
								
								Revert "mistake commit"  
							
							 
							
							... 
							
							
							
							This reverts commit 2608b72d65 . 
							
						 
						
							2012-02-03 14:39:15 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								2608b72d65 
								
							 
						 
						
							
							
								
								mistake commit  
							
							 
							
							
							
						 
						
							2012-02-03 14:28:08 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Kaito Juyuan Fu
							
						 
						
							 
							
							
							
							
								
							
							
								a980847eb3 
								
							 
						 
						
							
							
								
								Basic function for AdBanner  
							
							 
							
							
							
						 
						
							2012-02-01 14:27:51 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								ccbde122df 
								
							 
						 
						
							
							
								
								Fix bugs in design.  
							
							 
							
							... 
							
							
							
							The static js were loaded after the page js.
parser_back_end.rb wasn't changed for the new routes.
The themes weren't parsed and saved correctly. 
							
						 
						
							2012-01-31 16:38:25 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								4906894fb5 
								
							 
						 
						
							
							
								
								Page edit wasn't showing when module_app was nil  
							
							 
							
							
							
						 
						
							2012-01-31 16:35:40 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								762c2f5e8a 
								
							 
						 
						
							
							
								
								Add key in module_app.rb to use instead of title for authorization  
							
							 
							
							
							
						 
						
							2012-01-30 18:12:18 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								46db173e0b 
								
							 
						 
						
							
							
								
								Modifications in the Design code: the uploader works but the edit is broken  
							
							 
							
							
							
						 
						
							2012-01-26 12:05:25 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								783eae4597 
								
							 
						 
						
							
							
								
								Change "NewBlog" folders into "new_blog" in assets  
							
							 
							
							... 
							
							
							
							Modify routes and pages handling for clean front-end urls 
							
						 
						
							2012-01-24 18:16:58 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								6a196c5d3d 
								
							 
						 
						
							
							
								
								Embedded to referenced for users  
							
							 
							
							
							
						 
						
							2012-01-24 15:12:06 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								83827f82ec 
								
							 
						 
						
							
							
								
								Fix custom image class  
							
							 
							
							
							
						 
						
							2012-01-24 15:11:42 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								afbb9e266a 
								
							 
						 
						
							
							
								
								User role and sub_role simple interface complete  
							
							 
							
							
							
						 
						
							2012-01-24 12:28:33 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								959f3e8b2f 
								
							 
						 
						
							
							
								
								put setup APP var setup into Orbit class  
							
							 
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								4ed8a2164c 
								
							 
						 
						
							
							
								
								First complete with manager and submanager  
							
							 
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								4df8ab6cc3 
								
							 
						 
						
							
							
								
								Add methods to work with manager role,add task to build user test data  
							
							 
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								18a82d7f47 
								
							 
						 
						
							
							
								
								Manger and SubManager  
							
							 
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								9fcf8280fa 
								
							 
						 
						
							
							
								
								Change "_filename" to "_identifier" for carrierwave  
							
							 
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								5518ae362d 
								
							 
						 
						
							
							
								
								Ray's modification before redesign  
							
							 
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								bfd55277d7 
								
							 
						 
						
							
							
								
								Embed attribute_fields and sub_roles  
							
							 
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
						
					 
				
					
						
							
							
								 
								chris2tof
							
						 
						
							 
							
							
							
							
								
							
							
								1bbb197fba 
								
							 
						 
						
							
							
								
								Forgot to remove ":remote => true" for asset new  
							
							 
							
							
							
						 
						
							2012-01-24 11:56:08 +08:00  
						
					 
				
					
						
							
							
								 
								chris2tof
							
						 
						
							 
							
							
							
							
								
							
							
								b04d845a5a 
								
							 
						 
						
							
							
								
								New rss.js from Harry and fix html form for assets  
							
							 
							
							
							
						 
						
							2012-01-24 11:56:08 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								4cfae9c107 
								
							 
						 
						
							
							
								
								announcement widget query  
							
							 
							
							
							
						 
						
							2012-01-18 21:34:26 +08:00  
						
					 
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 
						
							 
							
							
							
							
								
							
							
								3e912b6262 
								
							 
						 
						
							
							
								
								Merge branches 'master' and 'exception_notification' into new_announcement_dev  
							
							 
							
							
							
						 
						
							2012-01-16 07:57:40 +08:00  
						
					 
				
					
						
							
							
								 
								chris2tof
							
						 
						
							 
							
							
							
							
								
							
							
								4be97f6ea6 
								
							 
						 
						
							
							
								
								Merge branch 'fix_it'  
							
							 
							
							... 
							
							
							
							Conflicts:
	app/assets/javascripts/page_edit.js
	app/assets/javascripts/rss.js
	app/assets/stylesheets/admin.css.erb
	app/assets/stylesheets/admin_back_end.css.erb
	app/controllers/admin/app_auths_controller.rb
	app/controllers/admin/module_apps_controller.rb
	app/controllers/admin/users_controller.rb
	app/controllers/application_controller.rb
	app/models/app_auth.rb
	app/models/user/user.rb
	app/views/admin/app_auths/index.html.erb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_new.html.erb
	app/views/admin/designs/new.html.erb
	app/views/admin/infos/_form.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/module_apps/index.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/roles/_form.html.erb
	app/views/admin/roles/_sub_role.html.erb
	app/views/admin/users/_form.html.erb
	app/views/admin/users/_show_sub_role.html.erb
	app/views/admin/users/_sub_role.html.erb
	app/views/admin/users/edit.html.erb
	app/views/admin/users/index.html.erb
	app/views/admin/users/new.html.erb
	app/views/admin/users/show.html.erb
	app/views/layouts/admin.html.erb
	lib/fraisier/layout.html
	lib/parsers/parser_back_end.rb
	lib/parsers/parser_layout.rb
	lib/tasks/dev.rake
	spec/models/app_auth_basic.rb
	vendor/built_in_modules/NewBlog/.gitignore
	vendor/built_in_modules/NewBlog/Gemfile
	vendor/built_in_modules/NewBlog/Gemfile.lock
	vendor/built_in_modules/NewBlog/MIT-LICENSE
	vendor/built_in_modules/NewBlog/NewBlog.gemspec
	vendor/built_in_modules/NewBlog/README.rdoc
	vendor/built_in_modules/NewBlog/Rakefile
	vendor/built_in_modules/NewBlog/app/assets/images/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/application.css
	vendor/built_in_modules/NewBlog/app/assets/stylesheets/NewBlog/production.css
	vendor/built_in_modules/NewBlog/app/controllers/.gitkeep
	vendor/built_in_modules/NewBlog/app/controllers/application_controller.rb
	vendor/built_in_modules/NewBlog/app/controllers/panel/blog/back_end/posts_controller.rb
	vendor/built_in_modules/NewBlog/app/helpers/.gitkeep
	vendor/built_in_modules/NewBlog/app/helpers/application_helper.rb
	vendor/built_in_modules/NewBlog/app/mailers/.gitkeep
	vendor/built_in_modules/NewBlog/app/models/.gitkeep
	vendor/built_in_modules/NewBlog/app/models/comment.rb
	vendor/built_in_modules/NewBlog/app/models/post.rb
	vendor/built_in_modules/NewBlog/app/views/.gitkeep
	vendor/built_in_modules/NewBlog/app/views/layouts/application.html.erb
	vendor/built_in_modules/NewBlog/app/views/layouts/edit_view.html.erb
	vendor/built_in_modules/NewBlog/app/views/layouts/production.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/_form.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/index.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/latest_post.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/new.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/show.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/front_end/posts/show.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/index.html.erb
	vendor/built_in_modules/NewBlog/app/views/panel/blog/widget/posts/latest_post.html.erb
	vendor/built_in_modules/NewBlog/config/locales/en.yml
	vendor/built_in_modules/NewBlog/lib/NewBlog.rb
	vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb
	vendor/built_in_modules/NewBlog/lib/NewBlog/version.rb
	vendor/built_in_modules/NewBlog/lib/tasks/NewBlog_tasks.rake
	vendor/built_in_modules/NewBlog/script/rails
	vendor/built_in_modules/NewBlog/test/NewBlog_test.rb
	vendor/built_in_modules/NewBlog/test/dummy/Rakefile
	vendor/built_in_modules/NewBlog/test/dummy/app/assets/javascripts/application.js
	vendor/built_in_modules/NewBlog/test/dummy/app/assets/stylesheets/application.css
	vendor/built_in_modules/NewBlog/test/dummy/app/controllers/application_controller.rb
	vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb
	vendor/built_in_modules/NewBlog/test/dummy/app/mailers/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/app/models/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/app/views/layouts/application.html.erb
	vendor/built_in_modules/NewBlog/test/dummy/config.ru
	vendor/built_in_modules/NewBlog/test/dummy/config/application.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/boot.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/database.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/environment.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/development.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/production.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/environments/test.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/inflections.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/mime_types.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/secret_token.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/session_store.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/built_in_modules/NewBlog/test/dummy/config/locales/en.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/mongoid.yml
	vendor/built_in_modules/NewBlog/test/dummy/config/routes.rb
	vendor/built_in_modules/NewBlog/test/dummy/lib/assets/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/log/.gitkeep
	vendor/built_in_modules/NewBlog/test/dummy/public/404.html
	vendor/built_in_modules/NewBlog/test/dummy/public/422.html
	vendor/built_in_modules/NewBlog/test/dummy/public/500.html
	vendor/built_in_modules/NewBlog/test/dummy/public/favicon.ico
	vendor/built_in_modules/NewBlog/test/dummy/script/rails
	vendor/built_in_modules/NewBlog/test/integration/navigation_test.rb
	vendor/built_in_modules/NewBlog/test/test_helper.rb
	vendor/built_in_modules/blog/app/controllers/application_controller.rb
	vendor/built_in_modules/blog/app/controllers/panel/blog/posts_controller.rb
	vendor/built_in_modules/blog/app/helpers/application_helper.rb
	vendor/built_in_modules/blog/app/models/comment.rb
	vendor/built_in_modules/blog/app/models/post.rb
	vendor/built_in_modules/blog/app/views/layouts/application.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/_form.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb
	vendor/built_in_modules/blog/app/views/panel/blog/posts/show.html.erb
	vendor/built_in_modules/blog/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/blog/config/initializers/inflections.rb
	vendor/built_in_modules/blog/config/initializers/mime_types.rb
	vendor/built_in_modules/blog/public/404.html
	vendor/built_in_modules/blog/public/422.html
	vendor/built_in_modules/blog/public/500.html
	vendor/built_in_modules/blog/public/favicon.ico
	vendor/built_in_modules/blog/public/stylesheets/.gitkeep
	vendor/built_in_modules/blog/script/rails
	vendor/built_in_modules/blog/vendor/plugins/.gitkeep
	vendor/built_in_modules/new_blog/.gitignore
	vendor/built_in_modules/new_blog/Gemfile
	vendor/built_in_modules/new_blog/Gemfile.lock
	vendor/built_in_modules/new_blog/MIT-LICENSE
	vendor/built_in_modules/new_blog/README.rdoc
	vendor/built_in_modules/new_blog/Rakefile
	vendor/built_in_modules/new_blog/app/assets/images/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/application.css
	vendor/built_in_modules/new_blog/app/assets/stylesheets/NewBlog/production.css
	vendor/built_in_modules/new_blog/app/controllers/.gitkeep
	vendor/built_in_modules/new_blog/app/controllers/application_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb
	vendor/built_in_modules/new_blog/app/helpers/.gitkeep
	vendor/built_in_modules/new_blog/app/mailers/.gitkeep
	vendor/built_in_modules/new_blog/app/models/.gitkeep
	vendor/built_in_modules/new_blog/app/models/comment.rb
	vendor/built_in_modules/new_blog/app/models/post.rb
	vendor/built_in_modules/new_blog/app/views/.gitkeep
	vendor/built_in_modules/new_blog/app/views/layouts/application.html.erb
	vendor/built_in_modules/new_blog/app/views/layouts/edit_view.html.erb
	vendor/built_in_modules/new_blog/app/views/layouts/production.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/_form.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb
	vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb
	vendor/built_in_modules/new_blog/config/locales/en.yml
	vendor/built_in_modules/new_blog/lib/new_blog/version.rb
	vendor/built_in_modules/new_blog/lib/tasks/NewBlog_tasks.rake
	vendor/built_in_modules/new_blog/new_blog.gemspec
	vendor/built_in_modules/new_blog/script/rails
	vendor/built_in_modules/new_blog/test/NewBlog_test.rb
	vendor/built_in_modules/new_blog/test/dummy/Rakefile
	vendor/built_in_modules/new_blog/test/dummy/app/assets/javascripts/application.js
	vendor/built_in_modules/new_blog/test/dummy/app/assets/stylesheets/application.css
	vendor/built_in_modules/new_blog/test/dummy/app/controllers/application_controller.rb
	vendor/built_in_modules/new_blog/test/dummy/app/helpers/application_helper.rb
	vendor/built_in_modules/new_blog/test/dummy/app/mailers/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/app/models/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/app/views/layouts/application.html.erb
	vendor/built_in_modules/new_blog/test/dummy/config.ru
	vendor/built_in_modules/new_blog/test/dummy/config/application.rb
	vendor/built_in_modules/new_blog/test/dummy/config/boot.rb
	vendor/built_in_modules/new_blog/test/dummy/config/database.yml
	vendor/built_in_modules/new_blog/test/dummy/config/environment.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/development.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/production.rb
	vendor/built_in_modules/new_blog/test/dummy/config/environments/test.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/backtrace_silencers.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/inflections.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/mime_types.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/secret_token.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/session_store.rb
	vendor/built_in_modules/new_blog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/built_in_modules/new_blog/test/dummy/config/locales/en.yml
	vendor/built_in_modules/new_blog/test/dummy/config/mongoid.yml
	vendor/built_in_modules/new_blog/test/dummy/config/routes.rb
	vendor/built_in_modules/new_blog/test/dummy/lib/assets/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/log/.gitkeep
	vendor/built_in_modules/new_blog/test/dummy/public/404.html
	vendor/built_in_modules/new_blog/test/dummy/public/422.html
	vendor/built_in_modules/new_blog/test/dummy/public/500.html
	vendor/built_in_modules/new_blog/test/dummy/public/favicon.ico
	vendor/built_in_modules/new_blog/test/dummy/script/rails
	vendor/built_in_modules/new_blog/test/integration/navigation_test.rb
	vendor/built_in_modules/new_blog/test/test_helper.rb
	vendor/plugins/NewBlog/.gitignore
	vendor/plugins/NewBlog/Gemfile
	vendor/plugins/NewBlog/Gemfile.lock
	vendor/plugins/NewBlog/MIT-LICENSE
	vendor/plugins/NewBlog/NewBlog.gemspec
	vendor/plugins/NewBlog/README.rdoc
	vendor/plugins/NewBlog/Rakefile
	vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css
	vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
	vendor/plugins/NewBlog/app/controllers/.gitkeep
	vendor/plugins/NewBlog/app/helpers/.gitkeep
	vendor/plugins/NewBlog/app/mailers/.gitkeep
	vendor/plugins/NewBlog/app/models/.gitkeep
	vendor/plugins/NewBlog/app/views/.gitkeep
	vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb
	vendor/plugins/NewBlog/app/views/layouts/production.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb
	vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb
	vendor/plugins/NewBlog/config/locales/en.yml
	vendor/plugins/NewBlog/lib/NewBlog/version.rb
	vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake
	vendor/plugins/NewBlog/script/rails
	vendor/plugins/NewBlog/test/NewBlog_test.rb
	vendor/plugins/NewBlog/test/dummy/Rakefile
	vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js
	vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css
	vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb
	vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep
	vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep
	vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb
	vendor/plugins/NewBlog/test/dummy/config.ru
	vendor/plugins/NewBlog/test/dummy/config/application.rb
	vendor/plugins/NewBlog/test/dummy/config/boot.rb
	vendor/plugins/NewBlog/test/dummy/config/database.yml
	vendor/plugins/NewBlog/test/dummy/config/environment.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/development.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/production.rb
	vendor/plugins/NewBlog/test/dummy/config/environments/test.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb
	vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb
	vendor/plugins/NewBlog/test/dummy/config/locales/en.yml
	vendor/plugins/NewBlog/test/dummy/config/mongoid.yml
	vendor/plugins/NewBlog/test/dummy/config/routes.rb
	vendor/plugins/NewBlog/test/integration/navigation_test.rb
	vendor/plugins/NewBlog/test/test_helper.rb 
							
						 
						
							2012-01-12 18:15:43 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								c0efb5d1bc 
								
							 
						 
						
							
							
								
								Listing for Module-apps  
							
							 
							
							
							
						 
						
							2012-01-12 14:13:41 +08:00  
						
					 
				
					
						
							
							
								 
								unknown
							
						 
						
							 
							
							
							
							
								
							
							
								ec235bcaa3 
								
							 
						 
						
							
							
								
								merge with master  
							
							 
							
							
							
						 
						
							2012-01-11 20:31:52 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								cae3daa9c4 
								
							 
						 
						
							
							
								
								Change NewBlog to new_blog  
							
							 
							
							
							
						 
						
							2012-01-10 18:29:11 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								79f778ad8c 
								
							 
						 
						
							
							
								
								creating for disabling widgets and frontend  
							
							 
							
							
							
						 
						
							2012-01-05 16:21:33 +08:00  
						
					 
				
					
						
							
							
								 
								Matthew Fu
							
						 
						
							 
							
							
							
							
								
							
							
								7b40706aed 
								
							 
						 
						
							
							
								
								fixing for app_auth  
							
							 
							
							
							
						 
						
							2012-01-05 16:20:51 +08:00  
						
					 
				
					
						
							
							
								 
								chris2tof
							
						 
						
							 
							
							
							
							
								
							
							
								7ebfe3a7f9 
								
							 
						 
						
							
							
								
								Add missing id in site_editor.html.erb and comment out in parser_back_end.rb because of a loading bug  
							
							 
							
							
							
						 
						
							2011-12-29 18:08:08 +08:00  
						
					 
				
					
						
							
							
								 
								chris2tof
							
						 
						
							 
							
							
							
							
								
							
							
								d85f29e65c 
								
							 
						 
						
							
							
								
								Fix missing modification for "panel_main" to "back_main"  
							
							 
							
							
							
						 
						
							2011-12-29 17:49:48 +08:00