saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app/controllers/admin
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
..
.designs_controller.rb.swp completing the code with segment fault 2011-08-16 12:14:01 +08:00
ad_banners_controller.rb guest user 2012-09-12 16:20:15 +08:00
ad_images_controller.rb Changes for i18n yml 2012-09-24 09:02:45 +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 Changes for i18n yml 2012-09-24 09:02:45 +08:00
asset_tags_controller.rb Add tags to assets 2012-05-16 18:19:41 +08:00
assets_controller.rb Changes for i18n yml 2012-09-24 09:02:45 +08:00
dashboards_controller.rb guest user 2012-09-12 16:20:15 +08:00
designs_controller.rb Edit uploaded package 2012-10-24 18:40:38 +08:00
infos_controller.rb new code for attribute fields and values for new member interface 2012-10-12 18:09:02 +08:00
items_controller.rb Changes for i18n yml 2012-09-24 09:02:45 +08:00
links_controller.rb Changes for i18n yml 2012-09-24 09:02:45 +08:00
module_apps_controller.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
module_apps_new_interface_controller.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
object_auths_controller.rb Changes for i18n yml 2012-09-24 09:02:45 +08:00
object_auths_new_interface_controller.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
page_parts_controller.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
pages_controller.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00
plugins_controller.rb Changes for side_bar 2012-10-15 15:30:48 +08:00
purchases_controller.rb Edit uploaded package 2012-10-24 18:40:38 +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 guest user 2012-09-12 16:20:15 +08:00
users_controller.rb Changes for i18n yml 2012-09-24 09:02:45 +08:00
users_new_interface_controller.rb Merge branch 'various_bugs' into nccu_master 2012-10-29 16:10:07 +08:00