Commit Graph

136 Commits

Author SHA1 Message Date
Christophe Vilayphiou f3ccbce5c8 Put back impressions for new and bulletin.
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
Matthew K. Fu JuYuan bb154f5be6 fix error when creating bulletin and news 2012-07-30 16:38:02 +08:00
Matthew K. Fu JuYuan 4e1a91ed90 Merge branch 'changing_tag'
Conflicts:
	vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
Matthew K. Fu JuYuan effad63c92 make sure no pending news or announcement will be searched out 2012-07-30 14:39:40 +08:00
Matthew K. Fu JuYuan 946ec9306f first version of tag cloud. 2012-07-30 11:59:20 +08:00
Christophe Vilayphiou afa4b7dcb3 Remove cache 2012-07-28 16:06:44 +08:00
Christophe Vilayphiou 61c1af7316 Remove i18n_variable for news 2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan d589a1b522 fix for 標題後台為「校園新聞」,前台顯示為「新聞」 該頁面為列表,最上方卻出現「搜尋結果」? from Mr.張 2012-07-27 07:42:00 +08:00
Matthew K. Fu JuYuan fb1f08327d fix redis search limit for 10 items 2012-07-26 12:12:43 +08:00
Matthew K. Fu JuYuan 25f4e292e6 add not found for no result 2012-07-25 13:58:09 +08:00
Matthew K. Fu JuYuan 98fd9223a8 open search for news 2012-07-25 10:42:55 +08:00
Matthew K. Fu JuYuan f9bdb4a327 New and Announcement search. Disabled impression. 2012-07-20 15:47:40 +08:00
Matthew K. Fu JuYuan 033667f99b fix for missing disable category at frontend and widget 2012-07-17 11:26:50 +08:00
Matthew K. Fu JuYuan a4b1681d39 fix rejection for announcement and news. 2012-07-17 10:21:46 +08:00
Matthew K. Fu JuYuan 4daf36908c working cache 2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan 85d6bbe1c9 add i18n variable. fix web_links for disable category 2012-07-11 17:56:31 +08:00
Matthew K. Fu JuYuan ca2c056a07 fix for not displaying bulletin at fronted when it's parent category is disable 2012-07-11 17:17:44 +08:00
Matthew K. Fu JuYuan 773371e885 fix from messy search 2012-07-09 16:48:23 +08:00
Matthew K. Fu JuYuan 09d46f2f75 NCCU 上傳版本 0709
Merge branch 'nccu0621'

Conflicts:
	Gemfile
	config/resque.god
	vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb
2012-07-09 16:02:59 +08:00
Matthew K. Fu JuYuan 49862e70f9 hide category at front end 2012-07-09 12:05:21 +08:00
Matthew K. Fu JuYuan 56caf4b34e category disable for backend 2012-07-06 18:11:55 +08:00
Matthew K. Fu JuYuan c5fdff764e orbit disable object for categories 2012-07-05 16:00:45 +08:00
Matthew K. Fu JuYuan 58a11ff569 fix javascript for new and anc link removing 2012-06-28 13:50:11 +08:00
Matthew K. Fu JuYuan 243c9e2946 fix relation between bulletin and category (news also) 2012-06-27 15:16:16 +08:00
Christophe Vilayphiou 4c4929c20a Fix js for news quick_edit and edit for files 2012-06-27 11:36:18 +08:00
Matthew K. Fu JuYuan 6a4abc6c43 fix news error 2012-06-27 09:59:32 +08:00
Matthew K. Fu JuYuan 83a72bdf6e fix for announcement 2012-06-26 18:23:44 +08:00
Matthew K. Fu JuYuan 818c58c1ee fix for 新聞與公告QA
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位
2012-06-26 17:46:02 +08:00
Matthew K. Fu JuYuan 2b54067ecb change order of display menu of categories of news_bulletin and bulletin. 2012-06-26 14:28:21 +08:00
Matthew K. Fu JuYuan ffd95ee1fd fix
新聞與公告QA-權限設定--優先處理3.一般發佈新聞&公告人,應該只能看到自己發佈的新聞&公告,但是目前可以看到全部,而且可以刪除其他人的公告.至少要不能刪除別人的公告
新聞與公告QA-編輯問題-發佈新聞時,發佈單位預設為請選擇
新聞與公告QA-編輯問題-公告模組請移除 Subtitle 欄位
put rb-readline only in Linux
make app_manager destroy after user deletion.   may need to run:
 AppManager.all.collect{|am|  am if am.user.nil? }.delete_if {|x| x == nil}.each{|am| am.destroy}
