saurabh/orbit-basic

0 Fork 0

T

Rueshyna d5f1d13670 Merge remote-tracking branch 'origin/desktop_work' into desktop

* origin/desktop_work:
  simple layout tinyscrollbar fixed
  highlighting fixed…
  fixed adding.
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster

Conflicts:
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb

2013-03-05 17:34:28 +08:00

Merge remote-tracking branch 'origin/desktop_work' into desktop

2013-03-05 17:34:28 +08:00

fix widget field reload

2013-02-27 10:51:41 +08:00

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

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

init rails 2.3.2

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

fix widget field reload

2013-02-27 10:51:41 +08:00

relpace seminar to conference

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

Put impressionist delayed job in a patch

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

fixed conference icon and rename _p to _window of conference view

2013-02-21 13:51:42 +08:00

remove useless script

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

First version of Solr search.

2012-08-08 10:59:55 +08:00

modularize factories

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

New and Announcement search. Disabled impression.

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

Merge remote-tracking branch 'origin/desktop_work' into desktop

2013-03-05 17:34:28 +08:00

.gitignore

Remove Gemfile.lock

2013-02-25 12:06:23 +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

gridster, url code fixed, views removed.

2013-02-25 11:08:56 +08:00

Gemfile.lock

using refine tiny scroll bar js for personal plugin

2013-03-04 16:35:09 +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