0 Fork 0

T

saurabhbhatia f8ad13a9f5 Import Data, Sync Data

Conflicts:

	vendor/built_in_modules/personal_book/app/models/writing_book.rb
	vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
	vendor/built_in_modules/personal_journal/app/models/writing_journal.rb

2013-11-15 17:36:35 +08:00

app

Import Data, Sync Data

2013-11-15 17:36:35 +08:00

config

Import Data, Sync Data

2013-11-15 17:36:35 +08:00

split db/seeds.rb file to local plugin and done journal

2013-02-26 15:52:20 +08:00

doc

init rails 2.3.2

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

lib

Revert "more button fix and also new way to select more page."

2013-11-15 16:58:27 +08:00

log

relpace seminar to conference

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

patch

standalone css and icon

2013-06-06 18:41:27 +08:00

public

Update for dashboard and Fix site.rake,new_site.rake for missing "menu_enabled_for"

2013-11-05 19:38:47 +08:00

script

remove useless script

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

solr/conf

add sold setting back

2013-06-17 13:45:30 +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

Import Data, Sync Data

2013-11-15 17:36:35 +08:00

.gitignore

new plugins added for desktop

2013-08-06 17:52:39 +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

Dashboard with Google Chart

2013-11-04 17:48:51 +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

sftp-config.json

new plugins added for desktop

2013-08-06 17:52:39 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4