Matthew K. Fu JuYuan
|
eb81aa6980
|
disable input
|
2012-05-03 15:48:42 +08:00 |
|
Matthew K. Fu JuYuan
|
2a14c8bad4
|
Announcement preivew
|
2012-05-03 14:57:10 +08:00 |
Christophe Vilayphiou
|
45e21f9569
|
Fix filter category in news
|
2012-05-02 17:55:02 +08:00 |
|
Christophe Vilayphiou
|
b8cd7097b0
|
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
|
2012-05-02 16:27:09 +08:00 |
|
Christophe Vilayphiou
|
2762c24593
|
Fix wrong variable names in translations
|
2012-05-02 16:22:06 +08:00 |
Christophe Vilayphiou
|
92a53c1b27
|
Ray's fix
|
2012-05-02 16:20:59 +08:00 |
|
Matthew K. Fu JuYuan
|
de457e7dfc
|
fix broken ad_banner
|
2012-05-01 18:23:42 +08:00 |
|
Matthew K. Fu JuYuan
|
7a5d3ecae3
|
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
|
2012-05-01 16:05:05 +08:00 |
|
Matthew K. Fu JuYuan
|
a803309380
|
clean up useless flash msgs. add i18n vars for app auth and object auth
|
2012-04-30 15:51:22 +08:00 |
|
Christophe Vilayphiou
|
fe54c6ae71
|
Fix bug when id or single object
|
2012-04-30 14:23:41 +08:00 |
|
Christophe Vilayphiou
|
a9ab016d52
|
Merge branch 'design_team' into ldap
|
2012-04-30 08:33:21 +08:00 |
|
Christophe Vilayphiou
|
bda21baed2
|
Add missing js
|
2012-04-30 08:32:54 +08:00 |
|
Christophe Vilayphiou
|
088cd54b1d
|
Merge branch 'design_team' into ldap
Conflicts:
config/locales/zh_tw.yml
|
2012-04-30 08:26:07 +08:00 |
|
Christophe Vilayphiou
|
8a99086802
|
News translation
|
2012-04-30 08:24:58 +08:00 |
|
Christophe Vilayphiou
|
767e4a3fe9
|
Merge branch 'design_team' into ldap
|
2012-04-30 08:16:17 +08:00 |
|
Christophe Vilayphiou
|
496b8de58a
|
Side bar translation
|
2012-04-30 08:15:45 +08:00 |
|
Christophe Vilayphiou
|
0f203274a7
|
Merge branch 'design_team' into ldap
Conflicts:
config/locales/zh_tw.yml
|
2012-04-30 08:11:40 +08:00 |
|
Christophe Vilayphiou
|
39410267e8
|
Add missing translation for news
|
2012-04-30 08:10:26 +08:00 |
|
Christophe Vilayphiou
|
20504b2205
|
Merge branch 'design_team' into ldap
Conflicts:
app/controllers/admin/page_parts_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
|
2012-04-30 07:57:20 +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
|
17635a2cf2
|
Merge branch 'anc_approval_list' of https://github.com/Rulingcom/orbit into anc_approval_list
|
2012-04-30 03:14:53 +08:00 |
|
Matthew K. Fu JuYuan
|
4466e7ae1c
|
Fix for NCCU 0430 all functions ok with two submanagers but different behavors
|
2012-04-30 03:14:15 +08:00 |
|
Christophe Vilayphiou
|
fb6c2a24df
|
Merge branches 'anc_approval_list' and 'anc_approval_list' of github.com:Rulingcom/orbit into anc_approval_list
|
2012-04-30 00:25:27 +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
|
6b151b1fb6
|
403 for unauth apps
|
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 |
|
Matthew K. Fu JuYuan
|
9d97b7c008
|
Change for the notice msg at login page
|
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 |
|
Matthew K. Fu JuYuan
|
4a51355b1a
|
Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen
|
2012-04-27 18:38:21 +08:00 |
|
Christophe Vilayphiou
|
2362e1cfdd
|
Merge branch 'design_team' into ldap
|
2012-04-27 15:28:32 +08:00 |
|
Christophe Vilayphiou
|
799fd1e3ac
|
Fix css bugs (opacity=) and changes in sign_in page
|
2012-04-27 15:27:59 +08:00 |
|
Christophe Vilayphiou
|
bf2c89da54
|
Add sorting to web_links
|
2012-04-27 14:20:09 +08:00 |
|
Christophe Vilayphiou
|
feb2156fd3
|
Fix error in side_bar for web_links
|
2012-04-27 14:15:36 +08:00 |
|
Matthew K. Fu JuYuan
|
3fcb902663
|
Hide Approval button when bulletin is checked.
|
2012-04-27 11:44:41 +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
|
7d6b82d9dd
|
Merge branch 'ad_banner' into ldap
|
2012-04-26 17:15:44 +08:00 |
|
Christophe Vilayphiou
|
9717dd8fe7
|
Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner
Conflicts:
app/views/admin/ad_banners/_ad_banner_tab.html.erb
|
2012-04-26 17:15:11 +08:00 |
|
Matthew K. Fu JuYuan
|
4af2068c1f
|
Fix ad_banner sec and msec
|
2012-04-26 17:11:06 +08:00 |
|
Matthew K. Fu JuYuan
|
faace9893a
|
dehumanize ad banner
|
2012-04-26 17:11:05 +08:00 |
|
Matthew K. Fu JuYuan
|
9a5ce5f512
|
Remove unless sidebar links.
|
2012-04-26 17:11:05 +08:00 |
|
Matthew K. Fu JuYuan
|
1c7c283083
|
403 for unauth apps
|
2012-04-26 16:45:46 +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 |
|
Matthew K. Fu JuYuan
|
bd9451f923
|
Fix approval setting ajax problem
|
2012-04-26 16:13:21 +08:00 |
|
Christophe Vilayphiou
|
6bf4c60d45
|
Changes for js and ccs load for site's pages
|
2012-04-26 01:49:02 +08:00 |
|
Christophe Vilayphiou
|
6f1eb97ace
|
Fix for structure js and css
|
2012-04-25 18:41:38 +08:00 |