0 Fork 0

T

Fu Matthew 9fec7beb47 Merge branch 'development' of github.com:Rulingcom/orbit into development

Conflicts:
	app/controllers/default_widget_controller.rb
	lib/tasks/migrate.rake

2013-02-22 17:53:49 +08:00

app

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

2013-02-22 17:53:49 +08:00

config

member plugin init edit

2013-02-21 17:53:08 +08:00

make a fake data for personal conference plugin

2013-02-21 13:53:50 +08:00

doc

init rails 2.3.2

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

lib

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

2013-02-22 17:53:49 +08:00

log

relpace seminar to conference

2013-02-04 18:01:38 +08:00

patch

Put impressionist delayed job in a patch

2013-01-08 12:45:15 +08:00

public

fixed conference icon and rename _p to _window of conference view

2013-02-21 13:51:42 +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

modularize factories

2013-02-04 18:01:42 +08:00

tmp

New and Announcement search. Disabled impression.

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

vendor

Fix init name/key

2013-02-22 14:46:22 +08:00

.gitignore

Push Gemfile.lock

2013-02-19 17:24:24 +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

back_end widget breadcrumb finish

2013-02-19 17:24:19 +08:00

Gemfile.lock

Temporary fix zh_tw.yml

2013-02-21 14:43:49 +08:00

Guardfile

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

2012-10-30 10:11:51 +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