manson666
|
077e98a6d4
|
Fix Sync auto rescue timeout and filter user email for ntu only
|
2014-01-13 15:57:49 +08:00 |
|
manson666
|
52f8e9f1b8
|
Fix Sync timeout issue
|
2014-01-13 15:57:49 +08:00 |
|
manson666
|
aca97f85d8
|
Fix sync auto not deleting old data
|
2014-01-13 15:57:49 +08:00 |
|
manson666
|
1a79c2fed3
|
Fix sync auto
|
2014-01-13 15:57:49 +08:00 |
Spen
|
8fb3b408b4
|
ntu coph sso
|
2014-01-13 15:57:49 +08:00 |
|
Spen
|
0dff9163bc
|
ntu coph member plugin data sync
|
2014-01-13 15:57:49 +08:00 |
 Harry Bomrah
|
b533b3f6ea
|
sync button added for desktop and also fixed a little bug..
|
2014-01-13 15:57:49 +08:00 |
|
Manson Wang
|
2a83c6b51d
|
Desktop sync button.. not finished
|
2014-01-13 15:57:49 +08:00 |
|
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 |
|
Manson Wang
|
671257992a
|
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-13 15:57:49 +08:00 |
saurabhbhatia
|
280523fbeb
|
Updated Import data without page method
|
2014-01-13 15:57:49 +08:00 |
|
saurabhbhatia
|
07964de968
|
both manual and automatic methods working
Conflicts:
config/routes.rb
|
2014-01-13 15:57:49 +08:00 |
|
saurabhbhatia
|
d226b34de5
|
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-13 15:57:48 +08:00 |
|
saurabhbhatia
|
43da2eca79
|
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-13 15:57:48 +08:00 |
|
Manson Wang
|
bba0e436d9
|
Fix missing CSS and removed useless bad gems that cause error
|
2014-01-13 15:43:51 +08:00 |
|
saurabhbhatia
|
b82565fa92
|
Removed Unnecessary add button
|
2014-01-08 12:47:44 +08:00 |
|
saurabhbhatia
|
aaf7f7362c
|
Fix for submenu automation
|
2014-01-07 17:56:58 +08:00 |
|
saurabhbhatia
|
3938f7df06
|
Updated Items
|
2014-01-07 15:51:07 +08:00 |
|
Harry Bomrah
|
1a90990311
|
template_store and some changes for the store..
|
2014-01-06 14:56:04 +08:00 |
|
saurabhbhatia
|
c62b8d4d37
|
Disable confirmation email for guest user
|
2014-01-03 17:35:56 +08:00 |
|
Spen
|
e4cc6d543b
|
new ui add setting to show in the member frontend
|
2014-01-03 16:35:52 +08:00 |
|
saurabhbhatia
|
ca8c895ac8
|
Removed update taggable ids method
|
2014-01-03 16:02:56 +08:00 |
|
saurabhbhatia
|
9643de5d56
|
Fixed Forgot password
|
2014-01-02 17:53:05 +08:00 |
thomaschen
|
6a6640b84c
|
fix chinese translation
|
2013-12-27 18:10:44 +08:00 |
Bernie Chiu
|
40df7d3531
|
Fix to proper translations
|
2013-12-27 18:10:12 +08:00 |
|
saurabhbhatia
|
b5c1bfa27e
|
Corrected Breadcrumb
|
2013-12-27 15:37:24 +08:00 |
|
Bernie Chiu
|
936a4e148c
|
Fix conflict YML naming
|
2013-12-27 11:20:00 +08:00 |
|
Harry Bomrah
|
6f44554822
|
facebook feed for desktop
|
2013-12-27 10:16:32 +08:00 |
|
Harry Bomrah
|
6c3f4bff8c
|
new stuff for gmail and fb
|
2013-12-27 10:16:29 +08:00 |
RulingDigital
|
a1a15775e9
|
Upload Desktop themes
|
2013-12-26 14:13:34 +08:00 |
|
saurabhbhatia
|
b51030ac14
|
modified breadcrumb
|
2013-12-25 12:09:02 +08:00 |
|
thomaschen
|
3b0113d9a7
|
add sitmap submenu chinese translation as well
|
2013-12-24 17:47:55 +08:00 |
|
Bernie Chiu
|
2fd5d8f321
|
Tanslations for preference setting
|
2013-12-24 17:47:09 +08:00 |
|
thomaschen
|
63c018388e
|
add translation for terms of use frontpage ui
|
2013-12-24 16:14:56 +08:00 |
|
saurabhbhatia
|
a4c826dd48
|
Fixed module store
|
2013-12-24 15:58:13 +08:00 |
|
thomaschen
|
f01c22ec28
|
fix error in last commit
|
2013-12-24 15:16:36 +08:00 |
|
thomaschen
|
8cdcb18976
|
fix translation conflict and breadcrumb divider
|
2013-12-24 15:16:31 +08:00 |
|
Bernie Chiu
|
8fcb9d2124
|
Translations for search engine
|
2013-12-24 12:55:56 +08:00 |
|
Bernie Chiu
|
37957c54ef
|
Translations for mobile setting
Conflicts:
config/locales/en.yml
config/locales/zh_tw.yml
|
2013-12-24 12:55:43 +08:00 |
|
saurabhbhatia
|
bc2d7e165b
|
made settings localized in orbit backend
|
2013-12-24 12:48:44 +08:00 |
|
saurabhbhatia
|
58dadb07b1
|
Breadcrumb for site settings
|
2013-12-23 18:33:40 +08:00 |
|
thomaschen
|
66907d0ab9
|
add details for button in site info
Conflicts:
config/locales/en.yml
|
2013-12-23 09:56:36 +08:00 |
|
Harry Bomrah
|
96ea9c97e1
|
breadcrumb for site settings fixed for dashboards
|
2013-12-20 18:50:39 +08:00 |
|
thomaschen
|
bc7ad1356a
|
add Chinese version sidebar Menu in Site Setting
|
2013-12-20 18:45:20 +08:00 |
|
saurabhbhatia
|
fd24fbe082
|
Commit for Basic Site
|
2013-12-16 16:08:12 +08:00 |
|
saurabhbhatia
|
dccb9c75d8
|
Page Parts now working
|
2013-12-13 18:40:15 +08:00 |
|
Bernie Chiu
|
eb638995f0
|
Fix missing params category value
|
2013-12-13 16:19:19 +08:00 |
|
Manson Wang
|
e9a40774ac
|
Add phone numbers to mobile front_end
|
2013-12-12 17:59:56 +08:00 |
|
Manson Wang
|
afb5afeceb
|
Added multi-phone numbers in mobile setting page and fixed language setting
|
2013-12-12 16:07:27 +08:00 |
rulingcom
|
4c85d62866
|
ray fix for css and filemanager
|
2013-12-12 15:39:20 +08:00 |