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.
chris
65ac6980c4
Merge branch 'various_bugs' into nccu_master
Conflicts:
Gemfile.lock
app/assets/javascripts/ajax_form.js.erb
app/assets/stylesheets/style.css.erb
app/controllers/application_controller.rb
app/controllers/sessions_controller.rb
app/helpers/admin/web_link_helper.rb
app/views/admin/attributes/_attribute_field.html.erb
app/views/admin/designs/_form.html.erb
app/views/admin/pages/_form.html.erb
app/views/admin/sites/_side_bar.html.erb
app/views/layouts/_orbit_bar.html.erb
app/views/layouts/_side_bar.html.erb
config/locales/en.yml
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
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/index.html.erb
vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
|
2012-10-29 16:10:07 +08:00 |
| .. |
|
assets
|
Merge branch 'various_bugs' into nccu_master
|
2012-10-29 16:10:07 +08:00 |
|
controllers
|
Merge branch 'various_bugs' into nccu_master
|
2012-10-29 16:10:07 +08:00 |
|
helpers
|
Merge branch 'various_bugs' into nccu_master
|
2012-10-29 16:10:07 +08:00 |
|
jobs
|
merge
|
2012-10-01 21:09:09 +08:00 |
|
mailer
|
Add mail_settings
|
2012-05-09 11:38:29 +08:00 |
|
models
|
Merge branch 'various_bugs' into nccu_master
|
2012-10-29 16:10:07 +08:00 |
|
uploaders
|
Edit uploaded package
|
2012-10-26 11:19:57 +08:00 |
|
views
|
Merge branch 'various_bugs' into nccu_master
|
2012-10-29 16:10:07 +08:00 |