developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app/views/admin
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
..
ad_banners Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
ad_images Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
app_auths Listing for Module-apps 2012-01-12 14:13:41 +08:00
asset_categories Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
assets Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
attributes Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
components Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen 2012-04-30 00:24:11 +08:00
dashboards Fix typo 2012-07-30 18:37:20 +08:00
designs Fix js for ie in list 2012-08-16 01:09:45 +08:00
infos Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
items Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
links Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
module_apps Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
module_apps_new_interface Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
object_auths Integrate App & Object Auth to announcement with i18n variables. Also changed Role and SubRole i18n var. Checked with Allen 2012-04-30 00:24:11 +08:00
object_auths_new_interface Clean up code , cache other auths. Fix sidebar 2012-05-29 17:17:26 +08:00
page_parts Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
pages Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
purchases Ray's back_end modification before sub_roles 2011-12-23 18:02:45 +08:00
roles Remove i18n_variable for views 2012-07-27 19:13:39 +08:00
sites Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
tags Ray's changes in css and html 2012-04-30 00:17:18 +08:00
translations Fix wrong variable names in translations 2012-05-02 16:22:06 +08:00
users Remove i18n_variable for views 2012-07-27 19:13:39 +08:00