9a63adedde 
								
							 
						 
						
							
							
								
								Remove seminar from conference init  
							
							
							
						 
						
							2013-02-22 11:57:10 +08:00  
				
					
						
							
							
								 
						
							
								d2f837f342 
								
							 
						 
						
							
							
								
								Add task to save pages  
							
							
							
						 
						
							2013-02-19 17:50:46 +08:00  
				
					
						
							
							
								 
						
							
								bc21840262 
								
							 
						 
						
							
							
								
								Comment out delete link for archive category  
							
							... 
							
							
							
							Modify the import:
	- hot_news to announcement
	- iso_zone of 20000 to 21100 
							
						 
						
							2013-02-19 17:49:20 +08:00  
				
					
						
							
							
								 
						
							
								17ac564fbb 
								
							 
						 
						
							
							
								
								Fix sitemap nil  
							
							... 
							
							
							
							Fix namespace of role in subrole 
							
						 
						
							2013-02-19 17:39:43 +08:00  
				
					
						
							
							
								 
						
							
								61648d23e1 
								
							 
						 
						
							
							
								
								Change delete_all to destroy_all  
							
							
							
						 
						
							2013-02-19 17:39:42 +08:00  
				
					
						
							
							
								 
						
							
								7105f103e1 
								
							 
						 
						
							
							
								
								Task to delete settings for old version of default widget  
							
							
							
						 
						
							2013-02-19 17:34:39 +08:00  
				
					
						
							
							
								 
						
							
								0b88f7d1f8 
								
							 
						 
						
							
							
								
								deliver app config. fix wrong value cause error for default widget  
							
							
							
						 
						
							2013-02-19 14:21:54 +08:00  
				
					
						
							
							
								 
						
							
								0a115906f1 
								
							 
						 
						
							
							
								
								fix i18n,reload problems  
							
							
							
						 
						
							2013-02-19 14:21:54 +08:00  
				
					
						
							
							
								 
						
							
								9771d42587 
								
							 
						 
						
							
							
								
								migrate for app config. fix panel style intro misplace  
							
							
							
						 
						
							2013-02-04 18:10:39 +08:00  
				
					
						
							
							
								 
						
							
								bbd30759f5 
								
							 
						 
						
							
							
								
								fix web resource frontend page  
							
							
							
						 
						
							2013-02-04 18:01:42 +08:00  
				
					
						
							
							
								 
						
							
								fc702a6210 
								
							 
						 
						
							
							
								
								add front-end page for web_resource  
							
							
							
						 
						
							2013-01-24 13:54:14 +08:00  
				
					
						
							
							
								 
						
							
								979df9ac80 
								
							 
						 
						
							
							
								
								daily commit  
							
							
							
						 
						
							2013-01-23 18:51:18 +08:00  
				
					
						
							
							
								 
						
							
								46b1d55ff6 
								
							 
						 
						
							
							
								
								Complete new interface  
							
							
							
						 
						
							2013-01-14 18:49:23 +08:00  
				
					
						
							
							
								 
						
							
								5ab4bbd367 
								
							 
						 
						
							
							
								
								add ad_banner inner page,pic title.  
							
							
							
						 
						
							2013-01-09 16:54:33 +08:00  
				
					
						
							
							
								 
						
							
								b71ebb3982 
								
							 
						 
						
							
							
								
								clean default widget  
							
							
							
						 
						
							2013-01-07 17:20:37 +08:00  
				
					
						
							
							
								 
						
							
								5793f0fe5d 
								
							 
						 
						
							
							
								
								default widget link.  
							
							... 
							
							
							
							make sure to run
