Christophe Vilayphiou
|
99c4e94729
|
Fix for home_list widget
|
2012-05-10 10:28:29 +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
|
c82d701b55
|
Permission setting for announcement for bulletin cate
|
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 |
|
Matthew K. Fu JuYuan
|
71a5731fe8
|
Permission setting for announcement for bulletin cate
|
2012-05-09 14:54:20 +08:00 |
|
Christophe Vilayphiou
|
9ead6cafda
|
Ray's changes
|
2012-05-09 04:15:02 +08:00 |
|
Christophe Vilayphiou
|
23d2d9a81e
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-08 17:36:35 +08:00 |
|
Christophe Vilayphiou
|
41424d2829
|
Fix error in front-end announcement index
|
2012-05-08 17:40:14 +08:00 |
|
Christophe Vilayphiou
|
ef9afca19f
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-08 17:28:05 +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
|
d2e07f537a
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-08 17:24:40 +08:00 |
|
Christophe Vilayphiou
|
a3868cb785
|
Ray's changes for front-end banner
|
2012-05-08 17:21:26 +08:00 |
|
Matthew K. Fu JuYuan
|
7603cb91ad
|
Change subrole's context from code to text at approval setting.
|
2012-05-08 16:21:10 +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
|
ca88d0e01b
|
Fix bug that was never displaying preview
|
2012-05-07 17:29:56 +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 |
|
Matthew K. Fu JuYuan
|
119d8ff13a
|
add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.
|
2012-05-04 15:50:45 +08:00 |
|
Matthew K. Fu JuYuan
|
048ce4c97e
|
disable input
|
2012-05-04 15:50:45 +08:00 |
|
Matthew K. Fu JuYuan
|
453cb21066
|
Announcement preivew
|
2012-05-04 15:50:45 +08:00 |
|
Matthew K. Fu JuYuan
|
f427c3803f
|
clean up useless flash msgs. add i18n vars for app auth and object auth
|
2012-05-04 15:40:43 +08:00 |
|
Matthew K. Fu JuYuan
|
05ded8de03
|
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
|
2012-05-04 15:38:18 +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 |
|
Christophe Vilayphiou
|
63ee8eaca9
|
Remove url from sorting
Add sorting_options to params in filters
|
2012-04-30 06:30:52 +08:00 |
|
Christophe Vilayphiou
|
32faef0c70
|
DRY code for sorting
|
2012-04-30 06:30:52 +08:00 |
|
Matthew K. Fu JuYuan
|
a46a8898d7
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-30 00:24:11 +08:00 |
|
Matthew K. Fu JuYuan
|
382932036d
|
Hide Approval button when bulletin is checked.
|
2012-04-30 00:24:11 +08:00 |
|
Matthew K. Fu JuYuan
|
c4db7e2157
|
Fix approval setting ajax problem
|
2012-04-30 00:24:11 +08:00 |
|
Matthew K. Fu JuYuan
|
94d61abf83
|
A modal view for approval user
|
2012-04-30 00:24:10 +08:00 |
|
Christophe Vilayphiou
|
851dc72f42
|
Ray's changes in css and html
|
2012-04-30 00:17:18 +08:00 |
|
Christophe Vilayphiou
|
bf2c89da54
|
Add sorting to web_links
|
2012-04-27 14:20:09 +08:00 |
|
Christophe Vilayphiou
|
3beb035101
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-27 11:11:56 +08:00 |
|
Christophe Vilayphiou
|
5aca3db95f
|
Ray's changes for structure and web_links
|
2012-04-27 11:02:56 +08:00 |
|
Christophe Vilayphiou
|
3d293f6419
|
Fix for quick edit file and link in announcement
Change submit_button into ajax_for_submit
|
2012-04-26 16:42:28 +08:00 |
|
Christophe Vilayphiou
|
876036dd20
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
|
2012-04-25 16:39:26 +08:00 |
|
Christophe Vilayphiou
|
44ded537b3
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-04-25 16:28:34 +08:00 |
|
Christophe Vilayphiou
|
65a6f9c416
|
Ray's css fix for quick edit
|
2012-04-25 16:26:27 +08:00 |