Commit Graph

164 Commits

Author SHA1 Message Date
Fu Matthew dc8ca7e575 fix i18n.file upload failed 2012-09-27 13:34:40 +08:00
Matthew K. Fu JuYuan 78a01f5d29 fix for 0924 2012-09-24 18:30:19 +08:00
Matt 5f63af4e77 fix for search news,needs to applied to announcement,also need to fix some translation 2012-09-24 18:10:48 +08:00
Matthew K. Fu JuYuan 029c84328d code that can not run on matt's air 2012-09-24 15:37:28 +08:00
Matthew K. Fu JuYuan e5fa86c24a fix i18n for search field 2012-09-24 12:25:43 +08:00
Matthew K. Fu JuYuan 7ca0d2a62b Merge branch 'master' of github.com:Rulingcom/NCCU
Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-09-24 12:20:59 +08:00
Matthew K. Fu JuYuan 136fc68cdc nccu data task 2012-09-24 12:18:40 +08:00
Christophe Vilayphiou b4ff5cea05 Merge branch 'yml' of github.com:Rulingcom/NCCU into yml
Conflicts:
	app/helpers/admin/item_helper.rb
	app/views/admin/ad_banners/_ad_banner_tab.html.erb
	app/views/admin/assets/edit.html.erb
	app/views/admin/assets/file_upload.html.erb
	app/views/admin/assets/new.html.erb
	app/views/admin/attributes/index.html.erb
	app/views/admin/object_auths_new_interface/setting.html.erb
	app/views/admin/page_parts/_edit.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/shared/_privilege_user.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
	vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
	vendor/built_in_modules/news/config/locales/en.yml
	vendor/built_in_modules/news/config/locales/zh_tw.yml
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
2012-09-24 09:19:19 +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
Christophe Vilayphiou a04e1fd10b Hot or top for news home banner 2012-09-24 08:43:10 +08:00
Christophe Vilayphiou 88d562450a Fix home banner for hot news 2012-09-21 15:34:18 +08:00
Matthew K. Fu JuYuan a32027b64b ray's fix 2012-09-19 16:34:43 +08:00
Matthew K. Fu JuYuan 8b68387199 fix share loading failed 2012-09-19 15:09:08 +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
Christophe Vilayphiou 8b2bc207de Changes for i18n yml 2012-09-12 19:12:50 +08:00
Christophe Vilayphiou a579e16109 Change rows for news textarea 2012-09-11 16:41:35 +08:00
Christophe Vilayphiou 73e48aebc6 Change news subtitle to textarea, no tinymce 2012-09-11 15:40:27 +08:00
Matt 71021b8c69 Changes for empty file and link in create and edit for news and announcement + partially fix tinymce 2012-09-11 00:41:52 +08:00
Christophe Vilayphiou b110b22daa Change 熱門 to 頭版 for news 2012-09-10 15:55:06 +08:00
Christophe Vilayphiou 4dfe3e7b3b Change 熱門 to 頭版 for news 2012-09-10 15:19:29 +08:00
Matthew K. Fu JuYuan e12701b34b preview for association object 2012-09-10 14:19:39 +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 671f86b612 First version of new preview. Only plain text 2012-09-04 12:31:27 +08:00
Matthew K. Fu JuYuan ae1595a008 view for preview 2012-09-04 09:24:12 +08:00
chris edf9d8a159 Fix can_display 2012-08-16 18:55:34 +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
Christophe Vilayphiou 96fd89cca3 Fix js for ie in list 2012-08-16 01:09:45 +08:00
Christophe Vilayphiou c5b95e2e0f Fix rss feed i18n 2012-08-15 16:17:28 +08:00
Matthew K. Fu JuYuan d9f6bb3b4e can display scope 2012-08-15 11:34:19 +08:00
Christophe Vilayphiou bcc13a47e6 Fix deadline was set to nil when update 2012-08-14 16:23:34 +08:00
Christophe Vilayphiou efaed060d9 Change for date 2012-08-14 15:11:52 +08:00
Christophe Vilayphiou fb53ad524a Add time to announcement quick edit
Fix picture for news quick edit
Fix tags not saving when empty
Hide role in quick edit
2012-08-14 14:38:21 +08:00
Matthew K. Fu JuYuan 77224bcc8f check deadline for news 2012-08-14 13:49:24 +08:00
Christophe Vilayphiou 9196deb997 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-14 01:00:25 +08:00
Christophe Vilayphiou c32b0dd4b4 Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
Matthew K. Fu JuYuan 6cc470ede9 nccu fix 2012-08-13 18:35:47 +08:00
Matthew K. Fu JuYuan 080974b563 Merge branch 'new_rss'
Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-08-12 23:32:28 +08:00
Matthew K. Fu JuYuan f1b4d9e204 Add authorization for rescue interface
Change logic for NCCU site for status panel.
2012-08-12 23:29:13 +08:00
Christophe Vilayphiou 2bd132cef9 Pass category and tag to search to redirect to the right page
Ray's change for mouseover (take out the black background)
2012-08-09 19:16:26 +08:00
Matthew K. Fu JuYuan 1e7bc9aadd 1.Rss feed but no entry for clicking now. wait for design.
2.Unit link is now fixed.
2012-08-09 17:04:37 +08:00
Matthew K. Fu JuYuan 561d510aa8 rss branch end 2012-08-09 17:04:08 +08:00
Matt 1aea8d91f4 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-08-08 18:16:38 +08:00
Christophe Vilayphiou 0d55a2f76b Hide quick edit 2012-08-08 18:11:03 +08:00
Matt 62ba8c9f18 Fix bugs on 172:180 2012-08-08 17:56:00 +08:00