0 Fork 0

T

Christophe Vilayphiou 03b5827392 Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/_side_bar.html.erb

2012-09-14 00:03:52 +08:00

app

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

2012-09-14 00:03:52 +08:00

config

break down Ray's HTML

2012-09-14 00:02:22 +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

add data_migration for rename field for attribute_field. not yet tested

2012-09-14 00:02:22 +08:00

log

tmp commit for search. start nccu0621 first

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

public

event_calendar testing

2012-09-13 23:57:47 +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

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

minor shit updates

2012-09-13 23:57:48 +08:00

.gitignore

again minor shit update

2012-09-13 23:58:32 +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

break down Ray's HTML

2012-09-14 00:02:22 +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 20:21:28 +08:00

README.md

Update README

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

README.md

Ruling Orbit

RulingSite-s Version 4