chris
							
						 | 
						
							
							
							
							
							
								
							
							
								42d0afe65c
								
							
						 | 
						
							
							
								
								Page form with front end style
							
							
							
							
							
						 | 
						
							2013-10-28 16:29:23 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								2f41828abd
								
							
						 | 
						
							
							
								
								Rake task fix args
							
							
							
							
							
						 | 
						
							2013-10-28 12:17:12 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								f396493e44
								
							
						 | 
						
							
							
								
								Updated rake task to accept right attrbites and generate site
							
							
							
							
							
						 | 
						
							2013-10-28 11:54:14 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f3b3c94b42
								
							
						 | 
						
							
							
								
								Item control iframe dom
							
							
							
							
							
							
							
							Css for preview 
							
						 | 
						
							2013-10-26 18:58:53 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								13da6fc6a1
								
							
						 | 
						
							
							
								
								Added a new rake task with arguments
							
							
							
							
							
						 | 
						
							2013-10-25 21:59:03 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								254f926093
								
							
						 | 
						
							
							
								
								fix new ui announcement preview
							
							
							
							
							
						 | 
						
							2013-10-24 15:03:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								3a3f913ae6
								
							
						 | 
						
							
							
								
								Put back old js
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8ebfac2b99
								
							
						 | 
						
							
							
								
								Structure link with json
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:40 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a4d1c68299
								
							
						 | 
						
							
							
								
								Structure page with json
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:35 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								6d5f1a2f12
								
							
						 | 
						
							
							
								
								Fix in js and css for pageslide and ad_banner
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:30 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								94c1d7d5a0
								
							
						 | 
						
							
							
								
								Fix homepage in structure, ajaxStop for structure edit, setForm in pageslide.js
							
							
							
							
							
						 | 
						
							2013-10-23 18:39:21 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								52fa11a429
								
							
						 | 
						
							
							
								
								Fix filemanager delete url path
							
							
							
							
							
						 | 
						
							2013-10-23 10:42:54 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								0a69bbb653
								
							
						 | 
						
							
							
								
								Updated Favicon display and wording
							
							
							
							
							
						 | 
						
							2013-10-22 10:34:10 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								11ef2a13d6
								
							
						 | 
						
							
							
								
								Updated Site preference with Remove Image functionality for orbit bar
							
							
							
							
							
						 | 
						
							2013-10-21 18:45:49 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								cf89ed108a
								
							
						 | 
						
							
							
								
								Fixed Site Preferences Language
							
							
							
							
							
						 | 
						
							2013-10-21 17:46:29 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e42cf8720e
								
							
						 | 
						
							
							
								
								Updated Site Preferences with language fix
							
							
							
							
							
						 | 
						
							2013-10-21 16:53:11 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								ace582be0c
								
							
						 | 
						
							
							
								
								fix new ui survey module authorization
							
							
							
							
							
						 | 
						
							2013-10-21 16:52:32 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								c76adc1896
								
							
						 | 
						
							
							
								
								new ui member account privilege fix
							
							
							
							
							
						 | 
						
							2013-10-21 10:42:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f9f2232259
								
							
						 | 
						
							
							
								
								Add setForm and resetForm to pageslide.js
							
							
							
							
							
							
							
							Category, AdBanner and Tag are using js to load the values in the form 
							
						 | 
						
							2013-10-21 06:34:55 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								8e168b0fe1
								
							
						 | 
						
							
							
								
								Remove erro-cover on close and loadComplete
							
							
							
							
							
						 | 
						
							2013-10-20 21:16:17 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								606ac05563
								
							
						 | 
						
							
							
								
								Pageslide fix for error message and focused element
							
							
							
							
							
						 | 
						
							2013-10-20 20:54:23 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								4403ca3504
								
							
						 | 
						
							
							
								
								Add timeout before running script on window load
							
							
							
							
							
						 | 
						
							2013-10-20 19:13:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a9343e9a82
								
							
						 | 
						
							
							
								
								Fix new_ui:save_pages
							
							
							
							
							
						 | 
						
							2013-10-20 19:05:19 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2530dace02
								
							
						 | 
						
							
							
								
								Change the parser_front_end to be used in the structure for page edit, new_ui:save_pages must be run
							
							
							
							
							
						 | 
						
							2013-10-20 18:44:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1ea8d9faf9
								
							
						 | 
						
							
							
								
								Fix typo for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-20 16:31:34 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9f5bce9351
								
							
						 | 
						
							
							
								
								Review of the uploaders
							
							
							
							
							
							
							
							Rake task to recreate version: uploader:recreate or uploader:recreate name1 name2 ... 
							
						 | 
						
							2013-10-20 16:07:20 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cce8f1be9b
								
							
						 | 
						
							
							
								
								Add migration task for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 20:20:40 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1d32552b51
								
							
						 | 
						
							
							
								
								Add missing effect to banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:54:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9e74d6d47b
								
							
						 | 
						
							
							
								
								Add missing js and css for mobile and fix ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:35:33 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7353b48212
								
							
						 | 
						
							
							
								
								Finalize ad_banner changes: front-end, back-end, mobile
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:59 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fea86ba3a9
								
							
						 | 
						
							
							
								
								Page slide does not reload from server for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:24 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								92d2af13f2
								
							
						 | 
						
							
							
								
								changes for ad_banner
							
							
							
							
							
						 | 
						
							2013-10-19 19:17:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								19bf2f2be5
								
							
						 | 
						
							
							
								
								Modify "can_display" to add "postdate" and "deadline"
							
							
							
							
							
						 | 
						
							2013-10-19 19:14:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								68a379f8a4
								
							
						 | 
						
							
							
								
								Some fixes for tags: authorization, translation…
							
							
							
							
							
							
							
							can_use now takes all the open_for into account 
							
						 | 
						
							2013-10-19 19:14:31 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d2602a3a84
								
							
						 | 
						
							
							
								
								Change code for new page slide.js
							
							
							
							
							
							
							
							Conflicts:
	app/views/admin/pages/_form.html.erb 
							
						 | 
						
							2013-10-19 19:14:14 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								f694134150
								
							
						 | 
						
							
							
								
								Remove useless code
							
							
							
							
							
							
							
							Add data-title 
							
						 | 
						
							2013-10-19 19:14:07 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								00e9a5df5b
								
							
						 | 
						
							
							
								
								new ui member settings account data
							
							
							
							
							
							
							
							Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb 
							
						 | 
						
							2013-10-18 22:28:27 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								32c1defba0
								
							
						 | 
						
							
							
								
								Updated Site Preferences Templates
							
							
							
							
							
						 | 
						
							2013-10-18 20:03:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								14d2b0cc76
								
							
						 | 
						
							
							
								
								fix new ui member account privilege
							
							
							
							
							
						 | 
						
							2013-10-18 19:52:36 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								e453efeb6b
								
							
						 | 
						
							
							
								
								Revert "add ntu_ga survey init sorting"
							
							
							
							
							
							
							
							This reverts commit 9076d5496a. 
							
						 | 
						
							2013-10-18 19:51:16 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								3e491380cd
								
							
						 | 
						
							
							
								
								Revert "new ui member settings account data"
							
							
							
							
							
							
							
							This reverts commit e1f4ee464b. 
							
						 | 
						
							2013-10-18 19:51:02 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								e1f4ee464b
								
							
						 | 
						
							
							
								
								new ui member settings account data
							
							
							
							
							
						 | 
						
							2013-10-18 19:12:27 +08:00 | 
						
					
				
					
						
							
							
								 
								Spen
							
						 | 
						
							
							
							
							
							
								
							
							
								9076d5496a
								
							
						 | 
						
							
							
								
								add ntu_ga survey init sorting
							
							
							
							
							
						 | 
						
							2013-10-18 19:10:22 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								14fea3638f
								
							
						 | 
						
							
							
								
								Updated with some locale fixes in site preferences
							
							
							
							
							
						 | 
						
							2013-10-18 15:26:41 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								7b1b1fa2d3
								
							
						 | 
						
							
							
								
								Fix bug in open_for, it now takes all the open_for into account
							
							
							
							
							
							
							
							Add open_for_user 
							
						 | 
						
							2013-10-17 14:20:49 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								a67be030c5
								
							
						 | 
						
							
							
								
								Fix JS Path
							
							
							
							
							
						 | 
						
							2013-10-17 11:21:46 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a76164465e
								
							
						 | 
						
							
							
								
								Fix editing a tag module
							
							
							
							
							
						 | 
						
							2013-10-16 23:34:51 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								d2459f42c0
								
							
						 | 
						
							
							
								
								Added Favicon and default image for orbitbar
							
							
							
							
							
						 | 
						
							2013-10-16 18:50:22 +08:00 | 
						
					
				
					
						
							
							
								 
								saurabhbhatia
							
						 | 
						
							
							
							
							
							
								
							
							
								155039ac16
								
							
						 | 
						
							
							
								
								Updated fixes for site info - desktop openess, title always displayed
							
							
							
							
							
						 | 
						
							2013-10-16 18:33:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Manson Wang
							
						 | 
						
							
							
							
							
							
								
							
							
								2bcecc322e
								
							
						 | 
						
							
							
								
								Update Ad_Banner for new jQuery
							
							
							
							
							
							
							
							Removed loading module.js in module_widget.html.erb 
							
						 | 
						
							2013-10-16 12:28:21 +08:00 |