chris
|
3e0822336e
|
Put back deleted code in items helper
|
2013-04-25 19:37:00 +08:00 |
|
chris
|
19405cf006
|
Tag management working but can't remove default tag from module
|
2013-04-25 12:34:06 +08:00 |
|
chris
|
a9d25dcdec
|
Orbit bar
Structure: page, link, edit and new, page view, edit page parts
Temporary disable authentication in items controller
|
2013-04-12 03:13:03 +08:00 |
|
chris
|
41dff814fb
|
Change icons
|
2013-01-09 21:17:50 +08:00 |
|
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
|
chris
|
9c6c622a49
|
Add missing icons and css for icons in layout
|
2012-12-03 22:31:00 +08:00 |
|
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 |
|
chris
|
189fa553c5
|
Changes for helpers, not including all by default
|
2012-10-09 14:47:16 +08:00 |