7e3b59c09a
finished tag clouds
2012-07-31 11:57:32 +08:00
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
4e1a91ed90
Merge branch 'changing_tag'
...
Conflicts:
vendor/built_in_modules/news/app/models/news_tag.rb
2012-07-30 14:43:53 +08:00
946ec9306f
first version of tag cloud.
2012-07-30 11:59:20 +08:00
8eec7b4dac
Fix announcement for i18n_variable removal
2012-07-27 19:12:58 +08:00
e2ebd48b22
Remove i18n_variable for announcement
2012-07-27 19:12:58 +08:00
d589a1b522
fix for 標題後台為「校園新聞」，前台顯示為「新聞」 該頁面為列表，最上方卻出現「搜尋結果」？ from Mr.張
2012-07-27 07:42:00 +08:00
fb1f08327d
fix redis search limit for 10 items
2012-07-26 12:12:43 +08:00
f9bdb4a327
New and Announcement search. Disabled impression.
2012-07-20 15:47:40 +08:00
a7b92ed3e8
fix rejection for announcement and news.
2012-07-17 10:22:42 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
58a11ff569
fix javascript for new and anc link removing
2012-06-28 13:50:11 +08:00
55449efb35
fix 新聞與公告QA
...
1.優先處理-快速編輯中的檔案上傳無法新增，但可刪除
2.優先處理-編輯中的檔案列表，無法刪除
3.優先處理-刪除時應彈出警告視窗，請user確認一次，再將檔案刪除
2012-06-27 14:21:06 +08:00
6a4abc6c43
fix news error
2012-06-27 09:59:32 +08:00
83a72bdf6e
fix for announcement
2012-06-26 18:23:44 +08:00
df722ba90f
change display of user dept for showing announcement
2012-06-26 16:21:18 +08:00
2b54067ecb
change order of display menu of categories of news_bulletin and bulletin.
2012-06-26 14:28:21 +08:00
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
8dd1ab32c1
Add this toolbar, and nccu calendar fix
2012-06-04 16:51:29 +08:00
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
7c44e94285
Order list by created_at desc
...
Add best image size in news new
2012-05-23 11:46:19 +08:00
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
db410b9c50
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-18 19:44:18 +08:00
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
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
6ce6577e83
fix news approve and preview
2012-05-18 18:47:18 +08:00
a4afd5c1d3
Merge branch 'design_team' into ldap
2012-05-18 10:36:32 +08:00
8ad7f70822
Proof i18n_variable for categories
2012-05-18 10:28:28 +08:00
17b6a70506
Merge branch 'design_team' into ldap
2012-05-17 23:36:24 +08:00
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
6b9c8eb15d
Merge branch 'design_team' into ldap
2012-05-17 06:31:57 +08:00
be7ce0bf45
Redmine change's
2012-05-17 06:25:38 +08:00
0b0916179f
Change assets
2012-05-16 11:07:11 +08:00
f950f77f36
Merge branch 'design_team' into ldap
...
Conflicts:
Gemfile
app/models/ad_banner.rb
2012-05-15 23:02:22 +08:00
42881553a8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-15 22:48:40 +08:00
5e9b55e08e
Ray took out 'default' tags
2012-05-15 22:47:28 +08:00
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
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
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
7a6d30ad62
Remove unless files and change routes.
2012-05-14 00:50:36 +08:00
8b42c595b3
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-14 00:49:22 +08:00
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
07815eee8f
fix display for announcement and remove ut field
2012-05-10 10:29:18 +08:00
f13e006e4d
fix display for announcement and remove ut field
2012-05-10 10:27:01 +08:00
Matthew K. Fu JuYuan
Christophe Vilayphiou
Christophe Vilayphiou