saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,553 Commits 5 Branches 0 Tags 52 MiB
Commit Graph

581 Commits

Author SHA1 Message Date
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
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
Harry Bomrah f91c08ce4b color added to location categories. 2013-11-12 16:45:42 +08:00
rulingcom 528f7d28b9 theaterurk fix 2013-11-12 12:20:36 +08:00
saurabhbhatia 5e0696890a Updated Remember me, and Homepage widget more link 2013-11-11 17:23:03 +08:00
rulingcom 72a37afddb announcment fixed for frontend 2013-11-08 17:37:55 +08:00
rulingcom b1867dd47a new code logic for saving tree.. should work fine even if the node positions fail 2013-11-04 22:20:50 +08:00
Manson Wang 7ad05ef034 Dashboard with Google Chart 2013-11-04 17:48:51 +08:00
saurabhbhatia d636248073 Updated Sidebar, Application Controllers 2013-11-01 16:42:39 +08:00
Manson Wang a885313e75 Dashboard with HighChart 2013-10-30 18:23:46 +08:00
chris a14d69211b PagePart widgets for "system widget" 
Delete useless code
 2013-10-28 16:29:23 +08:00
chris 218cb03641 PagePart widgets except "system widget" 2013-10-28 16:29:23 +08:00
chris f3b3c94b42 Item control iframe dom 
Css for preview
 2013-10-26 18:58:53 +08:00
saurabhbhatia 13da6fc6a1 Added a new rake task with arguments 2013-10-25 21:59:03 +08:00
chris 8ebfac2b99 Structure link with json 2013-10-23 18:39:40 +08:00
chris a4d1c68299 Structure page with json 2013-10-23 18:39:35 +08:00
Spen c76adc1896 new ui member account privilege fix 2013-10-21 10:42:50 +08:00
chris 92d2af13f2 changes for ad_banner 2013-10-19 19:17:04 +08:00
chris 68a379f8a4 Some fixes for tags: authorization, translation… 
can_use now takes all the open_for into account
 2013-10-19 19:14:31 +08:00
Spen 00e9a5df5b new ui member settings account data 
Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb
	config/locales/en.yml
	config/routes.rb
 2013-10-18 22:28:27 +08:00
Spen 14d2b0cc76 fix new ui member account privilege 2013-10-18 19:52:36 +08:00
saurabhbhatia 3e491380cd Revert "new ui member settings account data" 
This reverts commit e1f4ee464b.
 2013-10-18 19:51:02 +08:00