Matthew K. Fu JuYuan 3d573680b2 Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config ...

Conflicts:
	app/models/user/attribute_value.rb
	app/views/layouts/_side_bar_content.html.erb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

2012-11-26 17:55:53 +08:00

..

assets

Merge branch 'make_jsFunc_for_journalP' of github.com:Rulingcom/orbit into make_jsFunc_for_journalP

2012-11-26 05:02:58 +08:00

controllers

Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

2012-11-26 17:55:53 +08:00

helpers

disable data transform when switching attribute field type. new member stable

2012-11-22 21:10:35 +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

disable data transform when switching attribute field type. new member stable

2012-11-22 21:10:35 +08:00

uploaders

Remove news and fix default_url in ImageUploader

2012-11-22 09:30:25 +08:00

views

Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config

2012-11-26 17:55:53 +08:00