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.
orbit-4-1/vendor/built_in_modules/personal_book
Harry Bomrah 5de7fcfaf6 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-23 11:59:58 +08:00
..
app added sync for journal paper books and conference.. and also disabled the icons 2014-01-23 11:59:58 +08:00
config fix new ui member plugins and member frontend page 2013-11-21 12:10:01 +08:00
lib Plugins 2012-09-14 00:05:31 +08:00
script Plugins 2012-09-14 00:05:31 +08:00
test Plugins 2012-09-14 00:05:31 +08:00
.gitignore Plugins 2012-09-14 00:05:31 +08:00
Gemfile Plugins 2012-09-14 00:05:31 +08:00
MIT-LICENSE Plugins 2012-09-14 00:05:31 +08:00
README.rdoc Plugins 2012-09-14 00:05:31 +08:00
Rakefile Plugins 2012-09-14 00:05:31 +08:00
init.rb new ui member plugin sort fix and user show avatar fix 2013-09-27 11:04:52 +08:00
personal_book.gemspec Plugins 2012-09-14 00:05:31 +08:00
personal_book.json Plugins 2012-09-14 00:05:31 +08:00

README.rdoc

= PersonalBook

This project rocks and uses MIT-LICENSE.