developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views
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
..
admin Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
default_widget Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
desktop new desktop framework updates 2012-12-27 18:25:54 +08:00
desktop_widgets update for desktop widgets 2012-11-05 11:40:11 +08:00
devise view update 2012-12-06 07:59:43 +08:00
front Fix link for ad_banner 2013-01-07 00:36:48 +08:00
js Integrate Harry's modifications to reload pop-up content 2011-12-29 14:09:06 +08:00
kaminari Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
layouts Merge branch 'sidebar_config' into ntu 2013-01-08 14:17:21 +08:00
mobile Add mobile but remove news in it 2013-01-07 03:03:38 +08:00
shared add info field 2012-12-06 07:58:39 +08:00