developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/admin/sites
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
..
_registration.html.erb Integration of module_app workflow 2011-11-19 14:33:26 +08:00
_side_bar.html.erb Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
_sitemap_block.html.erb Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
_update.html.erb ika's modification to the backend 2011-11-16 18:34:54 +08:00
index.html.erb Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
language.html.erb Put site_settings in the orbit_button 2012-05-08 20:06:56 +08:00
mail_setting.html.erb Site_info and site_setting i18n 2012-05-09 12:29:46 +08:00
new.html.erb Clean code for layout and modifications in dev.rake 2011-08-22 13:45:21 +08:00
site_info.html.erb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
sitemap.html.erb Sitemap with main 2012-07-27 19:13:39 +08:00
sitemap_frontend.html.erb Change width for site map frontend, add link for more in announcement widget 2012-08-08 10:53:04 +08:00
system_info.html.erb Put site_settings in the orbit_button 2012-05-08 20:06:56 +08:00
ui_theme.html.erb Put site_settings in the orbit_button 2012-05-08 20:06:56 +08:00