This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
Christophe Vilayphiou
b4ff5cea05
Merge branch 'yml' of github.com:Rulingcom/NCCU into yml
Conflicts:
app/helpers/admin/item_helper.rb
app/views/admin/ad_banners/_ad_banner_tab.html.erb
app/views/admin/assets/edit.html.erb
app/views/admin/assets/file_upload.html.erb
app/views/admin/assets/new.html.erb
app/views/admin/attributes/index.html.erb
app/views/admin/object_auths_new_interface/setting.html.erb
app/views/admin/page_parts/_edit.html.erb
app/views/layouts/_side_bar.html.erb
app/views/shared/_privilege_user.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/edit.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletin_categorys/new.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_form.html.erb
vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb
vendor/built_in_modules/news/app/views/panel/news/widget/news_bulletins/home_banner.html.erb
vendor/built_in_modules/news/config/locales/en.yml
vendor/built_in_modules/news/config/locales/zh_tw.yml
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/_form.html.erb
|
2012-09-24 09:19:19 +08:00 |
| .. |
|
announcement
|
Page by page changes for i18n yml
|
2012-09-24 09:06:44 +08:00 |
|
news
|
Merge branch 'yml' of github.com:Rulingcom/NCCU into yml
|
2012-09-24 09:19:19 +08:00 |
|
page_content
|
Page by page changes for i18n yml
|
2012-09-24 09:06:44 +08:00 |
|
web_resource
|
Page by page changes for i18n yml
|
2012-09-24 09:06:44 +08:00 |