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.

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
..
assets	added sync for journal paper books and conference.. and also disabled the icons	2014-01-13 15:57:49 +08:00
controllers	Import Data, Sync Data	2014-01-13 15:57:48 +08:00
helpers	fixed file view on server for desktop	2013-10-14 16:49:54 +08:00
mailers	relpace seminar to conference	2013-02-04 18:01:38 +08:00
models	Import Data, Sync Data	2014-01-13 15:57:48 +08:00
views	added sync for journal paper books and conference.. and also disabled the icons	2014-01-13 15:57:49 +08:00