developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Orbit/app
History
Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap 
Conflicts:
	Gemfile
	Gemfile.lock
	config/application.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-03-19 14:27:15 +08:00
..
assets fix announcement links & files 2012-03-16 16:49:25 +08:00
controllers Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00
helpers First version for App and Object auth.Taking Announcement as experiment 2012-02-29 18:55:55 +08:00
models Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00
uploaders Modifications for images in html code 2011-10-18 11:21:24 +08:00
views Merge branch 'master' into ldap 2012-03-19 14:27:15 +08:00