few updates with fb integration and some other changes in user and supports data to android
Conflicts: vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
This commit is contained in:
1 parent
ac58b993c2
commit
5f9190db39
14 files changed
+258
-278
No files matched your search
@@ -289,6 +289,9 @@ Orbit::Application.routes.draw do
|
||||
match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
|
||||
match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan'
|
||||
|
||||
match "/facebook/register_fb" => "facebook#register_fb"
|
||||
match "/facebook/get_friends" => "facebook#get_friends"
|
||||
|
||||
|
||||
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#create_journal'
|
||||
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
|
||||
|
||||
Reference in new issue
Block a user