Commit Graph

774 Commits

Author SHA1 Message Date
Christophe Vilayphiou df9a1e8057 Fix typo 2012-08-01 17:11:37 +08:00
Christophe Vilayphiou f917adcdf3 Fix typo 2012-08-01 17:09:00 +08:00
Christophe Vilayphiou 0d048de33f Fix link in sitemap 2012-08-01 17:08:07 +08:00
Christophe Vilayphiou 83acb78966 path instead of url 2012-08-01 17:05:34 +08:00
Christophe Vilayphiou 410dfe62e8 Fix typo 2012-08-01 17:03:39 +08:00
Christophe Vilayphiou 02ade108d0 Fix typo 2012-08-01 16:59:11 +08:00
Christophe Vilayphiou 4df4274629 Add links to frontend_sitemap 2012-08-01 16:38:07 +08:00
Christophe Vilayphiou 25a911b4f8 Change for page: take category and tag at the same time 2012-08-01 16:33:46 +08:00
Christophe Vilayphiou 0078c97b19 Merge branch 'master' of github.com:Rulingcom/NCCU 2012-07-31 14:27:44 +08:00
Christophe Vilayphiou 9f859b903d Add custom validator and fix .html_safe with rescue 2012-07-31 14:25:46 +08:00
Matthew K. Fu JuYuan 7e3b59c09a finished tag clouds 2012-07-31 11:57:32 +08:00
Christophe Vilayphiou ecb75fd085 Fix typo 2012-07-30 18:37:20 +08:00
Christophe Vilayphiou 39b63a970c Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
Christophe Vilayphiou f3ccbce5c8 Put back impressions for new and bulletin.
Add view_count field to tag.
2012-07-30 17:57:55 +08:00
Christophe Vilayphiou 7440727acd Fix: "._type" to ".class" 2012-07-30 17:21:37 +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 946ec9306f first version of tag cloud. 2012-07-30 11:59:20 +08:00
Christophe Vilayphiou a6a8fe3d64 Remove remaining 18n_variables 2012-07-27 19:37:25 +08:00
Matthew K. Fu JuYuan a657a7d615 remove cache 2012-07-27 19:14:24 +08:00
Christophe Vilayphiou a8cc581279 Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
Christophe Vilayphiou 934b515914 Sitemap with main 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 38804bd118 Add disable for main title 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou db9c4c0e10 Partial sitemap 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 12f9f666eb Fix bugs after i18n_variable removal 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 804695749d Fix bugs after removal of i18n_variable 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 53cae0a9ee Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou 49dd3a1770 Remove i18n_variable for controllers, helpers and models 2012-07-27 19:13:39 +08:00
Christophe Vilayphiou e2ebd48b22 Remove i18n_variable for announcement 2012-07-27 19:12:58 +08:00
Matthew K. Fu JuYuan de831f1f96 disable homepage cache for english page 2012-07-27 05:08:24 +08:00
Matthew K. Fu JuYuan 87549d4e1f fix for nil value 2012-07-25 17:49:16 +08:00
Matthew K. Fu JuYuan 13ec25ed10 fix for orbit bar broken 2012-07-25 17:44:50 +08:00
Matthew K. Fu JuYuan 97b4eee798 full site search with google 2012-07-25 17:20:25 +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 2ae6b54a45 fix for not working cache 2012-07-13 18:32:17 +08:00
Matthew K. Fu JuYuan 4daf36908c working cache 2012-07-13 15:36:10 +08:00
Matthew K. Fu JuYuan 0e65e379b0 cache first commit 2012-07-12 11:47:24 +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 ae2cbb728e archive for announcement 2012-07-04 17:36:51 +08:00
Matthew K. Fu JuYuan f7107936d0 fix for checking @rulingcom.com 2012-07-03 18:21:48 +08:00
Matthew K. Fu JuYuan 9607b5bbfd rulingcom帳號不透過LDAP認證 2012-07-03 18:12:44 +08:00
Matthew K. Fu JuYuan d0632b2e4c change name format 2012-07-03 16:05:19 +08:00
Matthew K. Fu JuYuan 56ecf9c69b remove remember for nccu 2012-07-03 15:59:25 +08:00
Matthew K. Fu JuYuan 4014f8ee47 fix over queue at resque 2012-07-03 10:51:26 +08:00
Matthew K. Fu JuYuan 04a23db745 fix invalid invalid byte sequence in US-ASCII for js files 2012-06-27 14:27:27 +08:00
Matthew K. Fu JuYuan 55449efb35 fix 新聞與公告QA
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
	2.優先處理-編輯中的檔案列表,無法刪除
	3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
