developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,614 Commits 9 Branches 0 Tags 55 MiB
Commit Graph

601 Commits

Author SHA1 Message Date
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
Manson Wang 332658d394 Fix translations and side_bar order 2014-01-16 10:45:58 +08:00
Saurabh Bhatia a108426412 Updated Module Store to Install a Module directly from Store.tp 2014-01-14 11:20:30 +08:00
Manson Wang a154d16a7e Update Manager 2014-01-13 18:07:07 +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 d90351b82c Changed production settings for sendgrid 2014-01-03 09:44:46 +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
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
saurabhbhatia b51030ac14 modified breadcrumb 2013-12-25 12:09:02 +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
Bernie Chiu e375a28f5a Fix missing YML title 2013-12-24 15:28:47 +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
thomaschen 66907d0ab9 add details for button in site info 
Conflicts:
	config/locales/en.yml
 2013-12-23 09:56:36 +08:00
thomaschen bc7ad1356a add Chinese version sidebar Menu in Site Setting 2013-12-20 18:45:20 +08:00
saurabhbhatia 84edbdb6db Changed Search to Elastic Search 2013-12-20 18:41:12 +08:00
saurabhbhatia fd24fbe082 Commit for Basic Site 2013-12-16 16:08:12 +08:00
saurabhbhatia b52e6b979b Removed announcement index as it not required anymore 2013-12-13 11:52:37 +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
Harry Bomrah 9db4c787c9 approve and delete all done with registration approval notification for admin 2013-12-05 17:30:33 +08:00
saurabhbhatia fda0abdd25 Updated production settings 2013-12-04 11:54:00 +08:00
saurabhbhatia e87c678eb7 Channel Videos Mobile Sites Partial 2013-12-03 15:50:27 +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
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 1584eeaf27 Updated Production Settings with Sendgrid 2013-11-29 16:39:27 +08:00
saurabhbhatia 9347cd0463 Rake task for confirming and approving existing users 2013-11-29 13:06:36 +08:00
saurabhbhatia ea6909a6b0 Mailer now working in production added scope for pending users 2013-11-29 12:03:16 +08:00
saurabhbhatia 9bc79fddd7 Email confirmation for user working 2013-11-29 09:26:52 +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
Harry Bomrah 73b82bc177 second commit for harry.tp 2013-11-27 09:46:00 +08:00
Harry Bomrah 12127a8d6c commit for harry.tp 2013-11-27 09:45:57 +08:00
saurabhbhatia dead52d8ab Changes in Registration Process 2013-11-25 17:05:36 +08:00
saurabhbhatia 03957f565b Added Mobile Web as a separate page 2013-11-25 12:43:23 +08:00
saurabhbhatia 35ce0fda6e Enable Mobile Added to Site preferences 2013-11-20 16:21:05 +08:00
Manson Wang fbb0bf6e04 Changed config/sunspot.yml to be compatible with sunspot v2.1.0 2013-11-19 16:58:37 +08:00
saurabhbhatia c545c6f172 API for Locations 2013-11-19 16:24:15 +08:00
Harry Bomrah 4888195566 more button works according to categories 2013-11-15 22:35:20 +08:00
saurabhbhatia ce8e9c0a5f Revert "more button fix and also new way to select more page." 
This reverts commit e129b25554.
 2013-11-15 16:58:27 +08:00
Harry Bomrah e129b25554 more button fix and also new way to select more page. 2013-11-15 15:13:58 +08:00