chris
							
						 | 
						
							
							
							
							
							
								
							
							
								a7d1cdbb75
								
							
						 | 
						
							
							
								
								Fix for link in ad banner
							
							
							
							
							
						 | 
						
							2013-01-11 11:28:13 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								48ce2278d0
								
							
						 | 
						
							
							
								
								Update disable time when separated picker new or reset date
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b49251afee
								
							
						 | 
						
							
							
								
								Date picker separated: reset time when reset date
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1d405c3ffe
								
							
						 | 
						
							
							
								
								Add "tag" icon to orbit bar
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								41dff814fb
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2013-01-09 21:17:50 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								5ab4bbd367
								
							
						 | 
						
							
							
								
								add ad_banner inner page,pic title.
							
							
							
							
							
						 | 
						
							2013-01-09 16:54:33 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								1d80b39dcb
								
							
						 | 
						
							
							
								
								Fix no responding when trying to access front end page
							
							
							
							
							
						 | 
						
							2013-01-09 11:23:18 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								fac4faad6c
								
							
						 | 
						
							
							
								
								Change date picker
							
							
							
							
							
						 | 
						
							2013-01-09 05:18:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								b71ebb3982
								
							
						 | 
						
							
							
								
								clean default widget
							
							
							
							
							
						 | 
						
							2013-01-07 17:20:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								be00cec4d7
								
							
						 | 
						
							
							
								
								Fix link for ad_banner
							
							
							
							
							
							
							
							Add missing helper for web_link_category
