7f0267aedd 
								
							 
						 
						
							
							
								
								have both sinatra and rails running.. just change the routes to use rails or sinatra.. tried using a lot of gems but failed to use devise variables  
							
							
							
						 
						
							2012-06-04 18:00:06 +08:00  
				
					
						
							
							
								 
						
							
								6158799a47 
								
							 
						 
						
							
							
								
								Stupid theme  
							
							
							
						 
						
							2012-04-06 17:47:03 +08:00  
				
					
						
							
							
								 
						
							
								77b2919d8c 
								
							 
						 
						
							
							
								
								Desktop Commit  
							
							
							
						 
						
							2012-04-06 17:47:02 +08:00  
				
					
						
							
							
								 
						
							
								6f9363ef54 
								
							 
						 
						
							
							
								
								Fix bugs in upload design and missing menu  
							
							
							
						 
						
							2012-04-06 17:37:45 +08:00  
				
					
						
							
							
								 
						
							
								d45725cf3b 
								
							 
						 
						
							
							
								
								fix announcement & add lang tab  
							
							
							
						 
						
							2012-04-05 15:23:20 +08:00  
				
					
						
							
							
								 
						
							
								1b79400f44 
								
							 
						 
						
							
							
								
								Fix menu for frontend  
							
							
							
						 
						
							2012-04-05 14:06:58 +08:00  
				
					
						
							
							
								 
						
							
								7e922d8ed4 
								
							 
						 
						
							
							
								
								Fic bug from merge  
							
							
							
						 
						
							2012-04-02 10:54:48 +08:00  
				
					
						
							
							
								 
						
							
								8f28d45379 
								
							 
						 
						
							
							
								
								The new AdBanner.  
							
							
							
						 
						
							2012-04-02 03:04:38 +08:00  
				
					
						
							
							
								 
						
							
								32519f308f 
								
							 
						 
						
							
							
								
								Fix several bus when there is no design  
							
							
							
						 
						
							2012-04-02 02:41:42 +08:00  
				
					
						
							
							
								 
						
							
								32b7d95669 
								
							 
						 
						
							
							
								
								Fix parser_back_end & side_bar & meta  
							
							
							
						 
						
							2012-03-30 15:51:29 +08:00  
				
					
						
							
							
								 
						
							
								717e50a25e 
								
							 
						 
						
							
							
								
								Add rake task for layout with nokogiri  
							
							
							
						 
						
							2012-03-27 19:00:03 +08:00  
				
					
						
							
							
								 
						
							
								c5f6dbc1c4 
								
							 
						 
						
							
							
								
								Nokogiri in parsers  
							
							
							
						 
						
							2012-03-27 19:00:03 +08:00  
				
					
						
							
							
								 
						
							
								0f60ab9fc2 
								
							 
						 
						
							
							
								
								Add ad_banner to nokogiri  
							
							
							
						 
						
							2012-03-27 18:58:48 +08:00  
				
					
						
							
							
								 
						
							
								7eff06a378 
								
							 
						 
						
							
							
								
								Trying nokogiri  
							
							
							
						 
						
							2012-03-27 18:58:48 +08:00  
				
					
						
							
							
								 
						
							
								d02bbdbaa5 
								
							 
						 
						
							
							
								
								Nokogiri in parsers  
							
							
							
						 
						
							2012-03-27 18:58:04 +08:00  
				
					
						
							
							
								 
						
							
								3ba89ecbcf 
								
							 
						 
						
							
							
								
								Fact check program completed,Lin checked  
							
							
							
						 
						
							2012-03-27 18:54:03 +08:00  
				
					
						
							
							
								 
						
							
								7efaddf57c 
								
							 
						 
						
							
							
								
								Add ad_banner to nokogiri  
							
							
							
						 
						
							2012-03-27 18:42:22 +08:00  
				
					
						
							
							
								 
						
							
								f5fd3dec7a 
								
							 
						 
						
							
							
								
								Trying nokogiri  
							
							
							
						 
						
							2012-03-27 18:42:22 +08:00  
				
					
						
							
							
								 
						
							
								a126935d2c 
								
							 
						 
						
							
							
								
								Clean the parsers and introduce the metas  
							
							
							
						 
						
							2012-03-21 18:30:12 +08:00  
				
					
						
							
							
								 
						
							
								13b6892f87 
								
							 
						 
						
							
							
								
								code for new fact check  
							
							
							
						 
						
							2012-03-16 11:09:44 +08:00  
				
					
						
							
							
								 
						
							
								3e22c6e61b 
								
							 
						 
						
							
							
								
								Add bootstrap-orbit.css in front-end  
							
							
							
						 
						
							2012-03-07 18:16:59 +08:00  
				
					
						
							
							
								 
						
							
								4dd9b7ffa4 
								
							 
						 
						
							
							
								
								Fix announcement pagination in front-end  
							
							
							
						 
						
							2012-03-07 18:16:59 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								2e58c63ff7 
								
							 
						 
						
							
							
								
								fix bugs with token  
							
							
							
						 
						
							2012-02-29 18:56:42 +08:00  
				
					
						
							
							
								 
						
							
								cc550c5745 
								
							 
						 
						
							
							
								
								First version for App and Object auth.Taking Announcement as experiment  
							
							
							
						 
						
							2012-02-29 18:55:55 +08:00  
				
					
						
							
							
								 
						
							
								6b2aeadde6 
								
							 
						 
						
							
							
								
								Changes for nccu  
							
							
							
						 
						
							2012-02-29 16:01:50 +08:00  
				
					
						
							
							
								 
						
							
								6a30b0a1e4 
								
							 
						 
						
							
							
								
								Add RSS event  
							
							
							
						 
						
							2012-02-28 18:29:13 +08:00  
				
					
						
							
							
								 
						
							
								fdf4cfad2d 
								
							 
						 
						
							
							
								
								Add category for announcement widget  
							
							
							
						 
						
							2012-02-28 14:08:57 +08:00  
				
					
						
							
							
								 
						
							
								680b28023a 
								
							 
						 
						
							
							
								
								Fix ad_banner loading  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								f13ebc6c46 
								
							 
						 
						
							
							
								
								Fix bugs and changes for nccu  
							
							
							
						 
						
							2012-02-27 18:50:56 +08:00  
				
					
						
							
							
								 
						
							
								8f531a6fe5 
								
							 
						 
						
							
							
								
								Fix bus for pages and page content  
							
							
							
						 
						
							2012-02-24 15:14:23 +08:00  
				
					
						
							
							
								 
						
							
								63d7810b35 
								
							 
						 
						
							
							
								
								Add isotope, categories for announcement page, sort for announcement  
							
							
							
						 
						
							2012-02-23 15:52:58 +08:00  
				
					
						
							
							
								 
						
							
								20c320961f 
								
							 
						 
						
							
							
								
								edit page_content  
							
							
							
						 
						
							2012-02-23 15:13:36 +08:00  
				
					
						
							
							
								 
						
							
								44a346ffe9 
								
							 
						 
						
							
							
								
								Changes for orbit bar, login  
							
							
							
						 
						
							2012-02-19 16:33:22 +08:00  
				
					
						
							
							
								 
						
							
								9cd3cbc478 
								
							 
						 
						
							
							
								
								Modifications for design, pages, page_parts…  
							
							... 
							
							
							
							Move orbit_bar out of kernel.js 
							
						 
						
							2012-02-17 02:09:32 +08:00  
				
					
						
							
							
								 
						
							
								e61aa6b210 
								
							 
						 
						
							
							
								
								Modify dev.rake to create the ModuleApp object for web_recsource  
							
							
							
						 
						
							2012-02-16 13:28:51 +08:00  
				
					
						
							
							
								 
						
							
								e0accbecaa 
								
							 
						 
						
							
							
								
								Changes into page_part edition.  
							
							... 
							
							
							
							Can choose between 'text', 'public_r_tag' and 'widget' 
							
						 
						
							2012-02-16 13:09:09 +08:00  
				
					
						
							
							
								 
						
							
								8ef2d4b02e 
								
							 
						 
						
							
							
								
								include ad_banner query code. cleaned up parser  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								8f885e8bb7 
								
							 
						 
						
							
							
								
								Use key not title for module_app in parser.  
							
							... 
							
							
							
							Modify announcement routes. 
							
						 
						
							2012-02-06 16:58:19 +08:00  
				
					
						
							
							
								 
						
							
								0af37c0688 
								
							 
						 
						
							
							
								
								Add rake task for ad_banner. Will have ad_banner at dev:build  
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
				
					
						
							
							
								 
						
							
								394099c388 
								
							 
						 
						
							
							
								
								Ad banner close complete,need validation  
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
				
					
						
							
							
								 
						
							
								68cea1ea49 
								
							 
						 
						
							
							
								
								AdBanner is now working  
							
							
							
						 
						
							2012-02-04 09:37:23 +08:00  
				
					
						
							
							
								 
						
							
								f530eb7112 
								
							 
						 
						
							
							
								
								Revert "mistake commit"  
							
							... 
							
							
							
							This reverts commit 2608b72d65 
							
						 
						
							2012-02-03 14:39:15 +08:00  
				
					
						
							
							
								 
						
							
								2608b72d65 
								
							 
						 
						
							
							
								
								mistake commit  
							
							
							
						 
						
							2012-02-03 14:28:08 +08:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								762c2f5e8a 
								
							 
						 
						
							
							
								
								Add key in module_app.rb to use instead of title for authorization  
							
							
							
						 
						
							2012-01-30 18:12:18 +08:00  
				
					
						
							
							
								 
						
							
								7f999f20ab 
								
							 
						 
						
							
							
								
								Modify rake.dev for new design structure  
							
							
							
						 
						
							2012-01-30 15:45:55 +08:00  
				
					
						
							
							
								 
						
							
								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