53ed4b0404 
								
							 
						 
						
							
							
								
								Initial changes in announcement for sorting and filtering  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								ba4d71a026 
								
							 
						 
						
							
							
								
								Changes in orbit_bar and js in announcements  
							
							
							
						 
						
							2012-02-23 15:51:33 +08:00  
				
					
						
							
							
								 
						
							
								44a346ffe9 
								
							 
						 
						
							
							
								
								Changes for orbit bar, login  
							
							
							
						 
						
							2012-02-19 16:33:22 +08:00  
				
					
						
							
							
								 
						
							
								4389f0cf28 
								
							 
						 
						
							
							
								
								Add new created files to previous commit  
							
							
							
						 
						
							2012-02-16 13:09:09 +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  
				
					
						
							
							
								 
						
							
								a0f58b543b 
								
							 
						 
						
							
							
								
								Remove ckeditor  
							
							
							
						 
						
							2012-02-15 01:05:24 +08:00  
				
					
						
							
							
								 
						
							
								3e70634add 
								
							 
						 
						
							
							
								
								Announcement modifications and tags  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								55ae7de01c 
								
							 
						 
						
							
							
								
								Orbit-bar in front-end and back-end, side-bar and drop-down menu  
							
							
							
						 
						
							2012-02-15 00:34:22 +08:00  
				
					
						
							
							
								 
						
							
								dcc6a53430 
								
							 
						 
						
							
							
								
								brief starting  for dashboard,adds i18n vars  
							
							
							
						 
						
							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  
				
					
						
							
							
								 
						
							
								3ed9b81df9 
								
							 
						 
						
							
							
								
								first commit for object auth,will take new_blog for experiment  
							
							
							
						 
						
							2012-02-15 00:34:21 +08:00  
				
					
						
							
							
								 
						
							
								e02c675595 
								
							 
						 
						
							
							
								
								Put back exception notifications  
							
							
							
						 
						
							2012-02-06 16:25:33 +08:00  
				
					
						
							
							
								 
						
							
								f097f83f2b 
								
							 
						 
						
							
							
								
								announcement_category edit  
							
							
							
						 
						
							2012-02-06 16:20:51 +08:00  
				
					
						
							
							
								 
						
							
								3287b68354 
								
							 
						 
						
							
							
								
								Basic function for ad_banner  
							
							
							
						 
						
							2012-02-01 14:27:51 +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  
				
					
						
							
							
								 
						
							
								afbb9e266a 
								
							 
						 
						
							
							
								
								User role and sub_role simple interface complete  
							
							
							
						 
						
							2012-01-24 12:28:33 +08:00  
				
					
						
							
							
								 
						
							
								4ed8a2164c 
								
							 
						 
						
							
							
								
								First complete with manager and submanager  
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								18a82d7f47 
								
							 
						 
						
							
							
								
								Manger and SubManager  
							
							
							
						 
						
							2012-01-24 12:28:32 +08:00  
				
					
						
							
							
								 
						
							
								5518ae362d 
								
							 
						 
						
							
							
								
								Ray's modification before redesign  
							
							
							
						 
						
							2012-01-24 11:57:27 +08:00  
				
					
						
							
							
								 
						
							
								04f51f2d98 
								
							 
						 
						
							
							
								
								Update carrierwave  
							
							... 
							
							
							
							#{column}_identifier must be used to get the name of the file 
							
						 
						
							2012-01-24 11:57:27 +08:00  
				
					
						
							
							
								 
						
							
								3e912b6262 
								
							 
						 
						
							
							
								
								Merge branches 'master' and 'exception_notification' into new_announcement_dev  
							
							
							
						 
						
							2012-01-16 07:57:40 +08:00  
				
					
						
							
							
								 
						
							
								a55a93cb3b 
								
							 
						 
						
							
							
								
								Add exception notification in development env  
							
							
							
						 
						
							2012-01-13 15:49:07 +08:00  
				
					
						
							
							
								 
						
							
								9f93af100b 
								
							 
						 
						
							
							
								
								merge with master  
							
							
							
						 
						
							2012-01-11 20:14:28 +08:00  
				
					
						
							
							
								 
						
							
								62aaf79491 
								
							 
						 
						
							
							
								
								Merge with sub_roles  
							
							
							
						 
						
							2011-12-23 18:34:21 +08:00  
				
					
						
							
							
								 
						
							
								fc591ee308 
								
							 
						 
						
							
							
								
								Ray's back_end modification before sub_roles  
							
							
							
						 
						
							2011-12-23 18:02:45 +08:00  
				
					
						
							
							
								 
						
							
								75a3c4d5b1 
								
							 
						 
						
							
							
								
								Modify assets  
							
							... 
							
							
							
							Each layout has a manifest for css and js 
							
						 
						
							2011-12-05 09:54:41 +08:00  
				
					
						
							
							
								 
						
							
								a03e9bada8 
								
							 
						 
						
							
							
								
								Add missing translations  
							
							
							
						 
						
							2011-11-20 02:14:51 +08:00  
				
					
						
							
							
								 
						
							
								861237d65b 
								
							 
						 
						
							
							
								
								Integration of Ray' modifications  
							
							
							
						 
						
							2011-11-17 20:02:58 +08:00  
				
					
						
							
							
								 
						
							
								84ebc8306b 
								
							 
						 
						
							
							
								
								APP zip package placed in lib now can be unzip into vendor  
							
							... 
							
							
							
							APP zip package placed in lib now can be unzip into vendor,however
