iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								96fc5ceea3
								
							
						 | 
						
							
							
								
								survey module: ensure the commit
							
							
							
							
							
						 | 
						
							2013-06-14 15:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								f9a148c901
								
							
						 | 
						
							
							
								
								survey module: move down/up i18n
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/back_end/surveys/_form_survey_question.html.erb 
							
						 | 
						
							2013-06-06 18:46:52 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								21bf3a0ccd
								
							
						 | 
						
							
							
								
								standalone css and icon
							
							
							
							
							
						 | 
						
							2013-06-06 18:41:27 +08:00 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								7ba0977e16
								
							
						 | 
						
							
							
								
								stuff
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/survey/app/views/panel/survey/front_end/surveys/show.html.erb 
							
						 | 
						
							2013-06-06 18:38:22 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								b659c7021d
								
							
						 | 
						
							
							
								
								bug fix and add feature
							
							
							
							
							
						 | 
						
							2013-06-06 18:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								adc15951bb
								
							
						 | 
						
							
							
								
								questionnaire stuff
							
							
							
							
							
							
							
							Conflicts:
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb 
							
						 | 
						
							2013-06-06 18:29:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								51640423a7
								
							
						 | 
						
							
							
								
								survey module initial
							
							
							
							
							
						 | 
						
							2013-06-06 18:26:41 +08:00 |