Orbit/lib/tasks
Matthew K. Fu JuYuan f55b3a4374 Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/admin/attributes/_app_selector.html.erb
	app/views/admin/module_apps/_app_selector.html.erb
	app/views/admin/pages/_app_selector.html.erb
	config/application.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb
	vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb
	vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb
	vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb
	vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb
2012-04-19 14:06:00 +08:00
..
.gitkeep Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST) 2011-04-13 18:19:51 +08:00
anc_tasks.rake code for new fact check 2012-03-16 11:09:44 +08:00
app_auth.rake merge with november_presentation 2011-12-22 15:43:38 +08:00
dev.rake First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
mid_site_sync.rake LDAP with sync rake task 2012-03-06 16:41:06 +08:00
noko.rake Add rake task for layout with nokogiri 2012-03-27 19:00:03 +08:00
page_content.rake Fix bugs and changes for nccu 2012-02-27 18:50:56 +08:00
pages.rake Ray's modification before redesign 2012-01-24 11:57:27 +08:00
site.rake Final modifications for the presentation 2011-11-22 18:54:10 +08:00
user.rake change view and action for announcement ,Lin checked. Also add validation for object_auth make sure for each object,the object will be unique for each action. 2012-02-29 18:58:33 +08:00