Bernie Chiu
|
577f29e26e
|
Fix conflict YML naming
|
2013-12-27 11:10:11 +08:00 |
|
Bernie Chiu
|
1124d6d239
|
Tanslations for preference setting
|
2013-12-24 17:56:41 +08:00 |
thomaschen
|
8065d2fedd
|
more translation for chinese...
|
2013-12-24 17:33:03 +08:00 |
|
thomaschen
|
229a15f03f
|
fix some missing chinese translation
|
2013-12-24 17:32:56 +08:00 |
|
Bernie Chiu
|
225d0174d7
|
Translations for search engine
|
2013-12-24 17:03:23 +08:00 |
|
thomaschen
|
c54c12c1ff
|
add Chinese version sidebar Menu in Site Setting
Conflicts:
config/locales/en.yml
|
2013-12-24 17:00:13 +08:00 |
saurabhbhatia
|
a5705a57d9
|
Revert "add Chinese version sidebar Menu in Site Setting"
This reverts commit 4201617a76.
|
2013-12-24 16:56:29 +08:00 |
|
thomaschen
|
4201617a76
|
add Chinese version sidebar Menu in Site Setting
Conflicts:
config/locales/en.yml
|
2013-12-24 16:51:50 +08:00 |
|
thomaschen
|
ebeb243249
|
add details for button in site info
|
2013-12-24 16:42:37 +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 |
|
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 |
|
Harry Bomrah
|
f1c2e29bf1
|
form validations and ajax check plus user approval done
|
2013-11-29 16:40:46 +08:00 |
|
saurabhbhatia
|
38b2d02d92
|
Email added to Signup Form
|
2013-11-28 18:06:14 +08:00 |
|
saurabhbhatia
|
1a4c689ee6
|
Fixed application locale
|
2013-11-28 12:28:43 +08:00 |
|
saurabhbhatia
|
8e6cf99b08
|
Stay on the same tab
|
2013-11-28 11:01:21 +08:00 |
|
saurabhbhatia
|
fa85920043
|
Fixed orbit bar theme
|
2013-11-28 10:18:13 +08:00 |
|
Harry Bomrah
|
0338557a33
|
redirection to login page after creating new user, account validation done, fill in all languages for names also done plus the name error in the backend for noname or half filled profile is also fixed
|
2013-11-27 20:39:00 +08:00 |
|
saurabhbhatia
|
6d5dd4a80f
|
Changed Site Valid Locales to In Use Locales
|
2013-11-27 17:51:48 +08:00 |
|
Harry Bomrah
|
8d7e350c32
|
facebook login and import done
|
2013-11-27 09:46:02 +08:00 |