65ac6980c4
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 |
||
|---|---|---|
| .. | ||
| backtrace_silencers.rb | ||
| carrierwave.rb | ||
| cookie_verification_secret.rb | ||
| custom_validators.rb | ||
| dehumanize.rb | ||
| devise.rb | ||
| fix_using_obj_id.rb | ||
| impression.rb | ||
| inflections.rb | ||
| load_config.rb | ||
| load_lists.rb | ||
| middle_site_connection.rb | ||
| mime_types.rb | ||
| nccu_ldap_connection.rb | ||
| override_and_new_class_methods.rb | ||
| resque.rb | ||
| resque_auth.rb | ||
| rulingcom_ldap.rb | ||
| secret_token.rb | ||
| session_store.rb | ||
| social_share_button.rb | ||
| without_callbacks.rb | ||