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 | 
						
					
				
					
						
							
							
								 
								iCross
							
						 | 
						
							
							
							
							
							
								
							
							
								531cee70d2
								
							
						 | 
						
							
							
								
								fix
							
							
							
							
							
						 | 
						
							2013-06-06 18:31:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								b659c7021d
								
							
						 | 
						
							
							
								
								bug fix and add feature
							
							
							
							
							
						 | 
						
							2013-06-06 18:31:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								515185d87c
								
							
						 | 
						
							
							
								
								ques: fix submit
							
							
							
							
							
						 | 
						
							2013-06-06 18:30:54 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								32c259ac9e
								
							
						 | 
						
							
							
								
								survey: remain stuff
							
							
							
							
							
						 | 
						
							2013-06-06 18:27:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Lukas
							
						 | 
						
							
							
							
							
							
								
							
							
								51640423a7
								
							
						 | 
						
							
							
								
								survey module initial
							
							
							
							
							
						 | 
						
							2013-06-06 18:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								dd206437d8
								
							
						 | 
						
							
							
								
								apply tags and cates for fronted. from now app developer can use param category_id and tag_id freely.
							
							
							
							
							
						 | 
						
							2013-06-06 17:39:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7729161123
								
							
						 | 
						
							
							
								
								fix for passing args. code in complete,fronted controller need to take care params,too. backend parser need to catch up.
							
							
							
							
							
						 | 
						
							2013-06-06 17:38:17 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								f2706ff2c1
								
							
						 | 
						
							
							
								
								make default widget work with params[tag_id] params[category_id]
							
							
							
							
							
						 | 
						
							2013-06-06 17:36:30 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								5c94200b77
								
							
						 | 
						
							
							
								
								fix argument passing problem for more link and tag cloud, incomplete code.
							
							
							
							
							
						 | 
						
							2013-06-06 17:21:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								6b8b749b0f
								
							
						 | 
						
							
							
								
								fix chris tag cloud
							
							
							
							
							
						 | 
						
							2013-06-06 17:18:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								253cca06cc
								
							
						 | 
						
							
							
								
								New widget for tag cloud
							
							
							
							
							
						 | 
						
							2013-06-06 17:17:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								30824d1620
								
							
						 | 
						
							
							
								
								add search to archive
							
							
							
							
							
						 | 
						
							2013-06-05 18:03:09 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								704db56925
								
							
						 | 
						
							
							
								
								fix bulletin data having 8 hours difference.
							
							
							
							
							
						 | 
						
							2013-06-05 18:01:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								06fd305bf9
								
							
						 | 
						
							
							
								
								default widget show search
							
							
							
							
							
						 | 
						
							2013-06-05 13:00:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								c0f1614cb9
								
							
						 | 
						
							
							
								
								fix uploading error due to user action decoder can not handle uploading file
							
							
							
							
							
						 | 
						
							2013-05-30 10:17:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e0b7d81ae
								
							
						 | 
						
							
							
								
								clean 403 404 500
							
							
							
							
							
						 | 
						
							2013-05-27 16:46:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2806dd35a9
								
							
						 | 
						
							
							
								
								spen's fix for user
							
							
							
							
							
						 | 
						
							2013-05-23 14:03:18 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								54a35b30be
								
							
						 | 
						
							
							
								
								fix design index bug when start start from blank DB.
							
							
							
							
							
							
							
							add delay impressionist.
add several i18n vars 
							
						 | 
						
							2013-05-23 12:07:43 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								37aa950028
								
							
						 | 
						
							
							
								
								user action
							
							
							
							
							
						 | 
						
							2013-05-23 11:55:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3d0a1cef56
								
							
						 | 
						
							
							
								
								1.fix for syntax error.
							
							
							
							
							
							
							
							2.Making production console works.
