orbit-basic

0 Fork 0

Files

T

Christophe Vilayphiou 23854e7adc Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var

Conflicts:
	app/controllers/pages_controller.rb
	app/models/item.rb
	app/models/site.rb
	config/environments/development.rb
	vendor/built_in_modules/announcement/app/models/bulletin.rb

2012-07-27 19:21:39 +08:00

app

Merge branch 'i18n_var' of github.com:Rulingcom/NCCU into i18n_var

2012-07-27 19:21:39 +08:00

config

New and Announcement search. Disabled impression.

2012-07-20 15:47:40 +08:00

lib

Don't display admin in any premission select. Fix not necessary header for UT data

2012-05-14 00:49:22 +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.