 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 |
|
Harry Bomrah
|
1a90990311
|
template_store and some changes for the store..
|
2014-01-06 14:56:04 +08:00 |
|
saurabhbhatia
|
9643de5d56
|
Fixed Forgot password
|
2014-01-02 17:53:05 +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 |
thomaschen
|
3b0113d9a7
|
add sitmap submenu chinese translation as well
|
2013-12-24 17:47:55 +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 |
|
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 |
|
saurabhbhatia
|
85778224a1
|
Fixed langauge system tab
|
2013-12-12 10:24:20 +08:00 |
|
Harry Bomrah
|
0671d0b126
|
filemanger authentication changes and also announcement preview fixed and also text search for files
Conflicts:
app/views/admin/assets/index.html.erb
|
2013-12-11 18:49:54 +08:00 |
|
Harry Bomrah
|
a02cd97880
|
file manger preview and pagination is done.
|
2013-12-11 14:41:08 +08:00 |
|
Harry Bomrah
|
800f108be3
|
added enabling and disabling feature of widget count in module init
|
2013-12-10 17:43:31 +08:00 |
|
Harry Bomrah
|
51f170589f
|
now we can set two colors gradient for orbit bar
|
2013-12-10 09:58:58 +08:00 |
|
saurabhbhatia
|
050f2dedff
|
Fixed browser locale issue occuring due to zh
|
2013-12-09 12:37:52 +08:00 |
|
saurabhbhatia
|
b1936fcae9
|
Fixed backup locale and browser locale
|
2013-12-09 12:06:19 +08:00 |
|
saurabhbhatia
|
88260d59e7
|
fix for default locale
|
2013-12-09 11:10:55 +08:00 |
|
saurabhbhatia
|
87c3090784
|
Fixed Language issue with browser language
|
2013-12-06 17:17:39 +08:00 |
|
Harry Bomrah
|
d8cf721a5b
|
rescue added for the previous feature
|
2013-12-05 17:30:41 +08:00 |
|
Harry Bomrah
|
9db4c787c9
|
approve and delete all done with registration approval notification for admin
|
2013-12-05 17:30:33 +08:00 |
|
saurabhbhatia
|
0eb8e1a305
|
Add phone number and address, dynamic map to mobile site
|
2013-12-05 17:27:30 +08:00 |
|
saurabhbhatia
|
947c907f73
|
Fixed Mobile Site
|
2013-12-04 18:07:27 +08:00 |
|
saurabhbhatia
|
53a51cc796
|
Removed unnecessary code
|
2013-12-04 17:13:02 +08:00 |
|
saurabhbhatia
|
7f4d4ae93f
|
Announcement Categories in Mobile settings
|
2013-12-04 17:12:25 +08:00 |
|
saurabhbhatia
|
2b4fa96b74
|
No email for user if added by admin
|
2013-12-04 14:38:22 +08:00 |
|
Manson Wang
|
4b169cf2e0
|
Fix desktop nil theme bug and approval for new user
|
2013-12-04 13:43:00 +08:00 |
|
saurabhbhatia
|
9f3042c4fe
|
Fix for mailer
|
2013-12-04 11:42:39 +08:00 |
|
saurabhbhatia
|
e87c678eb7
|
Channel Videos Mobile Sites Partial
|
2013-12-03 15:50:27 +08:00 |
|
saurabhbhatia
|
888f41a959
|
Added condition for default locale present
|
2013-12-02 14:30:12 +08:00 |
|
saurabhbhatia
|
d0d6a4147e
|
Fixed Default Locale
|
2013-12-02 13:24:41 +08:00 |
|
Harry Bomrah
|
8c4d6b972a
|
minor fix for emailers and facebook
|
2013-12-02 12:10:17 +08:00 |
|
saurabhbhatia
|
18a1701472
|
Fixed Default Locale
|
2013-11-29 21:37:25 +08:00 |
|
saurabhbhatia
|
7cfd9080e8
|
correct signup workflow
|
2013-11-29 19:00:32 +08:00 |
|
Harry Bomrah
|
b10a2edc22
|
redirects are ok now
Conflicts:
app/controllers/application_controller.rb
app/controllers/confirmations_controller.rb
|
2013-11-29 18:52:57 +08:00 |
|
saurabhbhatia
|
6e9c21781c
|
Confirmations Workflow working
|
2013-11-29 18:46:07 +08:00 |
|
Harry Bomrah
|
f1c2e29bf1
|
form validations and ajax check plus user approval done
|
2013-11-29 16:40:46 +08:00 |
|
saurabhbhatia
|
f4be776697
|
added after confirmation path
|
2013-11-29 12:31:50 +08:00 |
|
saurabhbhatia
|
f509e74938
|
Rescue nil in Albums
|
2013-11-28 16:22:03 +08:00 |