Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								4ee683aa9b
								
							
						 | 
						
							
							
								
								fixed desktop route
							
							
							
							
							
						 | 
						
							2013-01-07 16:38:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt
							
						 | 
						
							
							
							
							
							
								
							
							
								62ba8c9f18
								
							
						 | 
						
							
							
								
								Fix bugs on 172:180
							
							
							
							
							
						 | 
						
							2012-08-08 17:56:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								cc60ff8b4c
								
							
						 | 
						
							
							
								
								fix for redis search limit 10 items
							
							
							
							
							
						 | 
						
							2012-07-26 12:09:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								4daf36908c
								
							
						 | 
						
							
							
								
								working cache
							
							
							
							
							
						 | 
						
							2012-07-13 15:36:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0e65e379b0
								
							
						 | 
						
							
							
								
								cache first commit
							
							
							
							
							
						 | 
						
							2012-07-12 11:47:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt
							
						 | 
						
							
							
							
							
							
								
							
							
								6a022c90da
								
							
						 | 
						
							
							
								
								Changes on nccu
							
							
							
							
							
						 | 
						
							2012-05-18 15:20:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6b9c8eb15d
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
						 | 
						
							2012-05-17 06:31:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0b0916179f
								
							
						 | 
						
							
							
								
								Change assets
							
							
							
							
							
						 | 
						
							2012-05-16 11:07:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								d88d4e58dc
								
							
						 | 
						
							
							
								
								Merge branch 'design_team' into ldap
							
							
							
							
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 | 
						
							2012-05-09 13:51:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								41c0c26330
								
							
						 | 
						
							
							
								
								Add mail_settings
							
							
							
							
							
						 | 
						
							2012-05-09 11:38:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								c28d7d59b6
								
							
						 | 
						
							
							
								
								starting Resque
							
							
							
							
							
						 | 
						
							2012-05-08 20:21:28 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								65a0998080
								
							
						 | 
						
							
							
								
								Merge branch 'jobs_and_mail' into ldap
							
							
							
							
							
							
							
							Conflicts:
	config/environments/development.rb
	config/routes.rb 
							
						 | 
						
							2012-05-08 11:45:34 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								7339d1ee4a
								
							
						 | 
						
							
							
								
								starting Resque
							
							
							
							
							
						 | 
						
							2012-05-08 11:41:58 +08:00 | 
						
					
				
					
						
							
							
								 
								nccu
							
						 | 
						
							
							
							
							
							
								
							
							
								a1034f90ba
								
							
						 | 
						
							
							
								
								close alpha on nccu
							
							
							
							
							
						 | 
						
							2012-03-20 14:38:01 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								47215693c4
								
							
						 | 
						
							
							
								
								Merge branch 'master' into ldap
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	Gemfile.lock
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb 
							
						 | 
						
							2012-03-19 14:27:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								f4fda08e86
								
							
						 | 
						
							
							
								
								Replace PrototypeR4 by Orbit.
							
							
							
							
							
							
							
							Move session into mongoid_store.
Reset session when sing_in. 
							
						 | 
						
							2012-03-16 14:58:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								7f05f21930
								
							
						 | 
						
							
							
								
								Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap
							
							
							
							
							
							
							
							Conflicts:
	config/environments/development.rb 
							
						 | 
						
							2012-03-01 10:13:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								6b2aeadde6
								
							
						 | 
						
							
							
								
								Changes for nccu
							
							
							
							
							
						 | 
						
							2012-02-29 16:01:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Matt Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								678f1eabef
								
							
						 | 
						
							
							
								
								LDAP connection and modified Devise
							
							
							
							
							
						 | 
						
							2012-02-22 14:43:24 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								e02c675595
								
							
						 | 
						
							
							
								
								Put back exception notifications
							
							
							
							
							
						 | 
						
							2012-02-06 16:25:33 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								3287b68354
								
							
						 | 
						
							
							
								
								Basic function for ad_banner
							
							
							
							
							
						 | 
						
							2012-02-01 14:27:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								5518ae362d
								
							
						 | 
						
							
							
								
								Ray's modification before redesign
							
							
							
							
							
						 | 
						
							2012-01-24 11:57:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a55a93cb3b
								
							
						 | 
						
							
							
								
								Add exception notification in development env
							
							
							
							
							
						 | 
						
							2012-01-13 15:49:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f387139ae1
								
							
						 | 
						
							
							
								
								rails 3.1 and designs (with bug)
							
							
							
							
							
						 | 
						
							2011-07-12 16:00:57 +08:00 | 
						
					
				
					
						
							
							
								 
								ihower
							
						 | 
						
							
							
							
							
							
								
							
							
								19a7d51e60
								
							
						 | 
						
							
							
								
								Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)
							
							
							
							
							
						 | 
						
							2011-04-13 18:19:51 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								29ee4585b2
								
							
						 | 
						
							
							
								
								upgrade to rails3, but grip is broken
							
							
							
							
							
						 | 
						
							2010-03-08 16:04:05 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								13065aa85a
								
							
						 | 
						
							
							
								
								Add devise gem and panel/users controller
							
							
							
							
							
						 | 
						
							2010-03-04 16:33:26 +08:00 | 
						
					
				
					
						
							
							
								 
								Wen-Tien Chang
							
						 | 
						
							
							
							
							
							
								
							
							
								40831c1314
								
							
						 | 
						
							
							
								
								init rails 2.3.2
							
							
							
							
							
						 | 
						
							2009-05-08 00:53:18 +08:00 |