rake migrate:make_default_widget_work_config
for changing announcement module app 
							
						 
						
							2013-01-07 17:20:37 +08:00  
				
					
						
							
							
								 
						
							
								39f715319b 
								
							 
						 
						
							
							
								
								Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu  
							
							... 
							
							
							
							Conflicts:
	lib/tasks/migrate.rake 
							
						 
						
							2013-01-03 19:41:52 +08:00  
				
					
						
							
							
								 
						
							
								a70110f787 
								
							 
						 
						
							
							
								
								make default widget works without init  
							
							
							
						 
						
							2013-01-03 19:38:14 +08:00  
				
					
						
							
							
								 
						
							
								fa83dbf791 
								
							 
						 
						
							
							
								
								Fix order in structure  
							
							
							
						 
						
							2013-01-03 19:15:08 +08:00  
				
					
						
							
							
								 
						
							
								5d6279a9ea 
								
							 
						 
						
							
							
								
								fix calendar broken  
							
							
							
						 
						
							2013-01-03 10:58:52 +08:00  
				
					
						
							
							
								 
						
							
								641b5310b0 
								
							 
						 
						
							
							
								
								fix NTU album module_app data  
							
							
							
						 
						
							2013-01-02 16:04:11 +08:00  
				
					
						
							
							
								 
						
							
								32c6f17613 
								
							 
						 
						
							
							
								
								fix object auth. show error message if user try to do object auth in a wrong way.  
							
							
							
						 
						
							2013-01-02 14:34:34 +08:00  
				
					
						
							
							
								 
						
							
								baf1240b76 
								
							 
						 
						
							
							
								
								gallery options  
							
							
							
						 
						
							2012-12-28 15:30:46 +08:00  
				
					
						
							
							
								 
						
							
								2d6b70b97f 
								
							 
						 
						
							
							
								
								regenerate pageparts  
							
							
							
						 
						
							2012-12-27 15:50:05 +08:00  
				
					
						
							
							
								 
						
							
								fcbba6660b 
								
							 
						 
						
							
							
								
								Only one parser for front end  
							
							... 
							
							
							
							Separate site map for i18n 
							
						 
						
							2012-12-19 17:15:31 +08:00  
				
					
						
							
							
								 
						
							
								77386f0284 
								
							 
						 
						
							
							
								
								disable data transform when switching attribute field type. new member stable  
							
							
							
						 
						
							2012-11-22 21:10:35 +08:00  
				
					
						
							
							
								 
						
							
								475642d375 
								
							 
						 
						
							
							
								
								Remove news and fix default_url in ImageUploader  
							
							
							
						 
						
							2012-11-22 09:30:25 +08:00  
				
					
						
							
							
								 
						
							
								192e52b5de 
								
							 
						 
						
							
							
								
								Remove middle site  
							
							
							
						 
						
							2012-11-20 10:06:07 +08:00  
				
					
						
							
							
								 
						
							
								eaf465525a 
								
							 
						 
						
							
							
								
								rake update  
							
							
							
						 
						
							2012-11-06 12:35:15 +08:00  
				
					
						
							
							
								 
						
							
								65ac6980c4 
								
							 
						 
						
							
							
								
								Merge branch 'various_bugs' into nccu_master  
							
							... 
							
							
							
							Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb 
							
						 
						
							2012-10-29 16:10:07 +08:00  
				
					
						
							
							
								 
						
							
								bd0d975014 
								
							 
						 
						
							
							
								
								for user new interface, member  role is working.  
							
							
							
						 
						
							2012-10-26 11:27:37 +08:00  
				
					
						
							
							
								 
						
							
								d7fd61ce55 
								
							 
						 
						
							
							
								
								Edit uploaded package  
							
							
							
						 
						
							2012-10-26 11:19:57 +08:00  
				
					
						
							
							
								 
						
							
								38e6d6c2c8 
								
							 
						 
						
							
							
								
								add rake task  
							
							
							
						 
						
							2012-10-16 15:43:31 +08:00  
				
					
						
							
							
								 
						
							
								6dfe10040b 
								
							 
						 
						
							
							
								
								fix object auth without app_auth  
							
							
							
						 
						
							2012-10-16 14:23:44 +08:00  
				
					
						
							
							
								 
						
							
								d027cf8e6a 
								
							 
						 
						
							
							
								
								add new data from NCCU  
							
							
							
						 
						
							2012-10-09 14:40:28 +08:00  
				
					
						
							
							
								 
						
							
								9f825de288 
								
							 
						 
						
							
							
								
								user new interface 70%  
							
							
							
						 
						
							2012-10-09 06:40:18 +08:00  
				
					
						
							
							
								 
						
							
								89b1aace8a 
								
							 
						 
						
							
							
								
								fix for rescue job failed on 171  
							
							
							
						 
						
							2012-10-08 16:42:49 +08:00  
				
					
						
							
							
								 
						
							
								4a5fc47c0a 
								
							 
						 
						
							
							
								
								NCCU maintenance rake task  
							
							
							
						 
						
							2012-10-08 10:35:11 +08:00  
				
					
						
							
							
								 
						
							
								54b874b2c9 
								
							 
						 
						
							
							
								
								fix nccu login  
							
							
							
						 
						
							2012-09-25 15:07:07 +08:00  
				
					
						
							
							
								 
						
							
								87e2510d02 
								
							 
						 
						
							
							
								
								add rake task for rebuild index  
							
							
							
						 
						
							2012-09-24 18:46:38 +08:00  
				
					
						
							
							
								 
						
							
								19db9d0037 
								
							 
						 
						
							
							
								
								basic function  
							
							
							
						 
						
							2012-09-17 13:32:52 +08:00  
				
					
						
							
							
								 
						
							
								df6c7afd68 
								
							 
						 
						
							
							
								
								add data_migration for rename field for attribute_field. not yet tested  
							
							
							
						 
						
							2012-09-14 00:02:22 +08:00  
				
					
						
							
							
								 
						
							
								5fb94f644d 
								
							 
						 
						
							
							
								
								break down Ray's HTML  
							
							
							
						 
						
							2012-09-14 00:02:22 +08:00  
				
					
						
							
							
								 
						
							
								0a3a140b18 
								
							 
						 
						
							
							
								
								Fix migration bug  
							
							
							
						 
						
							2012-09-11 16:32:20 +08:00  
				
					
						
							
							
								 
						
							
								73e48aebc6 
								
							 
						 
						
							
							
								
								Change news subtitle to textarea, no tinymce  
							
							
							
						 
						
							2012-09-11 15:40:27 +08:00  
				
					
						
							
							
								 
						
							
								e8317e0a4b 
								
							 
						 
						
							
							
								
								1.Remove category column when category is specified  
							
							... 
							
							
							
							2.Showing category if not in category browsing
3.Redirect to home and show error if app page is not available for user language
4.Showing no context to display if object has no language for it.
5.Browse new and announcement by unit is now applicable. 
							
						 
						
							2012-08-08 14:46:08 +08:00  
				
					
						
							
							
								 
						
							
								06919e76ed 
								
							 
						 
						
							
							
								
								fix approval at news and announcement for abnormal flags that causing search result fault.  
							
							
							
						 
						
							2012-08-08 11:01:50 +08:00  
				
					
						
							
							
								 
						
							
								1cdc0e24bd 
								
							 
						 
						
							
							
								
								First version of Solr search.  
							
							
							
						 
						
							2012-08-08 10:59:55 +08:00  
				
					
						
							
							
								 
						
							
								acebec8904 
								
							 
						 
						
							
							
								
								don't dislay web links if no eng. lists in widget is now sorted.  
							
							
							
						 
						
							2012-08-01 15:24:55 +08:00  
				
					
						
							
							
								 
						
							
								f092aff9e9 
								
							 
						 
						
							
							
								
								Fix for data_migration but there's still a bug with red is, the red is code has to be commented out to run the rake task  
							
							
							
						 
						
							2012-08-01 02:43:06 +08:00