2012-06-27 14:21:06 +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 818c58c1ee fix for 新聞與公告QA
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時,圖片無法正常顯示(但是可以正常被編輯調整並於前台顯示)
	2.add  上傳檔案大小限制: 3MB
	3.公告的發佈單位為何是顯示單位代碼:M00?應顯示發布單位
2012-06-26 17:46:02 +08:00
Matthew K. Fu JuYuan 56b1bd9eaa add translation 2012-06-26 10:57:51 +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 a36f73bafc fix 0621 Trello:"171 頁面管理不能使用" 2012-06-22 18:19:40 +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 2f500ff460 For non-login user,show no drop down menu and return to home after press orbit button. 2012-05-29 16:33:38 +08:00
Matthew K. Fu JuYuan 4f484599b7 Clean up code , cache other auths. Fix sidebar 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan ff620b41aa add script for cache user 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan 6f0cf0e92e cache privilege user list. 2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan 3480fa2545 Fix login and label. Check sync jobs and update info function. 2012-05-24 17:01:00 +08:00
Christophe Vilayphiou c062b43069 Merge branch 'design_team' into ldap 2012-05-23 12:11:38 +08:00
Christophe Vilayphiou 71d4241a2f Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-23 12:11:26 +08:00
Christophe Vilayphiou 006b84f6a1 Ray's fix for ie 2012-05-23 12:06:09 +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 eab82269c1 Remove seconds from date display 2012-05-22 20:19:04 +08:00
Christophe Vilayphiou d6b92fc604 Fixed bugs for nccu 2012-05-22 20:00:07 +08:00
Christophe Vilayphiou 11a371cbb9 Fix destroy in structure
Fix sorting
2012-05-22 17:55:45 +08:00
Christophe Vilayphiou 541aa5831e JS changes to load drag and drop 2012-05-22 17:37:15 +08:00
Christophe Vilayphiou 874a89d99b Ray's fix for structure side_bar 2012-05-22 16:48:57 +08:00
Christophe Vilayphiou d0b030c47d Put inc/ajax_setting in new_admin
Fix callback for link on save
2012-05-22 16:11:00 +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 5e9836f371 Changes for structure 2012-05-22 14:45:49 +08:00
Christophe Vilayphiou aa114568c4 Move design to site_settings side_bar 2012-05-21 18:20:39 +08:00
Christophe Vilayphiou c4d7079059 Fix's Matt code for not showing bulletins in index 2012-05-21 18:10:03 +08:00
Christophe Vilayphiou 815e6a8361 Fix matt's code and add it to filters 2012-05-19 03:19:55 +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
Matthew K. Fu JuYuan 5f6696a358 fix view for different_user for ad_banner. add field 'best size' for ad_banner within form 2012-05-18 14:19:13 +08:00
Christophe Vilayphiou 7c6b807170 Change impression count to exclude when :referrer is nil 2012-05-18 14:13:11 +08:00
Christophe Vilayphiou a4afd5c1d3 Merge branch 'design_team' into ldap 2012-05-18 10:36:32 +08:00
Christophe Vilayphiou 8ad7f70822 Proof i18n_variable for categories 2012-05-18 10:28:28 +08:00
Christophe Vilayphiou 17b6a70506 Merge branch 'design_team' into ldap 2012-05-17 23:36:24 +08:00
Matthew K. Fu JuYuan 16ada34585 fix ad_banner. new ad_image with best size from ad_banner. content editable at tab 2012-05-17 23:35:46 +08:00
Christophe Vilayphiou 5d5e798b1a Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team 2012-05-17 23:35:14 +08:00
Christophe Vilayphiou a0ad1f59b6 Comment out filename in FIleAssetUploader 2012-05-17 23:34:15 +08:00
Harry Bomrah 1b1c2c0032 image title and description callback fixed… 2012-05-17 20:19:31 +08:00
Christophe Vilayphiou 60988f97fb Merge branch 'design_team' into ldap 2012-05-17 19:41:24 +08:00
Christophe Vilayphiou 2f7d561310 Put back I18n for file_upload 2012-05-17 19:40:30 +08:00
Christophe Vilayphiou 25de941df7 Merge branch 'design_team' into ldap 2012-05-17 19:10:22 +08:00
Christophe Vilayphiou 606050627e Remove I18n for file_upload html 2012-05-17 19:09:52 +08:00
Christophe Vilayphiou 698c750cd7 Merge branch 'design_team' into ldap 2012-05-17 18:37:56 +08:00
Christophe Vilayphiou 27fd2d0714 Hide assets links from side_bar 2012-05-17 18:37:46 +08:00