Christophe Vilayphiou
2d2e01115b
Fix page: take category and tag at the same time
...
With news and announcement views
2012-08-03 01:44:06 +08:00
Christophe Vilayphiou
4127d7f2eb
Fix tags
2012-08-03 01:35:41 +08:00
Christophe Vilayphiou
d2564af001
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-08-01 16:38:35 +08:00
Christophe Vilayphiou
25a911b4f8
Change for page: take category and tag at the same time
2012-08-01 16:33:46 +08:00
Matthew K. Fu JuYuan
acebec8904
don't dislay web links if no eng. lists in widget is now sorted.
2012-08-01 15:24:55 +08:00
Christophe Vilayphiou
c951cc6b6f
Fix for data_migration
2012-08-01 00:58:59 +08:00
Matthew K. Fu JuYuan
b2f28eabaf
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 18:23:01 +08:00
Matthew K. Fu JuYuan
b989f458d3
Do not show news/anc if no context.
2012-07-31 18:22:40 +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
Matthew K. Fu JuYuan
af4865ceb7
Merge branch 'master' of github.com:Rulingcom/NCCU
2012-07-31 11:01:11 +08:00
Matthew K. Fu JuYuan
4dea025c8a
fix for
...
1.Announcement 15 per page
2.Search keywords.
3.Redis search index with new code.
2012-07-31 10:59:48 +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
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
23854e7adc
Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var
...
Conflicts:
app/controllers/pages_controller.rb
app/models/item.rb
app/models/site.rb
config/environments/development.rb
vendor/built_in_modules/announcement/app/models/bulletin.rb
2012-07-27 19:21:39 +08:00
Christophe Vilayphiou
8eec7b4dac
Fix announcement for i18n_variable removal
2012-07-27 19:12:58 +08:00
Christophe Vilayphiou
e2ebd48b22
Remove i18n_variable for announcement
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
unknown
c0cac812c5
demo site widget
2012-07-26 16:39:29 +08:00
Matthew K. Fu JuYuan
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
Christophe Vilayphiou
875fad848c
Fix announcement for i18n_variable removal
2012-07-26 03:29:06 +08:00
Christophe Vilayphiou
b9cf5263f6
Remove i18n_variable for announcement
2012-07-26 02:27:43 +08:00
Matthew K. Fu JuYuan
4768da3c7a
fix announcement loading failed caused by impression. disable pinyin search.
2012-07-25 18:26:05 +08:00
Matthew K. Fu JuYuan
397b444390
fix for bugs
2012-07-24 20:58:34 +08:00
Matthew K. Fu JuYuan
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
unknown
10731dc211
demo widget
2012-07-18 18:07:45 +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
unknown
89446ba796
demo
2012-07-09 16:28:04 +08:00
unknown
fce2762ec3
demo
2012-07-09 16:28:04 +08:00
unknown
1d8e386bde
demo website widget
2012-07-09 16:28:03 +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
4fe92b844e
Add sorting order for NCCU request
2012-07-03 15:47:28 +08:00
Matthew K. Fu JuYuan
c0b3798bad
fix for date for qu menu
2012-06-29 11:41:06 +08:00
Matthew K. Fu JuYuan
f66c3d9c0c
fix bugs.
2012-06-29 11:17:35 +08:00
Matthew K. Fu JuYuan
6c4c1046bc
fix date select cause error back to the time of Jesus
2012-06-28 15:19:51 +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
Matthew K. Fu JuYuan
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增,但可刪除
2.優先處理-編輯中的檔案列表,無法刪除
3.優先處理-刪除時應彈出警告視窗,請user確認一次,再將檔案刪除
2012-06-27 14:21:06 +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
df722ba90f
change display of user dept for showing announcement
2012-06-26 16:21:18 +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
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
11247ce84c
Clean up code , cache other auths. Fix sidebar
2012-05-29 17:17:26 +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
Matthew K. Fu JuYuan
e0260542d3
fix code
2012-05-22 16:11:52 +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
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
Christophe Vilayphiou
f72d0bc7e0
Merge branch 'design_team' into ldap
2012-05-18 10:51:20 +08:00
Christophe Vilayphiou
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +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
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
Christophe Vilayphiou
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
Christophe Vilayphiou
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
Matthew K. Fu JuYuan
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +08:00
Christophe Vilayphiou
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
Christophe Vilayphiou
be7ce0bf45
Redmine change's
2012-05-17 06:25:38 +08:00
Christophe Vilayphiou
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
Christophe Vilayphiou
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
Christophe Vilayphiou
42881553a8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-15 22:48:40 +08:00
Christophe Vilayphiou
5e9b55e08e
Ray took out 'default' tags
2012-05-15 22:47:28 +08:00
Christophe Vilayphiou
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
Christophe Vilayphiou
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +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
ebc8dd33ec
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile.lock
app/controllers/admin/module_apps_controller.rb
app/controllers/application_controller.rb
vendor/built_in_modules/web_resource/web_resource.json
2012-05-14 00:57:17 +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
b804ba4d96
Fix for manager and admin can see all post in announcement. Haven't applied to news
2012-05-14 00:50:36 +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