 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 |
Manson Wang
|
668c1e7d75
|
Added sync button in personal plugin back_end
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
vendor/built_in_modules/personal_book/app/views/panel/personal_book/plugin/_profile.html.erb
vendor/built_in_modules/personal_conference/app/views/panel/personal_conference/plugin/_profile.html.erb
vendor/built_in_modules/personal_journal/app/views/panel/personal_journal/plugin/_profile.html.erb
|
2014-01-23 11:59:58 +08:00 |
saurabhbhatia
|
56ad1ddd91
|
Updated Import data without page method
|
2014-01-23 11:59:58 +08:00 |
|
saurabhbhatia
|
c3ece3b7af
|
both manual and automatic methods working
Conflicts:
config/routes.rb
|
2014-01-23 11:59:58 +08:00 |
|
saurabhbhatia
|
3b73fab8e2
|
Added Automatic Synchronize
Conflicts:
Gemfile
app/controllers/admin/import_data_controller.rb
vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
Conflicts:
Gemfile
app/controllers/admin/import_data_controller.rb
|
2014-01-23 11:59:58 +08:00 |
|
saurabhbhatia
|
5fee058006
|
Import Data, Sync Data
Conflicts:
config/mongoid.yml
vendor/built_in_modules/personal_book/app/models/writing_book.rb
vendor/built_in_modules/personal_conference/app/models/writing_conference.rb
vendor/built_in_modules/personal_journal/app/models/writing_journal.rb
|
2014-01-23 11:59:58 +08:00 |