developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/views/admin/page_parts
History
chris 65ac6980c4 Merge branch 'various_bugs' into nccu_master 
Conflicts:
	Gemfile.lock
	app/assets/javascripts/ajax_form.js.erb
	app/assets/stylesheets/style.css.erb
	app/controllers/application_controller.rb
	app/controllers/sessions_controller.rb
	app/helpers/admin/web_link_helper.rb
	app/views/admin/attributes/_attribute_field.html.erb
	app/views/admin/designs/_form.html.erb
	app/views/admin/pages/_form.html.erb
	app/views/admin/sites/_side_bar.html.erb
	app/views/layouts/_orbit_bar.html.erb
	app/views/layouts/_side_bar.html.erb
	config/locales/en.yml
	config/locales/zh_tw.yml
	config/mongoid.yml
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_bulletin.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/index.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/_index.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_filter_status.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb
	vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/index.html.erb
	vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb
 		2012-10-29 16:10:07 +08:00
..
_edit.html.erb Page by page changes for i18n yml 2012-09-24 09:06:44 +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 'various_bugs' into nccu_master 2012-10-29 16:10:07 +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 update archive 2012-08-30 15:17:39 +08:00
update.js.erb Fix missing modification for "panel_main" to "back_main" 2011-12-29 17:49:48 +08:00