Show design's js in front-end 
							
						 | 
						
							2013-01-07 00:36:48 +08:00 | 
						
					
				
					
						
							
							
								 
								nccu
							
						 | 
						
							
							
							
							
							
								
							
							
								ea2d38b23b
								
							
						 | 
						
							
							
								
								Ika's changes for css default widgets
							
							
							
							
							
						 | 
						
							2013-01-04 11:54:58 +08:00 | 
						
					
				
					
						
							
							
								 
								Fu Matthew
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								a7cf6dd694
								
							
						 | 
						
							
							
								
								reverse structure order
							
							
							
							
							
						 | 
						
							2012-12-27 17:54:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								9e07794cbc
								
							
						 | 
						
							
							
								
								soft structure order
							
							
							
							
							
						 | 
						
							2012-12-27 14:37:29 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								81b0e3c38f
								
							
						 | 
						
							
							
								
								change ActiveSupport::SecureRandom to SecureRandom in orbit core
							
							
							
							
							
						 | 
						
							2012-12-27 12:19:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								1289ad9f9d
								
							
						 | 
						
							
							
								
								fixed co-author relation bug....
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								afd8e7e380
								
							
						 | 
						
							
							
								
								when delete co-author relation, the co-author will be reset nil
							
							
							
							
							
						 | 
						
							2012-12-06 07:59:42 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								7822ffc33d
								
							
						 | 
						
							
							
								
								can add relation between co-author
							
							
							
							
							
						 | 
						
							2012-12-04 00:31:06 +08:00 | 
						
					
				
					
						
							
							
								 
								Rueshyna
							
						 | 
						
							
							
							
							
							
								
							
							
								5a9d9151d9
								
							
						 | 
						
							
							
								
								add journal list template
							
							
							
							
							
						 | 
						
							2012-12-04 00:25:58 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								dc3be3c9a1
								
							
						 | 
						
							
							
								
								Translation changes
							
							
							
							
							
						 | 
						
							2012-12-03 23:00:04 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								9c6c622a49
								
							
						 | 
						
							
							
								
								Add missing icons and css for icons in layout
							
							
							
							
							
						 | 
						
							2012-12-03 22:31:00 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								390da0e49a
								
							
						 | 
						
							
							
								
								Change icons
							
							
							
							
							
						 | 
						
							2012-11-29 00:49:53 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								77386f0284
								
							
						 | 
						
							
							
								
								disable data transform when switching attribute field type. new member stable
							
							
							
							
							
						 | 
						
							2012-11-22 21:10:35 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								475642d375
								
							
						 | 
						
							
							
								
								Remove news and fix default_url in ImageUploader
							
							
							
							
							
						 | 
						
							2012-11-22 09:30:25 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								2d0e8b37b2
								
							
						 | 
						
							
							
								
								Fix:
							
							
							
							
							
							
							
							- Widgets for announcement
  - Facebook link
  - AdBanner nav 
							
						 | 
						
							2012-11-21 18:42:14 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								96fe482d50
								
							
						 | 
						
							
							
								
								for openness
							
							
							
							
							
						 | 
						
							2012-11-20 20:20:59 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								2aa9a19deb
								
							
						 | 
						
							
							
								
								complete address field. still have javascript issue for fill back and display address ext fields in modal.
							
							
							
							
							
						 | 
						
							2012-11-20 09:53:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								17988f2fb2
								
							
						 | 
						
							
							
								
								address field and text field convert
							
							
							
							
							
						 | 
						
							2012-11-20 09:53:37 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								a85e5fcc0d
								
							
						 | 
						
							
							
								
								address field. js and style is broken
							
							
							
							
							
						 | 
						
							2012-11-20 09:53:36 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								be448d42c9
								
							
						 | 
						
							
							
								
								add_more ok
							
							
							
							
							
						 | 
						
							2012-11-20 09:52:50 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								43d969a72b
								
							
						 | 
						
							
							
								
								Fix attribute_field_helper and comment admin in I18n
							
							
							
							
							
						 | 
						
							2012-11-06 17:51:42 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								b40d4702d5
								
							
						 | 
						
							
							
								
								Merge branch 'master' into various_bugs
							
							
							
							
							
							
							
							Conflicts:
	config/locales/en.yml
	config/locales/zh_tw.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/back_end/writing_patents/_form.html.erb
	vendor/built_in_modules/personal_patent/app - %BDƻs/views/panel/personal_patent/plugin/writing_patents/_form.html.erb 
							
						 | 
						
							2012-11-06 11:44:00 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								beb843f75b
								
							
						 | 
						
							
							
								
								add new member with role interface. add more not usable.
							
							
							
							
							
							
							
							role management new attribute is ok. delete is ok. 
							
						 | 
						
							2012-11-04 20:42:58 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								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 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								bd0d975014
								
							
						 | 
						
							
							
								
								for user new interface, member  role is working.
							
							
							
							
							
						 | 
						
							2012-10-26 11:27:37 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								d7fd61ce55
								
							
						 | 
						
							
							
								
								Edit uploaded package
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:57 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								0a1a9d2c2e
								
							
						 | 
						
							
							
								
								member for THU
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								cbfa659928
								
							
						 | 
						
							
							
								
								Changes for side_bar
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								8b9cffd4f2
								
							
						 | 
						
							
							
								
								new code for attribute fields and values for new member interface
							
							
							
							
							
						 | 
						
							2012-10-26 11:19:55 +08:00 | 
						
					
				
					
						
							
							
								 
								chris
							
						 | 
						
							
							
							
							
							
								
							
							
								189fa553c5
								
							
						 | 
						
							
							
								
								Changes for helpers, not including all by default
							
							
							
							
							
						 | 
						
							2012-10-09 14:47:16 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								9f825de288
								
							
						 | 
						
							
							
								
								user new interface 70%
							
							
							
							
							
						 | 
						
							2012-10-09 06:40:18 +08:00 | 
						
					
				
					
						
							
							
								 
								unknown
							
						 | 
						
							
							
							
							
							
								
							
							
								975523c8b2
								
							
						 | 
						
							
							
								
								demo site plugin
							
							
							
							
							
						 | 
						
							2012-09-24 14:10:44 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								4fb35b00f2
								
							
						 | 
						
							
							
								
								Add missing translations
							
							
							
							
							
						 | 
						
							2012-09-24 09:02:46 +08:00 | 
						
					
				
					
						
							
							
								 
								Christophe Vilayphiou
							
						 | 
						
							
							
							
							
							
								
							
							
								bdd5a1a047
								
							
						 | 
						
							
							
								
								Changes for i18n yml
							
							
							
							
							
						 | 
						
							2012-09-24 09:02:45 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								1240064e23
								
							
						 | 
						
							
							
								
								add url generate
							
							
							
							
							
						 | 
						
							2012-09-18 17:37:52 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								19db9d0037
								
							
						 | 
						
							
							
								
								basic function
							
							
							
							
							
						 | 
						
							2012-09-17 13:32:52 +08:00 | 
						
					
				
					
						
							
							
								 
								OrbitServer
							
						 | 
						
							
							
							
							
							
								
							
							
								ee51240102
								
							
						 | 
						
							
							
								
								Ray's changes for new backend
							
							
							
							
							
						 | 
						
							2012-09-14 02:38:56 +08:00 | 
						
					
				
					
						
							
							
								 
								Harry Bomrah
							
						 | 
						
							
							
							
							
							
								
							
							
								29ea95b4c6
								
							
						 | 
						
							
							
								
								event_calendar testing
							
							
							
							
							
						 | 
						
							2012-09-13 23:57:47 +08:00 | 
						
					
				
					
						
							
							
								 
								Matthew K. Fu JuYuan
							
						 | 
						
							
							
							
							
							
								
							
							
								17195a9a23
								
							
						 | 
						
							
							
								
								fix for admin has no orbit menu
							
							
							
							
							
						 | 
						
							2012-09-12 16:20:15 +08:00 |