developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app/views/admin/page_parts
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
..
_edit.html.erb Fix titles for widgets 2012-05-13 23:09:48 +08:00
_language_bar.html.erb Edition of page part for multiple languages. 2011-05-27 11:27:54 +08:00
_module_widget.html.erb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
_public_r_tag.html.erb Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
_text.html.erb Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
_widget_categories.html.erb Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
_widget_fields.html.erb widget & frontend field 2012-08-09 15:25:30 +08:00
_widget_tags.html.erb Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
edit.html.erb Changes into page_part edition. 2012-02-16 13:09:09 +08:00
edit.js.erb tinymce loading fixed… 2012-05-16 18:51:37 +08:00
reload_r_tag_options.js.erb Add sub_menu to children 2012-05-09 04:15:45 +08:00
reload_widget_styles.js.erb demo site widget 2012-07-26 16:39:29 +08:00
reload_widgets.js.erb widget & frontend field 2012-08-09 15:25:30 +08:00
update.js.erb Fix missing modification for "panel_main" to "back_main" 2011-12-29 17:49:48 +08:00