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 |
|
saurabhbhatia
|
b82565fa92
|
Removed Unnecessary add button
|
2014-01-08 12:47:44 +08:00 |
 Harry Bomrah
|
1a90990311
|
template_store and some changes for the store..
|
2014-01-06 14:56:04 +08:00 |
Spen
|
e4cc6d543b
|
new ui add setting to show in the member frontend
|
2014-01-03 16:35:52 +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
|
6c3f4bff8c
|
new stuff for gmail and fb
|
2013-12-27 10:16:29 +08:00 |
|
Bernie Chiu
|
2fd5d8f321
|
Tanslations for preference setting
|
2013-12-24 17:47:09 +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
|
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 |
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 |
|
saurabhbhatia
|
6c01d517d2
|
Fixed page data count
|
2013-12-12 12:49:20 +08:00 |
|
Harry Bomrah
|
053144dfa4
|
widget count fixed for new widgets in page widget settings
|
2013-12-11 19:37:39 +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 |
|
rulingcom
|
a82022c958
|
ray fix design for filemanager
|
2013-12-11 17:59:14 +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 |
|
saurabhbhatia
|
2a41e90bc1
|
Ray's fixes for the file manager
|
2013-12-10 17:40:13 +08:00 |
|
saurabhbhatia
|
fd560935cd
|
Fixed the order of the fields in responsive settings page
|
2013-12-10 10:17:10 +08:00 |
|
Harry Bomrah
|
51f170589f
|
now we can set two colors gradient for orbit bar
|
2013-12-10 09:58:58 +08:00 |
|
saurabhbhatia
|
513a8e3c20
|
Rescued Nil
|
2013-12-09 16:36:28 +08:00 |
|
saurabhbhatia
|
ba8ce81195
|
corrected wrong field name in the front end
|
2013-12-09 15:47:29 +08:00 |
|
saurabhbhatia
|
64e3830673
|
frontend with mobile bar color
|
2013-12-09 15:43:20 +08:00 |
|
saurabhbhatia
|
6f397868ec
|
Added field for colour setting
|
2013-12-09 15:18:11 +08:00 |
|
saurabhbhatia
|
e15cf5cfca
|
Added Mobile Site Icon for the website
|
2013-12-09 14:54:36 +08:00 |
|
saurabhbhatia
|
3bb1baf013
|
Phone number display in mobile site
|
2013-12-06 17:00:43 +08:00 |
|
saurabhbhatia
|
e145f4e4a9
|
Fixed asset precompile
|
2013-12-05 19:11:28 +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
|
23071a364d
|
Site rescue nil
|
2013-12-04 17:48:23 +08:00 |
|
saurabhbhatia
|
7f4d4ae93f
|
Announcement Categories in Mobile settings
|
2013-12-04 17:12:25 +08:00 |
|
saurabhbhatia
|
a09133b164
|
removed announcement category from responsive setting page
|
2013-12-04 11:46:03 +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 |
|
Manson Wang
|
a433f4f9a4
|
Fix site preference page
|
2013-12-02 12:33:43 +08:00 |
|
Manson Wang
|
d1c532e8f4
|
Fix site setting default-language changing effect
|
2013-12-02 12:15:42 +08:00 |
|
Harry Bomrah
|
8c4d6b972a
|
minor fix for emailers and facebook
|
2013-12-02 12:10:17 +08:00 |
|
saurabhbhatia
|
685f696536
|
Added Sendgrid details for production
|
2013-12-02 10:42:12 +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 |