chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d7fd61ce55
								
							
						 | 
						
							
							
								
								Edit uploaded package
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								d2fea92969
								
							
						 | 
						
							
							
								
								GPRS and CALENDAR
							
							
							
							
							
						 | 
						
							2012-10-09 06:42:00 +08:00 | 
						
					
				
					
						
							
							
								 
								devin
							
						 | 
						
							
							
							
							
							
								
							
							
								789c2df7fd
								
							
						 | 
						
							
							
								
								gallery frontend update
							
							
							
							
							
						 | 
						
							2012-09-12 02:05:10 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7d5531bf01
								
							
						 | 
						
							
							
								
								Merge branch 'nccu_master' into demo_site
							
							
							
							
							
							
							
							Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb 
							
						 | 
						
							2012-08-22 18:07:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								0333f97bf3
								
							
						 | 
						
							
							
								
								Gallery update..
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								797c9e57b8
								
							
						 | 
						
							
							
								
								Gallery update
							
							
							
							
							
						 | 
						
							2012-08-20 23:14:10 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3c283d1a7a
								
							
						 | 
						
							
							
								
								Set default picture
							
							
							
							
							
							
							
							Fix tags where not in params for index fronted (news and announcement)
Change backend index for news
Home banner link for images and main title 
							
						 | 
						
							2012-08-16 17:24:12 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								c0cac812c5
								
							
						 | 
						
							
							
								
								demo site widget
							
							
							
							
							
						 | 
						
							2012-07-26 16:39:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								a0ad1f59b6
								
							
						 | 
						
							
							
								
								Comment out filename in FIleAssetUploader
							
							
							
							
							
						 | 
						
							2012-05-17 23:34:15 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4467bc5e48
								
							
						 | 
						
							
							
								
								Change Date to DateTime
							
							
							
							
							
							
							
							Fix filename error 
							
						 | 
						
							2012-05-17 09:59:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								84dac1d250
								
							
						 | 
						
							
							
								
								Create FileAssetUploader
							
							
							
							
							
						 | 
						
							2012-05-17 09:30:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								0b0916179f
								
							
						 | 
						
							
							
								
								Change assets
							
							
							
							
							
						 | 
						
							2012-05-16 11:07:11 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								c427e2af14
								
							
						 | 
						
							
							
								
								Page form with drop down. Modifications for Designs
							
							
							
							
							
						 | 
						
							2011-08-25 08:13:38 +08:00 | 
						
					
				
					
						
							
							
								 
								Kaito
							
						 | 
						
							
							
							
							
							
								
							
							
								e0811c14db
								
							
						 | 
						
							
							
								
								adding upload package for design. bugs in
							
							
							
							
							
						 | 
						
							2011-08-11 18:20:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew Fu
							
						 | 
						
							
							
							
							
							
								
							
							
								f73f09ffcf
								
							
						 | 
						
							
							
								
								adding files not commited from previous commit
							
							
							
							
							
						 | 
						
							2011-07-12 16:02:41 +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 |