for clean up DB.
2012-06-25 16:23:16 +08:00
Matthew K. Fu JuYuan 3f95fe4f13 tmp commit for search. start nccu0621 first 2012-06-22 11:34:10 +08:00
Matthew K. Fu JuYuan cb17fe0825 Search sold edition,rake sunspot:solr:run. NewsBulletin.solr_search,NewsBulletin.solr_reindex. Not working 2012-06-20 14:50:51 +08:00
Matthew K. Fu JuYuan 8dd1ab32c1 Add this toolbar, and nccu calendar fix 2012-06-04 16:51:29 +08:00
Matthew K. Fu JuYuan 4f484599b7 Clean up code , cache other auths. Fix sidebar 2012-05-29 15:23:50 +08:00
Christophe Vilayphiou a663231c8c Merge branch 'design_team' into ldap 2012-05-25 10:01:41 +08:00
Christophe Vilayphiou 75b67dddf5 Fix date bugs 2012-05-25 09:59:39 +08:00
Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap 2012-05-23 12:11:38 +08:00
Christophe Vilayphiou 7c44e94285 Order list by created_at desc
Add best image size in news new
2012-05-23 11:46:19 +08:00
Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap
Conflicts:
	vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
2012-05-22 20:33:07 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Matthew K. Fu JuYuan e0260542d3 fix code 2012-05-22 16:11:52 +08:00
Matthew K. Fu JuYuan 99bcdf6e1e clean up unless code 2012-05-22 14:59:54 +08:00
Matthew K. Fu JuYuan 79f67208fa js for preventing user do stupid things durning ajax 2012-05-22 14:59:54 +08:00
Christophe Vilayphiou 27cf99462e Fix bug in page and news 2012-05-22 14:42:19 +08:00
Christophe Vilayphiou db410b9c50 Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-18 19:44:18 +08:00
Christophe Vilayphiou 4d33c7a56d Changes for dat and time format
Impression bug when some i18n missing in impressionable object
JS bug in ad_banner edit title
2012-05-18 19:42:36 +08:00
Matthew K. Fu JuYuan 661fcafe70 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into design_team
Conflicts:
	vendor/built_in_modules/news/app/helpers/panel/news/back_end/news_bulletins_helper.rb
2012-05-18 18:50:10 +08:00
Matthew K. Fu JuYuan 6ce6577e83 fix news approve and preview 2012-05-18 18:47:18 +08:00
Matt 6a022c90da Changes on nccu 2012-05-18 15:20:45 +08:00
Christophe Vilayphiou d9c12ea5a4 Proof authed_users for case when no category 2012-05-18 10:50:51 +08:00
Christophe Vilayphiou 8ad7f70822 Proof i18n_variable for categories 2012-05-18 10:28:28 +08:00
Christophe Vilayphiou 4467bc5e48 Change Date to DateTime
Fix filename error
2012-05-17 09:59:49 +08:00
Christophe Vilayphiou be7ce0bf45 Redmine change's 2012-05-17 06:25:38 +08:00
Christophe Vilayphiou e54f4409fb Add impressionist 2012-05-15 21:26:09 +08:00
Matthew K. Fu JuYuan 9ba4c2cf2f Change to apply page to had object_auth 2012-05-14 12:40:50 +08:00
Christophe Vilayphiou 039e837fff Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
Conflicts:
	app/views/admin/object_auths_new_interface/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_category_setting/_modal_list.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_category_setting/setting.html.erb
