Go to file
Rueshyna 80b6a9ab48 Merge branch 'desktop' into desktop_work
* desktop:
  highlighting fixed…
  add Devin's css file for gallery
  using refine tiny scroll bar js for personal plugin
  fixed adding.
  layout fix
  layout fix
  tinyscrollbar_bug fixed
  url handling modified.. tinyscrollbar modified… star checkbox fixed..
  tinyscrollbar fixed
  some changes for gridster
  Lot of changes in gridster
  authors auto-complete
  fixed paper title and journal title bug

Conflicts:
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/_show_form.html.erb
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_co_author_relations/index.html.erb
	vendor/built_in_modules/personal_journal/app/helpers/panel/personal_journal/desktop/journal_pages_helper.rb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_author_relations/_show_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_co_authors/index.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/_form.html.erb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/journal_type.html.erb
2013-03-04 18:03:59 +08:00
app highlighting fixed… 2013-03-04 17:57:32 +08:00
config fix widget field reload 2013-02-27 10:51:41 +08:00
db 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 fix widget field reload 2013-02-27 10:51:41 +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 Merge branch 'desktop' into desktop_work 2013-03-04 18:03:59 +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
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
README.md Update README 2011-04-13 19:06:09 +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
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

README.md

Ruling Orbit

RulingSite-s Version 4