orbit-basic/vendor/built_in_modules/news
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
..
app Merge branch 'yml' of github.com:Rulingcom/NCCU into yml 2012-09-24 09:19:19 +08:00
config Page by page changes for i18n yml 2012-09-24 09:06:44 +08:00
lib Separate announcement and news 2012-04-30 06:31:46 +08:00
script Separate announcement and news 2012-04-30 06:31:46 +08:00
test Separate announcement and news 2012-04-30 06:31:46 +08:00
.gitignore Separate announcement and news 2012-04-30 06:31:46 +08:00
Gemfile Separate announcement and news 2012-04-30 06:31:46 +08:00
MIT-LICENSE Separate announcement and news 2012-04-30 06:31:46 +08:00
README.rdoc Separate announcement and news 2012-04-30 06:31:46 +08:00
Rakefile Separate announcement and news 2012-04-30 06:31:46 +08:00
news.gemspec Separate announcement and news 2012-04-30 06:31:46 +08:00
news.json Changes for widgets 2012-05-13 21:55:39 +08:00

README.rdoc

= News

This project rocks and uses MIT-LICENSE.