0 Fork 0

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

remove cache

2012-07-27 19:14:24 +08:00

config

Sitemap done for backend and fronted

2012-07-27 19:13:40 +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

first version of mid_site_sync for new i18n var

2012-07-27 19:13:40 +08:00

log

tmp commit for search. start nccu0621 first

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

public

remove cache

2012-07-27 19:14:24 +08:00

script

remove useless script

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

spec

fixing for app_auth

2012-01-05 16:20:51 +08:00

tmp

New and Announcement search. Disabled impression.

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

vendor

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

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

.gitignore

New and Announcement search. Disabled impression.

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

.rspec

Change role structure

2011-12-10 18:12:39 +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

Move Impressionist to Gemfile

2012-07-27 19:14:25 +08:00

Gemfile.lock

Move Impressionist to Gemfile

2012-07-27 19:14:25 +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