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
..
built_in_modules	added sync for journal paper books and conference.. and also disabled the icons	2014-01-13 15:57:49 +08:00
plugins	New and Announcement search. Disabled impression.	2012-07-20 15:47:40 +08:00