Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								42c89220e3
								
							
						 | 
						
							
							
								
								Manger and SubManager
							
							
							
							
							
						 | 
						
							2012-01-13 18:20:04 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7b40706aed
								
							
						 | 
						
							
							
								
								fixing for app_auth
							
							
							
							
							
						 | 
						
							2012-01-05 16:20:51 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								a9f06b9517
								
							
						 | 
						
							
							
								
								Divide parser into sub-parsers
							
							
							
							
							
						 | 
						
							2011-12-22 16:23:48 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								d465febca7
								
							
						 | 
						
							
							
								
								merge with november_presentation
							
							
							
							
							
						 | 
						
							2011-12-22 15:43:38 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								a09f8e4551
								
							
						 | 
						
							
							
								
								merge with november_presentation
							
							
							
							
							
						 | 
						
							2011-12-20 16:47:17 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								afbffe37d5
								
							
						 | 
						
							
							
								
								Users can now be saved with sub_roles
							
							
							
							
							
						 | 
						
							2011-12-20 14:35:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								4108ebf06d
								
							
						 | 
						
							
							
								
								Fix mongoid deeply nested polimorphic
							
							
							
							
							
							
							
							Got the commit from github. The roles and sub_roles save. 
							
						 | 
						
							2011-12-19 21:22:26 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								d27d7a623c
								
							
						 | 
						
							
							
								
								Changes for sub_roles
							
							
							
							
							
							
							
							Issues: update doesn't create new i18n_variables, role form has bugs 
							
						 | 
						
							2011-12-18 10:07:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								b7ac5478b4
								
							
						 | 
						
							
							
								
								Change role structure
							
							
							
							
							
							
							
							Still needs to: change the views and create sub_roles in the dev.rake 
							
						 | 
						
							2011-12-10 18:12:39 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								962bf03af2
								
							
						 | 
						
							
							
								
								Remove snippet
							
							
							
							
							
						 | 
						
							2011-12-05 10:27:22 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								66bc0ce560
								
							
						 | 
						
							
							
								
								Modified dev.rake
							
							
							
							
							
						 | 
						
							2011-11-20 03:16:35 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								ad9f9bbf5c
								
							
						 | 
						
							
							
								
								Final Ray's modifications
							
							
							
							
							
						 | 
						
							2011-11-19 21:47:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								dac6348402
								
							
						 | 
						
							
							
								
								Integration of module_app workflow
							
							
							
							
							
						 | 
						
							2011-11-19 14:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								65349796d0
								
							
						 | 
						
							
							
								
								Ray's modifications
							
							
							
							
							
						 | 
						
							2011-11-18 16:43:14 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								861237d65b
								
							
						 | 
						
							
							
								
								Integration of Ray' modifications
							
							
							
							
							
						 | 
						
							2011-11-17 20:02:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								c1d77fa6d6
								
							
						 | 
						
							
							
								
								Changes for purchases - handle different type of purchases
							
							
							
							
							
						 | 
						
							2011-11-14 10:22:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								d9d7099da6
								
							
						 | 
						
							
							
								
								Fix bug: users can now be saved
							
							
							
							
							
						 | 
						
							2011-11-12 17:54:45 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								2e86d8081f
								
							
						 | 
						
							
							
								
								Modifications for images in html code
							
							
							
							
							
						 | 
						
							2011-10-18 11:21:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								0ca354cfd0
								
							
						 | 
						
							
							
								
								Clean code and new image uploader
							
							
							
							
							
						 | 
						
							2011-09-14 15:11:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								f2e3cb00db
								
							
						 | 
						
							
							
								
								Fix bug when editing a page, the theme wasn't including blank
							
							
							
							
							
						 | 
						
							2011-09-13 14:03:03 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								4db88282a1
								
							
						 | 
						
							
							
								
								Modification in Design structure_css -> default_css
							
							
							
							
							
						 | 
						
							2011-09-13 11:57:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								07ccacb7d7
								
							
						 | 
						
							
							
								
								Modifications of the JS in Design
							
							
							
							
							
						 | 
						
							2011-09-09 15:40:13 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								77b8fcdd1d
								
							
						 | 
						
							
							
								
								Fix previous workaround for the uploaded Design
							
							
							
							
							
						 | 
						
							2011-09-09 13:44:43 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								a571d1dcff
								
							
						 | 
						
							
							
								
								Clean code and workaround mongoid embedded with carrierwave
							
							
							
							
							
						 | 
						
							2011-09-08 18:12:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								22c9ca4c74
								
							
						 | 
						
							
							
								
								Handle "reset.css" and add link in the generated menu
							
							
							
							
							
						 | 
						
							2011-09-05 16:06:17 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								151f005815
								
							
						 | 
						
							
							
								
								structure.css -> default.css
							
							
							
							
							
							
							
							Themes are optional, a theme overrides style in default.css 
							
						 | 
						
							2011-09-05 15:18:36 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								f4b1d1e182
								
							
						 | 
						
							
							
								
								Modifications in Layout
							
							
							
							
							
							
							
							In the layout file we can have "contents" (for editable content) and
