This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
announcement	Merge commit '6b248a949b44b6e4dc908f29f4f08c3a821210cd' into sidebar_config	2012-11-26 17:55:53 +08:00
archive	fix and hide for visitors,except for album	2012-11-21 18:31:57 +08:00
calendar	calendar js minor update	2012-11-21 19:02:54 +08:00
gallery	Fix album images display	2012-11-22 20:01:10 +08:00
gprs	fix and hide for visitors,except for album	2012-11-21 18:31:57 +08:00
page_content	Fix bugs:	2012-11-01 09:30:12 +08:00
personal_book	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_diploma	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_experience	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_honor	member plugin list add new	2012-11-04 20:24:36 +08:00
personal_journal	some bugs	2012-11-21 07:37:44 +08:00
personal_lab	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_patent	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_project	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_research	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
personal_seminar	Merge branch 'master' into various_bugs	2012-11-06 11:44:00 +08:00
web_resource	Fix bugs:	2012-10-30 17:09:00 +08:00