orbit-basic/vendor/built_in_modules/announcement
Christophe Vilayphiou 5a423178e3 Merge branch 'design_team' into ldap
Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css
2012-04-23 15:16:50 +08:00
..
app Merge branch 'design_team' into ldap 2012-04-23 15:16:50 +08:00
config A filter UI for permission select. with Harry's JS 2012-04-12 07:14:06 +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
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
README.rdoc merge with master 2012-01-11 20:31:52 +08:00
Rakefile 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

README.rdoc

= Announcement

This project rocks and uses MIT-LICENSE.