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 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
..
assets	new ui add setting to show in the member frontend	2014-01-03 16:35:52 +08:00
controllers	added sync for journal paper books and conference.. and also disabled the icons	2014-01-23 11:59:58 +08:00
errors	show error message when trying to show a not existed page	2013-01-03 13:50:27 +08:00
helpers	Removed banner_nav.css and default_widget.css in application_helper.rb	2014-01-14 16:19:50 +08:00
jobs	ask module: dropdown, icon, big5 encoding, redirect, admin, send mail	2013-06-07 13:03:59 +08:00
mailer	Channel Videos Mobile Sites Partial	2013-12-03 15:50:27 +08:00
models	Fix for submenu automation	2014-01-07 17:56:58 +08:00
uploaders	fix new ui member-pic default size 200 * 200	2014-01-22 10:35:21 +08:00
views	Import Data, Sync Data	2014-01-23 11:59:58 +08:00