|  Fu Matthew | 979df9ac80 | daily commit | 2013-01-23 18:51:18 +08:00 | 
				
					
						|  chris | de39bce4ce | Fix the tooltips | 2013-01-11 12:13:16 +08:00 | 
				
					
						|  chris | b90e8efb1f | Fix filter not collapsing Fix icon size for button | 2013-01-11 11:37:11 +08:00 | 
				
					
						|  chris | 41dff814fb | Change icons | 2013-01-09 21:17:50 +08:00 | 
				
					
						|  Fu Matthew | 614b6fde71 | fix wrong html structure for announcement frontend | 2013-01-09 12:13:55 +08:00 | 
				
					
						|  chris | fac4faad6c | Change date picker | 2013-01-09 05:18:16 +08:00 | 
				
					
						|  Rueshyna | f4692182c0 | when mouse move to button of announcement file : image => preview pic, file => type | 2013-01-02 16:34:38 +08:00 | 
				
					
						|  chris | 9937b4ac9b | Fix deleting links and files in bulletin | 2012-12-31 18:03:13 +08:00 | 
				
					
						|  chris | 61b0f94c04 | Remove I18n.locale for announcement front-end Fix counter in back-end edit | 2012-12-28 15:34:04 +08:00 | 
				
					
						|  chris | e8e7c38221 | Changes for announcement widget style 1 and categories | 2012-12-28 14:01:04 +08:00 | 
				
					
						|  chris | 455a27437d | Changes for announcement widget style 2 | 2012-12-28 13:47:30 +08:00 | 
				
					
						|  chris | 751d3b1220 | Announcement widget: remove I18n.locale Add part_id in url | 2012-12-27 16:52:58 +08:00 | 
				
					
						|  Rueshyna | b4633a2ccb | .not_guest_user | 2012-12-19 19:48:13 +08:00 | 
				
					
						|  chris | fcbba6660b | Only one parser for front end Separate site map for i18n | 2012-12-19 17:15:31 +08:00 | 
				
					
						|  Rueshyna | 4a8878132e | add content for announcement rss | 2012-12-06 07:59:42 +08:00 | 
				
					
						|  chris | dc3be3c9a1 | Translation changes | 2012-12-03 23:00:04 +08:00 | 
				
					
						|  chris | 390da0e49a | Change icons | 2012-11-29 00:49:53 +08:00 | 
				
					
						|  Rueshyna | 114ca5493a | replace rss format with json in announcement | 2012-11-28 13:43:48 +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 | 
				
					
						|  chris | fb74d74c72 | Fix: - page_part not including items_helper
  - categories for bulletins front-end | 2012-11-15 18:01:49 +08:00 | 
				
					
						|  chris | 112f7000a0 | Fix announcement front-end bug | 2012-11-15 17:23:24 +08:00 | 
				
					
						|  Rueshyna | 7595e20d0c | fixed language of announcement filter | 2012-11-08 16:01:08 +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 | 
				
					
						|  Rueshyna | c314745545 | add link of title | 2012-11-05 11:42:50 +08:00 | 
				
					
						|  Rueshyna | e4de1e34a2 | add announcement plugin | 2012-11-05 11:42:50 +08:00 | 
				
					
						|  Rueshyna | 9433d59c04 | relpace tab with sapce | 2012-11-05 11:42:49 +08:00 | 
				
					
						|  chris | cc5e238576 | Fix after merge from NCCU, the translations still need to be cleaned | 2012-10-30 11:08:26 +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 | 
				
					
						|  OrbitServer | 9e2bc7e1c1 | Ray's changes in css and js | 2012-10-09 07:48:05 +08:00 | 
				
					
						|  Matt | b65d785834 | harry's fix, announcement still broken | 2012-10-01 17:21:23 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 5634e87144 | fix announcement block | 2012-09-24 18:43:43 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 3a65f599e6 | first version app config for Spen  durning Chris's leave. | 2012-09-24 11:43:48 +08:00 | 
				
					
						|  Christophe Vilayphiou | c846a102ff | Page by page changes for i18n yml | 2012-09-24 09:06: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 | a32027b64b | ray's fix | 2012-09-19 16:34:43 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | c813a6143b | fb share for iNCCU | 2012-09-18 17:31:51 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 6da3928626 | change for NCCU ask | 2012-09-18 15:49:05 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ce47109d33 | change link for rss | 2012-09-18 12:04:45 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 0ecb4eca46 | change for NCCU entry site | 2012-09-18 10:54:11 +08:00 | 
				
					
						|  unknown | 9eed9ec7b6 | demo site plugin | 2012-09-17 13:32:52 +08:00 | 
				
					
						|  Christophe Vilayphiou | 90ae361dc3 | Class change for filter button | 2012-09-13 17:37:17 +08:00 | 
				
					
						|  Christophe Vilayphiou | 2e9af5d1a8 | fix commit bugs | 2012-09-13 15:53:36 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 98e8f5f607 | complete visitor dashbroad | 2012-09-12 16:20:15 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | 45ef7fd302 | guest user | 2012-09-12 16:20:15 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | a20db344f1 | preview for update | 2012-09-10 11:53:59 +08:00 | 
				
					
						|  Fu Matthew | 6044857fea | complete preview for both new and announcement | 2012-09-07 17:55:59 +08:00 | 
				
					
						|  Matthew K. Fu JuYuan | ae1595a008 | view for preview | 2012-09-04 09:24:12 +08:00 |