56caf4b34e
category disable for backend
2012-07-06 18:11:55 +08:00
c5fdff764e
orbit disable object for categories
2012-07-05 16:00:45 +08:00
32480e10ed
en translation
2012-07-04 17:43:52 +08:00
ae2cbb728e
archive for announcement
2012-07-04 17:36:51 +08:00
4fe92b844e
Add sorting order for NCCU request
2012-07-03 15:47:28 +08:00
c0b3798bad
fix for date for qu menu
2012-06-29 11:41:06 +08:00
f66c3d9c0c
fix bugs.
2012-06-29 11:17:35 +08:00
6c4c1046bc
fix date select cause error back to the time of Jesus
2012-06-28 15:19:51 +08:00
58a11ff569
fix javascript for new and anc link removing
2012-06-28 13:50:11 +08:00
243c9e2946
fix relation between bulletin and category (news also)
2012-06-27 15:16:16 +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
818c58c1ee
fix for 新聞與公告QA
...
1.8.新聞或公告的「檔案室」上傳圖片後再行編輯時，圖片無法正常顯示（但是可以正常被編輯調整並於前台顯示）
2.add 上傳檔案大小限制: 3MB
3.公告的發佈單位為何是顯示單位代碼：M00？應顯示發布單位
2012-06-26 17:46:02 +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
a663231c8c
Merge branch 'design_team' into ldap
2012-05-25 10:01:41 +08:00
75b67dddf5
Fix date bugs
2012-05-25 09:59:39 +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
e0260542d3
fix code
2012-05-22 16:11:52 +08:00
79f67208fa
js for preventing user do stupid things durning ajax
2012-05-22 14:59:54 +08:00
815e6a8361
Fix matt's code and add it to filters
2012-05-19 03:19:55 +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
6a022c90da
Changes on nccu
2012-05-18 15:20:45 +08:00
f72d0bc7e0
Merge branch 'design_team' into ldap
2012-05-18 10:51:20 +08:00
d9c12ea5a4
Proof authed_users for case when no category
2012-05-18 10:50:51 +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
1e2b146c21
Merge branch 'design_team' into ldap
2012-05-17 10:00:07 +08:00
4467bc5e48
Change Date to DateTime
...
Fix filename error
2012-05-17 09:59:49 +08:00
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
f663985a40
starting ad_banner auth
2012-05-17 06:42:33 +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
59b55d1574
Merge branch 'design_team' into ldap
2012-05-14 12:42:06 +08:00
Matthew K. Fu JuYuan
Christophe Vilayphiou
Matt
Christophe Vilayphiou