"layout_parts" (for when the layout is created from scratch) 
							
						 | 
						
							2011-09-05 01:14:49 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								b2c0047d0f
								
							
						 | 
						
							
							
								
								Modification in parse_urls in both layout.rb and theme.rb
							
							
							
							
							
						 | 
						
							2011-09-02 19:19:34 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								25355e9c7f
								
							
						 | 
						
							
							
								
								Force encoding and stip filename in Theme::parse_urls
							
							
							
							
							
						 | 
						
							2011-09-01 19:14:34 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								492f691469
								
							
						 | 
						
							
							
								
								Modifications for menu in Design
							
							
							
							
							
						 | 
						
							2011-09-01 09:12:49 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								8b576cac48
								
							
						 | 
						
							
							
								
								Fix bug when selecting theme
							
							
							
							
							
						 | 
						
							2011-08-25 15:44:52 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								2afe961416
								
							
						 | 
						
							
							
								
								Modify check if site is up-to-date
							
							
							
							
							
						 | 
						
							2011-08-25 08:30:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								c427e2af14
								
							
						 | 
						
							
							
								
								Page form with drop down. Modifications for Designs
							
							
							
							
							
						 | 
						
							2011-08-25 08:13:38 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								27d47215e9
								
							
						 | 
						
							
							
								
								Modify edit page. Still need to handle "form" with drop down lists
							
							
							
							
							
						 | 
						
							2011-08-24 02:34:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								1d214bedec
								
							
						 | 
						
							
							
								
								Revert "Revert "Clean code and add 'name' in theme.rb""
							
							
							
							
							
							
							
							This reverts commit 00813c9060. 
							
						 | 
						
							2011-08-24 02:06:27 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								00813c9060
								
							
						 | 
						
							
							
								
								Revert "Clean code and add 'name' in theme.rb"
							
							
							
							
							
							
							
							This reverts commit 608180646b. 
							
						 | 
						
							2011-08-24 02:04:54 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								608180646b
								
							
						 | 
						
							
							
								
								Clean code and add 'name' in theme.rb
							
							
							
							
							
						 | 
						
							2011-08-24 01:39:28 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								118455aa81
								
							
						 | 
						
							
							
								
								Check if site is up-to-date
							
							
							
							
							
						 | 
						
							2011-08-23 19:40:49 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								2842001a3b
								
							
						 | 
						
							
							
								
								Update source: pull from git
							
							
							
							
							
						 | 
						
							2011-08-23 15:01:22 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								7a4ad240a8
								
							
						 | 
						
							
							
								
								Clean code for layout and modifications in dev.rake
							
							
							
							
							
						 | 
						
							2011-08-22 13:45:21 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								e74f2931b1
								
							
						 | 
						
							
							
								
								Modifications asset pipeline
							
							
							
							
							
						 | 
						
							2011-08-20 22:54:07 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								20afb23a5f
								
							
						 | 
						
							
							
								
								Embed layout_parts in layout and correct typo
							
							
							
							
							
						 | 
						
							2011-08-18 16:27:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								86443661e9
								
							
						 | 
						
							
							
								
								Merge server and rails_3_1
							
							
							
							
							
						 | 
						
							2011-08-18 13:43:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Kaito
							
						 | 
						
							
							
							
							
							
								
							
							
								f6ae58cef4
								
							
						 | 
						
							
							
								
								Trying to create Design from upload package
							
							
							
							
							
						 | 
						
							2011-08-12 17:47:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Kaito
							
						 | 
						
							
							
							
							
							
								
							
							
								e0811c14db
								
							
						 | 
						
							
							
								
								adding upload package for design. bugs in
							
							
							
							
							
						 | 
						
							2011-08-11 18:20:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Kaito
							
						 | 
						
							
							
							
							
							
								
							
							
								34d0b8fac1
								
							
						 | 
						
							
							
								
								complete new parser for layout_part
							
							
							
							
							
						 | 
						
							2011-08-10 17:28:10 +08:00 | 
						
					
				
					
						
							
							
								 
								chris2tof
							
						 | 
						
							
							
							
							
							
								
							
							
								278938a52d
								
							
						 | 
						
							
							
								
								Fixed: layout.file is saved when the design is created
							
							
							
							
							
						 | 
						
							2011-08-08 17:51:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Kaito
							
						 | 
						
							
							
							
							
							
								
							
							
								9cea77430f
								
							
						 | 
						
							
							
								
								dealing with layout file bug
							
							
							
							
							
						 | 
						
							2011-08-08 17:23:20 +08:00 |