developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
orbit-basic/app
History
Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap 
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
 		2012-05-14 00:57:17 +08:00
..
assets Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
controllers Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
helpers New Interface for App Auth and Object Auth 2012-05-14 00:50:12 +08:00
jobs Restart job 2012-05-14 00:50:36 +08:00
mailer Add mail_settings 2012-05-09 11:38:29 +08:00
models Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
uploaders Modifications for images in html code 2011-10-18 11:21:24 +08:00
views Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00