Commit 0b64f57b authored by Hadrien RENAUD's avatar Hadrien RENAUD

Merge branch 'master' into 'develop'

MAJ depuis prod

See merge request !9
parents 041a62b4 9105e096
Pipeline #4656 passed with stage
in 12 minutes and 23 seconds
......@@ -403,7 +403,7 @@ angular.module('bars.admin.food', [
.controller('admin.ctrl.food.autoappro.picard',
['$scope', '$http', '$modal', '$state', 'admin.appro',
function($scope, $http, $modal, $state, Appro) {
var PICARD_URL = AUTOAPPRO_URL + '/picard'; // Reverse proxy in the school
var PICARD_URL = 'http://chocapix/autoappro/picard'; // Reverse proxy in the school
var token;
function connexion(login, password) {
$scope.stape1.loading = true;
......@@ -488,7 +488,7 @@ angular.module('bars.admin.food', [
.controller('admin.ctrl.food.autoappro.houra',
['$scope', '$http', '$modal', '$state', 'admin.appro',
function($scope, $http, $modal, $state, Appro) {
var HOURA_URL = AUTOAPPRO_URL + '/houra'; // Reverse proxy in the school
var HOURA_URL = 'http://chocapix/autoappro/houra'; // Reverse proxy in the school
var auth;
function connexion(login, password, zipcode) {
$scope.stape1.loading = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment