0 Fork 0

T

Matthew K. Fu JuYuan 7ca0d2a62b Merge branch 'master' of github.com:Rulingcom/NCCU

Conflicts:
	vendor/built_in_modules/announcement/app/models/bulletin.rb

2012-09-24 12:20:59 +08:00

app

Page by page changes for i18n yml

2012-09-24 09:06:44 +08:00

config

Change status translation in Chinese

2012-09-24 10:10:06 +08:00

upgrade to rails3, but grip is broken

2010-03-08 16:04:05 +08:00

doc

init rails 2.3.2

2009-05-08 00:53:18 +08:00

lib

Fix migration bug

2012-09-11 16:32:20 +08:00

log

tmp commit for search. start nccu0621 first

2012-06-22 11:34:10 +08:00

public

Fix for banner link

2012-08-13 11:03:11 +08:00

script

remove useless script

2011-04-13 19:18:40 +08:00

solr/conf

First version of Solr search.

2012-08-08 10:59:55 +08:00

spec

First version of new preview. Only plain text

2012-09-04 12:31:27 +08:00

tmp

New and Announcement search. Disabled impression.

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

vendor

Merge branch 'master' of github.com:Rulingcom/NCCU

2012-09-24 12:20:59 +08:00

.gitignore

stop saving sold files on git

2012-09-04 09:34:14 +08:00

.rspec

Merge with sub_roles

2011-12-23 18:34:21 +08:00

config.ru

Replace PrototypeR4 by Orbit.

2012-03-16 14:58:32 +08:00

dump.rdb

New and Announcement search. Disabled impression.

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

Gemfile

First version of new preview. Only plain text

2012-09-04 12:31:27 +08:00

Gemfile.lock

Changes for i18n yml

2012-09-24 09:02:45 +08:00

Rakefile

God , Resque, Resque-schedule, is working,but buggy. Need to combine with LDAP and also implement XML calendar sync.

2012-05-08 11:41:58 +08:00

README.md

Update README

2011-04-13 19:06:09 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4