3.Making blank site member no errors. 
							
						 | 
						
							2013-05-22 16:25:12 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								4a5256bf4f
								
							
						 | 
						
							
							
								
								ntu dropdown fix member staff css
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								5b368235e8
								
							
						 | 
						
							
							
								
								ntu dropdown fix list sort
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								b8da40b4ae
								
							
						 | 
						
							
							
								
								ntu_dropdown_fix
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								287e77836d
								
							
						 | 
						
							
							
								
								fix css compiling error
							
							
							
							
							
						 | 
						
							2013-05-14 14:19:20 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e6c2b1ec2
								
							
						 | 
						
							
							
								
								fix member error with blank database
							
							
							
							
							
						 | 
						
							2013-05-14 11:48:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f2247aab32
								
							
						 | 
						
							
							
								
								ray's css fix
							
							
							
							
							
						 | 
						
							2013-05-14 11:27:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								ef2c732d2e
								
							
						 | 
						
							
							
								
								make blank site working better
							
							
							
							
							
						 | 
						
							2013-05-14 11:26:35 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								1096db79b6
								
							
						 | 
						
							
							
								
								blank site now can be start from rake site:build
							
							
							
							
							
						 | 
						
							2013-05-14 10:32:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								88d55989de
								
							
						 | 
						
							
							
								
								change logger
							
							
							
							
							
						 | 
						
							2013-05-14 10:29:11 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								c2331695cd
								
							
						 | 
						
							
							
								
								Set order of page context to match the order of structure
							
							
							
							
							
							
							
							Add some params to keep the sorting 
							
						 | 
						
							2013-05-07 11:15:30 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								127ab3845c
								
							
						 | 
						
							
							
								
								Changes for queries
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								aefd62da2a
								
							
						 | 
						
							
							
								
								Add tagged_ids to taggable
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								167a71272a
								
							
						 | 
						
							
							
								
								queries need to be rethink
							
							
							
							
							
						 | 
						
							2013-05-03 12:12:19 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								caf0426bd4
								
							
						 | 
						
							
							
								
								bulletin search
							
							
							
							
							
						 | 
						
							2013-05-01 12:16:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7d077a92a5
								
							
						 | 
						
							
							
								
								system preference
							
							
							
							
							
						 | 
						
							2013-04-29 15:23:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								64101109dd
								
							
						 | 
						
							
							
								
								disable all sorted_tags
							
							
							
							
							
						 | 
						
							2013-04-26 18:07:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3e567223e3
								
							
						 | 
						
							
							
								
								fix for Spen's translation and Chris's tag error
							
							
							
							
							
						 | 
						
							2013-04-26 15:37:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								79ef86f2c9
								
							
						 | 
						
							
							
								
								member translation fix
							
							
							
							
							
						 | 
						
							2013-04-26 11:26:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								d047a3d62a
								
							
						 | 
						
							
							
								
								chris tags update
							
							
							
							
							
						 | 
						
							2013-04-26 11:26:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								2945e14385
								
							
						 | 
						
							
							
								
								use rack gridfs
							
							
							
							
							
						 | 
						
							2013-04-25 20:37:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								c68c563fb0
								
							
						 | 
						
							
							
								
								fix qa problem
							
							
							
							
							
						 | 
						
							2013-04-25 20:37:13 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								697944a029
								
							
						 | 
						
							
							
								
								user id set & user fields set & role set & member frontend list & user translation & create new member bug fix
							
							
							
							
							
						 | 
						
							2013-04-25 19:59:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								12e39b4d77
								
							
						 | 
						
							
							
								
								fix rescue job won't start
							
							
							
							
							
						 | 
						
							2013-04-25 15:46:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								a0478f2a8f
								
							
						 | 
						
							
							
								
								fix page name repeated error when page creating
							
							
							
							
							
						 | 
						
							2013-04-25 12:19:25 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								b198b1a17b
								
							
						 | 
						
							
							
								
								system preference
							
							
							
							
							
						 | 
						
							2013-04-24 19:21:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								62fa589e8a
								
							
						 | 
						
							
							
								
								add msg when user session expired at page admin
							
							
							
							
							
						 | 
						
							2013-04-24 11:58:48 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt K. Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								5ff7dfbac6
								
							
						 | 
						
							
							
								
								fronted open switch and backend openness
							
							
							
							
							
						 | 
						
							2013-04-23 18:48:18 +08:00 | 
						
					
				
					
						
							
							
								
									
								
								 Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								11067ef34f
								
							
						 | 
						
							
							
								
								english mandatory removed from albums
							
							
							
							
							
						 | 
						
							2013-04-23 11:09:43 +08:00 |