0 Fork 0

T

saurabhbhatia 471987f800 Merge branch 'development' of https://github.com/Rulingcom/orbit into 0917_ntu_mb

Conflicts:
	vendor/built_in_modules/member/app/views/panel/member/front_end/member_lists/show.html.erb

2013-09-27 11:10:07 +08:00

app

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

2013-09-27 11:10:07 +08:00

config

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

2013-09-26 20:31:46 +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

new ui member plugin sort fix and user show avatar fix

2013-09-27 11:04:52 +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

new themes added to desktop plus theme uploader created

2013-07-30 16:43:32 +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

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

2013-09-27 11:10:07 +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

Added video widget to new UI

2013-08-09 10:46:16 +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