Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI

# Conflicts:
#	templates/js/services/apiService.js
This commit is contained in:
Matan Bar Yosef 2015-06-26 16:58:55 +03:00
parent 5ec2ed20bd
commit 91ac400452

View file

@ -99,8 +99,6 @@ service.factory('apiService', ['$http', function($http) {
};
return $http(req);
},
getCampusesByUser: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/courses/getCampusesByUser/" + token;
getCampusesByUser: function(token){
var url = (DEBUG ? "http://localhost:8080" : "http://se-hub.appspot.com") + "/api/campuses/getCampusesByUser/" + token;
req = {