Matthew K. Fu JuYuan
56b1bd9eaa
add translation
2012-06-26 10:57:51 +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
a36f73bafc
fix 0621 Trello:"171 頁面管理不能使用"
2012-06-22 18:19:40 +08:00
Matthew K. Fu JuYuan
3f95fe4f13
tmp commit for search. start nccu0621 first
2012-06-22 11:34:10 +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
2f500ff460
For non-login user,show no drop down menu and return to home after press orbit button.
2012-05-29 16:33:38 +08:00
Matthew K. Fu JuYuan
4f484599b7
Clean up code , cache other auths. Fix sidebar
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
ff620b41aa
add script for cache user
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
6f0cf0e92e
cache privilege user list.
2012-05-29 15:23:50 +08:00
Matthew K. Fu JuYuan
3480fa2545
Fix login and label. Check sync jobs and update info function.
2012-05-24 17:01:00 +08:00
Christophe Vilayphiou
c062b43069
Merge branch 'design_team' into ldap
2012-05-23 12:11:38 +08:00
Christophe Vilayphiou
71d4241a2f
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-23 12:11:26 +08:00
Christophe Vilayphiou
006b84f6a1
Ray's fix for ie
2012-05-23 12:06:09 +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
Christophe Vilayphiou
eab82269c1
Remove seconds from date display
2012-05-22 20:19:04 +08:00
Christophe Vilayphiou
d6b92fc604
Fixed bugs for nccu
2012-05-22 20:00:07 +08:00
Christophe Vilayphiou
11a371cbb9
Fix destroy in structure
...
Fix sorting
2012-05-22 17:55:45 +08:00
Christophe Vilayphiou
541aa5831e
JS changes to load drag and drop
2012-05-22 17:37:15 +08:00
Christophe Vilayphiou
874a89d99b
Ray's fix for structure side_bar
2012-05-22 16:48:57 +08:00
Christophe Vilayphiou
d0b030c47d
Put inc/ajax_setting in new_admin
...
Fix callback for link on save
2012-05-22 16:11:00 +08:00
Matthew K. Fu JuYuan
99bcdf6e1e
clean up unless code
2012-05-22 14:59:54 +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
5e9836f371
Changes for structure
2012-05-22 14:45:49 +08:00
Christophe Vilayphiou
aa114568c4
Move design to site_settings side_bar
2012-05-21 18:20:39 +08:00
Christophe Vilayphiou
c4d7079059
Fix's Matt code for not showing bulletins in index
2012-05-21 18:10:03 +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
Matthew K. Fu JuYuan
5f6696a358
fix view for different_user for ad_banner. add field 'best size' for ad_banner within form
2012-05-18 14:19:13 +08:00
Christophe Vilayphiou
7c6b807170
Change impression count to exclude when :referrer is nil
2012-05-18 14:13:11 +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
5d5e798b1a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 23:35:14 +08:00
Christophe Vilayphiou
a0ad1f59b6
Comment out filename in FIleAssetUploader
2012-05-17 23:34:15 +08:00
Harry Bomrah
1b1c2c0032
image title and description callback fixed…
2012-05-17 20:19:31 +08:00
Christophe Vilayphiou
60988f97fb
Merge branch 'design_team' into ldap
2012-05-17 19:41:24 +08:00
Christophe Vilayphiou
2f7d561310
Put back I18n for file_upload
2012-05-17 19:40:30 +08:00
Christophe Vilayphiou
25de941df7
Merge branch 'design_team' into ldap
2012-05-17 19:10:22 +08:00
Christophe Vilayphiou
606050627e
Remove I18n for file_upload html
2012-05-17 19:09:52 +08:00
Christophe Vilayphiou
698c750cd7
Merge branch 'design_team' into ldap
2012-05-17 18:37:56 +08:00
Christophe Vilayphiou
27fd2d0714
Hide assets links from side_bar
2012-05-17 18:37:46 +08:00
Christophe Vilayphiou
79f484300e
Merge branch 'design_team' into ldap
2012-05-17 18:32:06 +08:00
Christophe Vilayphiou
c9cbec4239
Asset changes, add description
2012-05-17 18:31:40 +08:00
Christophe Vilayphiou
5e93fe51a9
Merge branch 'design_team' into ldap
2012-05-17 16:41:11 +08:00
Christophe Vilayphiou
29c54e6480
Add mandatory fields to assets
2012-05-17 16:40:09 +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
bfad553cc3
Merge branch 'design_team' into ldap
2012-05-17 09:31:02 +08:00
Christophe Vilayphiou
84dac1d250
Create FileAssetUploader
2012-05-17 09:30:21 +08:00
Christophe Vilayphiou
eba4671733
Merge branch 'design_team' into ldap
2012-05-17 06:46:29 +08:00
Christophe Vilayphiou
cd1640482a
Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509
...
Conflicts:
app/views/layouts/_side_bar.html.erb
2012-05-17 06:45:30 +08:00
Matthew K. Fu JuYuan
0f354b8ccc
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan
a3acd865d7
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-17 06:44:14 +08:00
Matthew K. Fu JuYuan
7f2564a81e
Fix sidebar and hide some links by roles
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
82d78acbad
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-17 06:43:39 +08:00
Matthew K. Fu JuYuan
03387d3c07
Object auth for ad_banner
2012-05-17 06:42:33 +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
b05836835a
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-17 06:28:49 +08:00
Christophe Vilayphiou
26292f0dcc
Asset upload
2012-05-17 06:28:29 +08:00
Harry Bomrah
27a0984da1
tinymce loading fixed…
2012-05-16 18:51:37 +08:00
Christophe Vilayphiou
9129835f23
Add tags to assets
2012-05-16 18:19:41 +08:00
Matthew K. Fu JuYuan
0647698012
fix ad_image size hints. fix orbit backend controller error when changing language.
2012-05-16 17:16:48 +08:00
Matthew K. Fu JuYuan
befd3bcdec
AdBanner reopen new banner and delete. Rename title with content editable tag.
2012-05-16 16:42:43 +08:00
Harry Bomrah
617a683d00
image insertion completed..
2012-05-16 16:22:50 +08:00
Harry Bomrah
c380c4cad0
popup fixed
2012-05-16 15:34:23 +08:00
Harry Bomrah
30137b50b4
popup fix..
2012-05-16 15:33:54 +08:00
Matthew K. Fu JuYuan
a31a9c4792
Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
...
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/helpers/application_helper.rb
app/models/ad_banner.rb
2012-05-16 12:13:07 +08:00
Matthew K. Fu JuYuan
88a26cc6a1
Fix sidebar and hide some links by roles
2012-05-16 12:10:16 +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
80e84c10ba
Remove link from dashboard
2012-05-15 23:01:00 +08:00
Christophe Vilayphiou
e54f4409fb
Add impressionist
2012-05-15 21:26:09 +08:00
Christophe Vilayphiou
53a0fbddf0
Fix commit error
2012-05-15 21:25:51 +08:00
Matthew K. Fu JuYuan
3f744dab05
First version of app and object auth for web_resource module. Basic fund is ok. backend need to be secued
2012-05-15 18:55:16 +08:00
Matthew K. Fu JuYuan
b23b5e8ec5
Object auth for ad_banner
2012-05-15 16:39:23 +08:00
Matthew K. Fu JuYuan
77deffb512
Nccu calendar and daily job.
2012-05-15 14:03:54 +08:00
Matthew K. Fu JuYuan
551e1ef740
Reflect login method. LDAP,MidSite connection. The Mysql connection now is build on fly.
2012-05-15 11:28:24 +08:00
Matthew K. Fu JuYuan
0a9f0bcc45
starting ad_banner auth
2012-05-15 09:57:05 +08:00
Christophe Vilayphiou
8fcb8ef8de
Change the way links are displayed in menus in front-end
2012-05-14 21:43:10 +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
Matthew K. Fu JuYuan
2cd67356a5
Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509
...
Conflicts:
config/locales/zh_tw.yml
2012-05-14 12:36:09 +08:00
Matthew K. Fu JuYuan
e1450ec748
Change to apply page to had object_auth
2012-05-14 12:34:15 +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
Matthew K. Fu JuYuan
dfd2d82efb
Restart job
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
a184f96ce7
AdBanner app_auth
2012-05-14 00:49:22 +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
cf8d20dc84
Add category and tag to pages
2012-05-14 00:33:52 +08:00
Christophe Vilayphiou
e40c76bf5f
Fix new page form
...
Redirect to home when not authorized
Get only module_apps with app_pages for new and edit page
Change web_resource.json
2012-05-13 23:48:34 +08:00
Christophe Vilayphiou
01d0c002f5
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/pages/_edit.html.erb
app/views/admin/pages/_form.html.erb
lib/parsers/parser_back_end.rb
2012-05-13 23:14:13 +08:00
Christophe Vilayphiou
62e9a772f6
Fix titles for widgets
...
Add translations
2012-05-13 23:09:48 +08:00
Christophe Vilayphiou
4ae8299949
Add custom title to widgets
...
Fix pagination conflict with main_content and widgets
2012-05-13 22:35:00 +08:00
Christophe Vilayphiou
281cfa6518
Changes for widgets
2012-05-13 21:55:39 +08:00
Christophe Vilayphiou
4685952bd6
Changes in page_edit
2012-05-13 20:13:26 +08:00
Christophe Vilayphiou
ef2d416c70
Ray's changes for page_edit
2012-05-13 19:36:04 +08:00
Christophe Vilayphiou
82fa85def8
Clean the parsers code
2012-05-13 19:32:05 +08:00
Christophe Vilayphiou
803253ebcf
Put nestedSortable in page_edit.js.erb
2012-05-12 22:12:17 +08:00
Christophe Vilayphiou
ef49df448d
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/helpers/admin/item_helper.rb
2012-05-11 18:09:34 +08:00
Christophe Vilayphiou
17b486f9e9
Fix bugs for shift_to and change items.rake for the missing position in db
2012-05-11 17:56:26 +08:00
Christophe Vilayphiou
076f5ad6ef
Ray's changes for drag and drop in structure's side_bar
2012-05-11 17:54:33 +08:00
Matthew K. Fu JuYuan
82d1d3fed8
Restart job
2012-05-11 16:56:32 +08:00
Matthew K. Fu JuYuan
0a34f0277e
Remove unless files and change routes.
2012-05-11 16:46:36 +08:00
Matthew K. Fu JuYuan
20a1a6e30f
New Interface for App Auth and Object Auth
2012-05-11 16:44:40 +08:00
Christophe Vilayphiou
6a443f0976
Add mongoid-tree to Item
2012-05-11 16:16:09 +08:00
Christophe Vilayphiou
fd52d00187
Add drag and drop to structure side_bar
2012-05-11 10:00:45 +08:00
Christophe Vilayphiou
63f904d3b0
Fix tinymce js load
...
Change to full_name for page_context index
2012-05-10 20:36:19 +08:00
Matthew K. Fu JuYuan
cb25cf60a9
AdBanner app_auth
2012-05-10 15:37:07 +08:00
Matthew K. Fu JuYuan
4f1e47bb82
Don't display admin in any premission select. Fix not necessary header for UT data
2012-05-10 14:43:05 +08:00
Christophe Vilayphiou
5eba2638ce
Merge branch 'design_team' into ldap
2012-05-10 14:17:38 +08:00
Matthew K. Fu JuYuan
b6aad17681
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 14:16:37 +08:00
Matthew K. Fu JuYuan
87ebcc48e7
Appauth new interface for setting managers. Fix showing sidebar for News and Announcement when setting managers at module app page.
2012-05-10 11:51:44 +08:00
Christophe Vilayphiou
87449ec6a8
Merge branch 'design_team' into ldap
2012-05-10 10:34:28 +08:00
Christophe Vilayphiou
a43877323e
Add tinymce to page_part edit for text
2012-05-10 10:34:13 +08:00
Christophe Vilayphiou
de739d7d20
Merge branch 'design_team' into ldap
...
Conflicts:
vendor/built_in_modules/web_resource/web_resource.json
2012-05-10 00:34:23 +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
9161dc73b5
Translation for "or"
2012-05-10 00:27:12 +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
ecd21338bc
Matt's changes for side_bar
2012-05-10 00:23:42 +08:00
Christophe Vilayphiou
dc9af65524
Merge branch 'design_team' into ldap
2012-05-09 15:25:16 +08:00
Christophe Vilayphiou
038378be9a
Ray's changes for inccu in orbit_bar
2012-05-09 15:20:09 +08:00
Christophe Vilayphiou
1785da51a2
Merge branch 'design_team' into ldap
2012-05-09 15:04:06 +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
Christophe Vilayphiou
9d01f624da
Merge branches 'nccu_0509' and 'design_team' into ldap
2012-05-09 14:21:24 +08:00
Matthew K. Fu JuYuan
6c9944918a
Fix i18 variable
2012-05-09 14:18:52 +08:00
Matthew K. Fu JuYuan
47bca643af
hidding new ad_banner
2012-05-09 14:17:20 +08:00
Christophe Vilayphiou
d88d4e58dc
Merge branch 'design_team' into ldap
...
Conflicts:
config/environments/development.rb
2012-05-09 13:51:00 +08:00
Christophe Vilayphiou
f9f7ddc8ee
Hide some links in side_bar for site_settings
2012-05-09 12:53:42 +08:00
Christophe Vilayphiou
44a485611a
Site_info and site_setting i18n
2012-05-09 12:29:46 +08:00
Christophe Vilayphiou
9216f29bc9
Ray's changes for mail settings
2012-05-09 12:19:32 +08:00
Christophe Vilayphiou
41c0c26330
Add mail_settings
2012-05-09 11:38:29 +08:00
Christophe Vilayphiou
b3be210ff7
Small adjustment for dashboard
2012-05-09 05:55:47 +08:00
Christophe Vilayphiou
2b03263fb7
Dashboard partial implementation
2012-05-09 05:53:07 +08:00
Christophe Vilayphiou
909ca19456
Fix bugs in sub_menu
2012-05-09 04:31:04 +08:00
Christophe Vilayphiou
9ead6cafda
Ray's changes
2012-05-09 04:15:02 +08:00
Christophe Vilayphiou
8d70d87120
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-09 04:13:14 +08:00
Christophe Vilayphiou
26a50cc862
Add sub_menu to children
2012-05-09 04:15:45 +08:00
Christophe Vilayphiou
a186ae08d8
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-08 21:47:03 +08:00
Christophe Vilayphiou
0cc94c65a8
Patch from ldap: Test version for DB sync schedule job
2012-05-08 21:14:57 +08:00
Christophe Vilayphiou
ffcfda912e
Patch from ldap: Calendar sync done,need Ray's JS change
2012-05-08 20:44:17 +08:00
Matthew K. Fu JuYuan
7af17f19ac
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:26:36 +08:00
Matthew K. Fu JuYuan
dbac219c18
now jobs is working
2012-05-08 20:25:11 +08:00
Matthew K. Fu JuYuan
f3b58ea36d
starting Resque
2012-05-08 20:24:37 +08:00
Matthew K. Fu JuYuan
f949523bbb
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan
69f2f6a716
now jobs is working
2012-05-08 20:21:28 +08:00
Matthew K. Fu JuYuan
c28d7d59b6
starting Resque
2012-05-08 20:21:28 +08:00
Christophe Vilayphiou
18c42a80a6
Put site_settings in the orbit_button
2012-05-08 20:06:56 +08:00
Matthew K. Fu JuYuan
083963af65
Test version for DB sync schedule job
2012-05-08 19:20:53 +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
5c7cf1aef2
Add sub_menu to site_info
2012-05-08 17:27:02 +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
f827e8429e
Calendar sync done,need Ray's JS change
2012-05-08 16:08:41 +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
Matthew K. Fu JuYuan
b22a275360
Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap
2012-05-08 11:55:21 +08:00
Christophe Vilayphiou
65a0998080
Merge branch 'jobs_and_mail' into ldap
...
Conflicts:
config/environments/development.rb
config/routes.rb
2012-05-08 11:45:34 +08:00
Matthew K. Fu JuYuan
d7194dc805
God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.
2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan
5b604037f8
now jobs is working
2012-05-08 11:41:58 +08:00
Matthew K. Fu JuYuan
7339d1ee4a
starting Resque
2012-05-08 11:41:58 +08:00
Christophe Vilayphiou
2b9190a49e
Merge branch 'design_team' into ldap
...
Conflicts:
config/locales/zh_tw.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
2012-05-08 11:40:38 +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
469f5c8267
Add always_display checkbox for title in site_info independent of i18n
2012-05-07 16:29:32 +08:00
Christophe Vilayphiou
9a5e7cc8fa
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
...
Conflicts:
app/views/admin/sites/site_info.html.erb
2012-05-07 16:08:05 +08:00
Christophe Vilayphiou
f534e6ca7b
Ray's changes for site_info
2012-05-07 15:55:45 +08:00
Christophe Vilayphiou
8a3f0b9bdc
Add menu_enabled_for: the page can be shown even if there's no link in the menu
2012-05-07 15:47:14 +08:00
Christophe Vilayphiou
8b61314cc4
Add i18n for site_info.
...
Add always display site title.
Changes for menu in front-end
2012-05-07 15:11:43 +08:00
Christophe Vilayphiou
0246341aef
Add footer to site_info
2012-05-07 11:25:33 +08:00
Christophe Vilayphiou
1fb6c20b86
Add site_info
2012-05-07 00:54:18 +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
51f87e7212
Add missing translation for enabled_for
2012-05-06 03:36:01 +08:00
Christophe Vilayphiou
ce1fecaf93
Add position ordering and hiding page for i18n
2012-05-06 00:35:13 +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
555aa088d9
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:23:45 +08:00
Christophe Vilayphiou
3ef81c520e
Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team
2012-05-04 19:16:57 +08:00
Christophe Vilayphiou
e0a191162d
Ray's changes
2012-05-04 19:11:28 +08:00
Christophe Vilayphiou
15bc4d4268
Fix merge error
2012-05-04 16:12:28 +08:00
Christophe Vilayphiou
8f1ce78ab4
Fix bug when homepage
2012-05-04 15:51:51 +08:00
Matthew K. Fu JuYuan
453cb21066
Announcement preivew
2012-05-04 15:50:45 +08:00
Matthew K. Fu JuYuan
f6307abfbf
fix broken ad_banner
2012-05-04 15:40:43 +08:00
Matthew K. Fu JuYuan
bff3cefbc7
Apply app_auth to ad_banner. From now,ad_banner can only be viewed for at least manager.
2012-05-04 15:40:43 +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
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
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
767e4a3fe9
Merge branch 'design_team' into ldap
2012-04-30 08:16:17 +08:00