server can not restart 
							
						 
						
							2011-11-16 15:21:31 +08:00  
				
					
						
							
							
								 
						
							
								c1d77fa6d6 
								
							 
						 
						
							
							
								
								Changes for purchases - handle different type of purchases  
							
							
							
						 
						
							2011-11-14 10:22:31 +08:00  
				
					
						
							
							
								 
						
							
								cb07a35cc9 
								
							 
						 
						
							
							
								
								Revert ff82391b7d0d17c17568ed21176b8b0112a34e31^..HEAD  
							
							
							
						 
						
							2011-10-20 10:06:06 +08:00  
				
					
						
							
							
								 
						
							
								ff82391b7d 
								
							 
						 
						
							
							
								
								Revert "Merge with new_blog"  
							
							... 
							
							
							
							This reverts commit 64c68fcdeb 
							
						 
						
							2011-10-20 10:01:39 +08:00  
				
					
						
							
							
								 
						
							
								64c68fcdeb 
								
							 
						 
						
							
							
								
								Merge with new_blog  
							
							
							
						 
						
							2011-10-18 11:36:01 +08:00  
				
					
						
							
							
								 
						
							
								9101a2921e 
								
							 
						 
						
							
							
								
								Modifications for image urls  
							
							... 
							
							
							
							Find and replace the urls by the file urls in DB, in the theme files and
layout.html file. Save a copy of those files under "file_orig". 
							
						 
						
							2011-09-01 19:08:45 +08:00  
				
					
						
							
							
								 
						
							
								a570be1811 
								
							 
						 
						
							
							
								
								Skip callbacks  
							
							
							
						 
						
							2011-09-01 18:28:04 +08:00  
				
					
						
							
							
								 
						
							
								f99321c279 
								
							 
						 
						
							
							
								
								production mode  
							
							
							
						 
						
							2011-08-25 15:59:20 +08:00  
				
					
						
							
							
								 
						
							
								c427e2af14 
								
							 
						 
						
							
							
								
								Page form with drop down. Modifications for Designs  
							
							
							
						 
						
							2011-08-25 08:13:38 +08:00  
				
					
						
							
							
								 
						
							
								090b1fdd7f 
								
							 
						 
						
							
							
								
								rails 3.1.rc4 -> rails 3.1.rc6  
							
							
							
						 
						
							2011-08-23 19:04:45 +08:00  
				
					
						
							
							
								 
						
							
								e0e14ddfac 
								
							 
						 
						
							
							
								
								Modify purchases list  
							
							
							
						 
						
							2011-08-23 16:33:01 +08:00  
				
					
						
							
							
								 
						
							
								2842001a3b 
								
							 
						 
						
							
							
								
								Update source: pull from git  
							
							
							
						 
						
							2011-08-23 15:01:22 +08:00  
				
					
						
							
							
								 
						
							
								2cdb5a756d 
								
							 
						 
						
							
							
								
								Set store_ip in config.yml  
							
							
							
						 
						
							2011-08-22 14:01:51 +08:00  
				
					
						
							
							
								 
						
							
								7a4ad240a8 
								
							 
						 
						
							
							
								
								Clean code for layout and modifications in dev.rake  
							
							
							
						 
						
							2011-08-22 13:45:21 +08:00  
				
					
						
							
							
								 
						
							
								e74f2931b1 
								
							 
						 
						
							
							
								
								Modifications asset pipeline  
							
							
							
						 
						
							2011-08-20 22:54:07 +08:00  
				
					
						
							
							
								 
						
							
								86443661e9 
								
							 
						 
						
							
							
								
								Merge server and rails_3_1  
							
							
							
						 
						
							2011-08-18 13:43:33 +08:00  
				
					
						
							
							
								 
						
							
								e0811c14db 
								
							 
						 
						
							
							
								
								adding upload package for design. bugs in  
							
							
							
						 
						
							2011-08-11 18:20:16 +08:00  
				
					
						
							
							
								 
						
							
								b6db304579 
								
							 
						 
						
							
							
								
								add nokogiri into Gemfile and fixing dup bug again...  
							
							
							
						 
						
							2011-07-29 17:49:10 +08:00  
				
					
						
							
							
								 
						
							
								9eb80d7424 
								
							 
						 
						
							
							
								
								Made r_editor into class style add functions  
							
							
							
						 
						
							2011-07-27 17:23:01 +08:00  
				
					
						
							
							
								 
						
							
								a272b871e2 
								
							 
						 
						
							
							
								
								complete del and destroy funciton for desgin  
							
							
							
						 
						
							2011-07-22 15:54:38 +08:00  
				
					
						
							
							
								 
						
							
								c48a11d9f5 
								
							 
						 
						
							
							
								
								Add some JS for design uploading  
							
							
							
						 
						
							2011-07-19 18:31:53 +08:00