saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/controllers/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
..
.designs_controller.rb.swp completing the code with segment fault 2011-08-16 12:14:01 +08:00
ad_banners_controller.rb fix view for different_user for ad_banner. add field 'best size' for ad_banner within form 2012-05-18 14:19:13 +08:00
ad_images_controller.rb fix view for different_user for ad_banner. add field 'best size' for ad_banner within form 2012-05-18 14:19:13 +08:00
app_auths_controller.rb add "all_user" for app&object auth 2012-02-29 18:56:42 +08:00
asset_categories_controller.rb Proof i18n_variable for categories 2012-05-18 10:28:28 +08:00
asset_tags_controller.rb Add tags to assets 2012-05-16 18:19:41 +08:00
assets_controller.rb tp 2012-08-20 23:16:54 +08:00
dashboards_controller.rb Changes on nccu 2012-05-18 15:20:45 +08:00
designs_controller.rb Move delete checkboxes to js 2012-08-14 00:59:01 +08:00
infos_controller.rb Proof i18n_variable for categories 2012-05-18 10:28:28 +08:00
items_controller.rb Fix bugs for shift_to and change items.rake for the missing position in db 2012-05-11 17:56:26 +08:00
links_controller.rb Changes for structure 2012-05-22 14:45:49 +08:00
module_apps_controller.rb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
module_apps_new_interface_controller.rb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
object_auths_controller.rb 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_controller.rb hide category at front end 2012-07-09 12:05:21 +08:00
page_parts_controller.rb Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
pages_controller.rb widget & frontend field 2012-08-09 15:25:30 +08:00
purchases_controller.rb Fix .class to .class.to_s 2012-07-30 18:34:54 +08:00
roles_controller.rb Proof i18n_variable for categories 2012-05-18 10:28:28 +08:00
sessions_controller.rb Replace PrototypeR4 by Orbit. 2012-03-16 14:58:32 +08:00
sites_controller.rb Sitemap done for backend and fronted 2012-07-27 19:13:40 +08:00
tags_controller.rb edit tags 2012-02-15 15:38:27 +08:00
translations_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00
users_controller.rb Merge with sub_roles 2011-12-23 18:34:21 +08:00