Fu Matthew
|
71d5abae2e
|
first version of app config and modified inits.
|
2013-01-29 20:33:40 +08:00 |
Matthew K. Fu JuYuan
|
2dd2368378
|
remove merge marks
|
2012-12-25 11:26:23 +08:00 |
|
Matthew K. Fu JuYuan
|
49e6c33b57
|
Merge branch 'sidebar_config' of github.com:Rulingcom/orbit into sidebar_config
Conflicts:
app/controllers/admin/object_auths_new_interface_controller.rb
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/routes.rb
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
vendor/built_in_modules/archive/init.rb
vendor/built_in_modules/miss_module/config/locales/zh_tw.yml
|
2012-12-25 11:01:36 +08:00 |
|
Matthew K. Fu JuYuan
|
41bcbdd2f0
|
missing file?
|
2012-12-24 16:39:53 +08:00 |
|
Matthew K. Fu JuYuan
|
062ebecae3
|
fix serval bugs on sidebar.
|
2012-12-24 16:39:53 +08:00 |
|
Matthew K. Fu JuYuan
|
53afb6ea0c
|
sidebar rewrited
|
2012-12-24 16:39:53 +08:00 |
|
Matthew K. Fu JuYuan
|
858e942da2
|
fix serval bugs on sidebar.
|
2012-12-07 12:40:47 +08:00 |
|
Matthew K. Fu JuYuan
|
99f28a0cba
|
sidebar rewrited
|
2012-12-05 18:35:58 +08:00 |