2012-05-14 00:51:53 +08:00
Matthew K. Fu JuYuan 7a6d30ad62 Remove unless files and change routes. 2012-05-14 00:50:36 +08:00
Matthew K. Fu JuYuan 0119ab1a74 New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
Matthew K. Fu JuYuan 8b42c595b3 Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-14 00:49:22 +08:00
Christophe Vilayphiou 62e9a772f6 Fix titles for widgets
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou 4ae8299949 Add custom title to widgets
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou 281cfa6518 Changes for widgets 2012-05-13 21:55:39 +08:00
Matthew K. Fu JuYuan 0a34f0277e Remove unless files and change routes. 2012-05-11 16:46:36 +08:00
Matthew K. Fu JuYuan 20a1a6e30f New Interface for App Auth and Object Auth 2012-05-11 16:44:40 +08:00
Matthew K. Fu JuYuan 4f1e47bb82 Don't display admin in any premission select. Fix not necessary header for UT data 2012-05-10 14:43:05 +08:00
Christophe Vilayphiou bc5e975fab Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-10 00:29:22 +08:00
Christophe Vilayphiou 13587306bc Add list widgets for announcement, news and links with categories and tags 2012-05-10 00:25:30 +08:00
Christophe Vilayphiou 6727f27181 Change for 0509 Nccu check 2012-05-09 16:58:12 +08:00
Matthew K. Fu JuYuan 9a6b66c57d Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-09 15:54:59 +08:00
Matthew K. Fu JuYuan 93946c37f4 fix wrong link 2012-05-09 15:54:00 +08:00
Matthew K. Fu JuYuan a9c241658a Repeat code for news module 2012-05-09 15:28:02 +08:00
Matthew K. Fu JuYuan 618e4f4047 Repeat code for news module 2012-05-09 15:22:15 +08:00
Christophe Vilayphiou 50edfdd02f Changes for tag key in side_bar announcement and news, fix ad_banner css for dot 2012-05-09 14:59:06 +08:00
Christophe Vilayphiou 9ead6cafda Ray's changes 2012-05-09 04:15:02 +08:00
Christophe Vilayphiou 55bfaea43e Can show announcement and news list by tag's key 2012-05-08 17:27:42 +08:00
Christophe Vilayphiou caba8ce7a4 Add nccu icon
Change news list in front-end
Hide links and files in news and announcement front-end show when nothing
2012-05-08 15:27:43 +08:00
Christophe Vilayphiou ba4385e3fd Add module authorization for news
Add files and links to announcement and news
Change page.children into page.ordered_and_visible_children in parser_commom
2012-05-08 10:50:09 +08:00
Christophe Vilayphiou 2aaff21000 Add missing class in widget news_bulletin/index 2012-05-07 23:23:17 +08:00
Christophe Vilayphiou 4c7a3842d6 Add drop_down to news_bulletin widget index for categories 2012-05-07 15:58:52 +08:00
Christophe Vilayphiou 48f8fbde7f Fix site_locale_default_head and active for current locale 2012-05-07 00:53:52 +08:00
Christophe Vilayphiou f190ce18ee Put sorting in web_link, page_context and design 2012-05-05 21:20:20 +08:00
Christophe Vilayphiou b48099d752 Fix bug in is_admin?
Fix bug in helpers for news and announcement
2012-05-05 17:40:07 +08:00
Christophe Vilayphiou 8e6fd277c2 Fix bug: preview was always true 2012-05-04 19:02:40 +08:00
Christophe Vilayphiou e9b337a385 Copy changes into news after merge 2012-05-04 18:49:07 +08:00
Christophe Vilayphiou 92a53c1b27 Ray's fix 2012-05-02 16:20:59 +08:00
Christophe Vilayphiou b8f52fa1ec Separate announcement and news 2012-04-30 06:31:46 +08:00