This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.
Go to file
Harry Bomrah 774cc5d392 added sync for journal paper books and conference.. and also disabled the icons
Conflicts:
	app/assets/javascripts/desktop/orbitdesktop.js
	app/controllers/admin/import_data_controller.rb

Conflicts:
	vendor/built_in_modules/personal_book/app/controllers/panel/personal_book/desktop/personal_books_controller.rb
	vendor/built_in_modules/personal_book/app/views/panel/personal_book/desktop/personal_books/index.html.erb
	vendor/built_in_modules/personal_conference/app/assets/javascripts/personal_conference/desktop/conference_pages.js
	vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/desktop/conference_pages/index.html.erb
	vendor/built_in_modules/personal_journal/app/assets/javascripts/personal_journal/desktop/journal_pages.js
	vendor/built_in_modules/personal_journal/app/controllers/panel/personal_journal/desktop/journal_pages_controller.rb
	vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/desktop/journal_pages/index.html.erb
2014-01-13 15:57:49 +08:00
app added sync for journal paper books and conference.. and also disabled the icons 2014-01-13 15:57:49 +08:00
config Added sync button in personal plugin back_end 2014-01-13 15:57:49 +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 both manual and automatic methods working 2014-01-13 15:57:49 +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 added sync for journal paper books and conference.. and also disabled the icons 2014-01-13 15:57:49 +08:00
.gitignore form validations and ajax check plus user approval done 2013-11-29 16:40:46 +08:00
.rspec Merge with sub_roles 2011-12-23 18:34:21 +08:00
Gemfile Added Automatic Synchronize 2014-01-13 15:57:48 +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 Updated Readme 2014-01-13 09:40:12 +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
orbitdefault.zip Fixed site build rake and added default design package 2013-12-21 16:06:08 +08:00

README.md

Ruling Orbit

RulingSite-s Version 4.0 Beta