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
|
53afb6ea0c
|
sidebar rewrited
|
2012-12-24 16:39:53 +08:00 |
|
Matthew K. Fu JuYuan
|
5f712622ad
|
default widgets and sidebar.
|
2012-12-24 16:38:35 +08:00 |
|
Matthew K. Fu JuYuan
|
6995bb1622
|
put module app json into init,making orbit app work with module app.
|
2012-12-24 16:23:16 +08:00 |
|
Matthew K. Fu JuYuan
|
36f6a6fdd6
|
first version of confined sidebar render
|
2012-12-24 16:17:00 +08:00 |
|
Matthew K. Fu JuYuan
|
99f28a0cba
|
sidebar rewrited
|
2012-12-05 18:35:58 +08:00 |
|
Matthew K. Fu JuYuan
|
ca290f3519
|
Merge commit 'e429aa9425e9648a94a1dd7bb5cea15af7ba854a' into sidebar_config
Conflicts:
app/views/layouts/_side_bar_content.html.erb
config/locales/zh_tw.yml
config/mongoid.yml
vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
vendor/built_in_modules/announcement/init.rb
|
2012-12-05 11:36:32 +08:00 |
chris
|
dc3be3c9a1
|
Translation changes
|
2012-12-03 23:00:04 +08:00 |
|
Matthew K. Fu JuYuan
|
4bc80f2bd3
|
default widgets and sidebar.
|
2012-12-03 18:52:36 +08:00 |
|
Matthew K. Fu JuYuan
|
f9bcb27efc
|
put module app json into init,making orbit app work with module app.
|
2012-11-29 14:21:46 +08:00 |
|
Matthew K. Fu JuYuan
|
c6894be962
|
first version of confined sidebar render
|
2012-11-20 15:56:52 +08:00 |
|
Matthew K. Fu JuYuan
|
3a65f599e6
|
first version app config for Spen durning Chris's leave.
|
2012-09-24 11:43:48 +08:00 |
|
Matthew K. Fu JuYuan
|
f009a1c942
|
startup for config
|
2012-09-13 18:31:44 +08:00 |