developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/vendor/built_in_modules
History
Fu Matthew 76296ab29b Merge branch 'sidebar_config' into ntu 
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/controllers/orbit_backend_controller.rb
	app/controllers/orbit_widget_controller.rb
	app/models/module_app.rb
	app/views/admin/page_parts/_module_widget.html.erb
	config/locales/zh_tw.yml
	lib/parsers/parser_common.rb
	lib/parsers/parser_front_end.rb
 		2013-01-08 14:17:21 +08:00
..
ad_banner fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
announcement Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
archive Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
calendar Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
gallery Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
location rename of GPRS 2012-12-24 16:39:53 +08:00
miss_module/config/locales remove merge marks 2012-12-25 11:26:23 +08:00
page_content fix serval bugs on sidebar. 2012-12-24 16:39:53 +08:00
personal_book missing file? 2012-12-24 16:39:53 +08:00
personal_diploma missing file? 2012-12-24 16:39:53 +08:00
personal_experience missing file? 2012-12-24 16:39:53 +08:00
personal_honor missing file? 2012-12-24 16:39:53 +08:00
personal_journal missing file? 2012-12-24 16:39:53 +08:00
personal_lab missing file? 2012-12-24 16:39:53 +08:00
personal_patent missing file? 2012-12-24 16:39:53 +08:00
personal_project missing file? 2012-12-24 16:39:53 +08:00
personal_research missing file? 2012-12-24 16:39:53 +08:00
personal_seminar missing file? 2012-12-24 16:39:53 +08:00
web_resource Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00