orbit-basic

0 Fork 0

Files

T

Christophe Vilayphiou 1f4fe65430 Merge branch 'design_team' into ldap

Conflicts:
	app/views/devise/sessions/new.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb

2012-04-25 16:45:04 +08:00

app

Merge branch 'design_team' into ldap

2012-04-25 16:45:04 +08:00

config

Merge branch 'ad_banner' of github.com:Rulingcom/orbit into ad_banner

2012-04-24 16:45:13 +08:00

lib

First version for App and Object auth.Taking Announcement as experiment

2012-02-29 18:55:55 +08:00

script

merge with master

2012-01-11 20:31:52 +08:00

test

merge with master

2012-01-11 20:31:52 +08:00

.gitignore

merge with master

2012-01-11 20:31:52 +08:00

announcement.gemspec

merge with master

2012-01-11 20:31:52 +08:00

announcement.json

LDAP with sync rake task

2012-03-06 16:41:06 +08:00

Gemfile

merge with master

2012-01-11 20:31:52 +08:00

MIT-LICENSE

merge with master

2012-01-11 20:31:52 +08:00

Rakefile

merge with master

2012-01-11 20:31:52 +08:00

README.rdoc

merge with master

2012-01-11 20:31:52 +08:00

README.rdoc

= Announcement

This project rocks and uses MIT-LICENSE.