saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/layouts
History
chris 7d5531bf01 Merge branch 'nccu_master' into demo_site 
Conflicts:
	Gemfile
	app/assets/javascripts/tinymce_orbit.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/admin/assets_controller.rb
	app/controllers/admin/module_apps_new_interface_controller.rb
	app/controllers/admin/page_parts_controller.rb
	app/jobs/sync_db.rb
	app/models/page.rb
	app/models/page_part.rb
	app/models/user/user.rb
	app/uploaders/image_uploader.rb
	app/views/admin/assets/create.js.erb
	app/views/admin/module_apps/reload_frontend_pages.js.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	app/views/layouts/_users_checkbox_ary.html.erb
	app/views/shared/_privilege_user.html.erb
	config/mongoid.yml
	lib/parsers/parser_common.rb
	vendor/built_in_modules/announcement/announcement.json
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form_bulletin_link.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
 		2012-08-22 18:07:49 +08:00
..
_drop_down_menu.html.erb Delete useless code in items 2012-04-12 18:13:10 +08:00
_lang_menu.html.erb Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
_orbit_bar.html.erb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
_side_bar.html.erb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
_users_checkbox_ary.html.erb fix for not working cache 2012-07-13 18:32:17 +08:00
admin.html.erb changes before Chirs and Ray's trip 2012-04-19 11:50:54 +08:00
application.html.erb Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
desktop.html.erb Desktop Commit 2012-04-06 17:47:02 +08:00
devise.html.erb Changes for IE9 with html5 2012-03-21 15:51:55 +08:00
module_widget.html.erb Changes for widgets 2012-05-13 21:55:39 +08:00
new_admin.html.erb Put inc/ajax_setting in new_admin 2012-05-22 16:11:00 +08:00
page_layout.html.erb Error popup only shows on flash[:error] 2012-08-15 15:55:29 +08:00
panel.html.erb Merge server and rails_3_1 2011-08-18 13:43:33 +08:00
site_editor.html.erb Changes for structure 2012-05-22 14:45:49 +08:00