This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
				
			
		
		
		
		
			
	
		
			
				
					
						
							 
							Fu Matthew
						
					
					
						bfaa22052f
						
					
					
					
					Merge commit 'fc702a6210d901cd3beea220e72f71a3b7f7d41e' into sidebar_config
						
							
							Conflicts:
	app/controllers/admin/page_parts_controller.rb
	app/controllers/default_widget_controller.rb
	app/uploaders/gprs_uploader.rb
	app/uploaders/location_uploader.rb
	app/views/admin/page_parts/_module_widget.html.erb
	app/views/admin/page_parts/reload_widget_styles.js.erb
	app/views/admin/page_parts/reload_widgets.js.erb
	app/views/layouts/_side_bar_content.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_front_end.rb
	vendor/built_in_modules/announcement/init.rb
	vendor/built_in_modules/gprs/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/gprs/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/gprs/app/controllers/panel/gprs/back_end/locations_controller.rb
	vendor/built_in_modules/gprs/app/views/panel/gprs/back_end/locations/index.html.erb
	vendor/built_in_modules/gprs/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/README.rdoc
	vendor/built_in_modules/location/app/assets/javascripts/panel/gprs/back_end/locations.js
	vendor/built_in_modules/location/app/assets/javascripts/panel/location/back_end/locations.js
	vendor/built_in_modules/location/app/assets/stylesheets/panel/gprs/back_end/locations.css
	vendor/built_in_modules/location/app/assets/stylesheets/panel/location/back_end/locations.css
	vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
	vendor/built_in_modules/location/app/models/location.rb
	vendor/built_in_modules/location/app/uploaders/locations_uploader.rb
	vendor/built_in_modules/location/app/views/panel/location/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/_form.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/edit.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/index.html.erb
	vendor/built_in_modules/location/app/views/panel/locations/back_end/locations/new.html.erb
	vendor/built_in_modules/location/config/routes.rb
	vendor/built_in_modules/location/lib/location.rb
	vendor/built_in_modules/location/location.gemspec
	vendor/built_in_modules/location/test/functional/panel/gprs/back_end/locations_controller_test.rb
	vendor/built_in_modules/location/test/functional/panel/location/back_end/locations_controller_test.rb 
						
					
				
			 | 
			2013-01-24 16:30:02 +08:00 | 
		
	
	
		
			
				| .. | 
			
		
		
			
			
			
			
				| 
					
						
							
								
								asset_uploader.rb
							
						
					
				 | 
				
					
						
							
							Create FileAssetUploader
						
					
				 | 
				2012-05-17 09:30:21 +08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								avatar_uploader.rb
							
						
					
				 | 
				
					
						
							
							Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
						
					
				 | 
				2011-04-13 18:19:51 +08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								file_asset_uploader.rb
							
						
					
				 | 
				
					
						
							
							Comment out filename in FIleAssetUploader
						
					
				 | 
				2012-05-17 23:34:15 +08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								image_uploader.rb
							
						
					
				 | 
				
					
						
							
							Devin's changes to integrate the store
						
					
				 | 
				2012-12-06 23:11:23 +08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								location_uploader.rb
							
						
					
				 | 
				
					
						
							
							rename of GPRS
						
					
				 | 
				2012-12-24 16:39:53 +08:00 |