developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/config/locales
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
..
devise.en.yml LDAP with sync rake task 2012-03-06 16:41:06 +08:00
devise.zh_tw.yml LDAP with sync rake task 2012-03-06 16:41:06 +08:00
en.yml Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00
rails.yml Add asset model and controller 2010-02-01 17:24:28 +08:00
social_share_button.en.yml first version of fb_share 2012-08-08 11:04:19 +08:00
social_share_button.zh-tw.yml first version of fb_share 2012-08-08 11:04:19 +08:00
zh_tw.yml Merge branch 'nccu_master' into demo_site 2012-08-22 18:07:49 +08:00