diff --git a/Lab1/client.css b/Lab1/client.css index bda747561c6a038f4a22b482b2252a041a8c99c6..914dd29d2d59f9f3ad4bff7eff5edd3c4406bd00 100644 --- a/Lab1/client.css +++ b/Lab1/client.css @@ -167,16 +167,6 @@ img { width: 460px; } -<<<<<<< HEAD -======= -#HP_wall{ - height: 400px; - margin-top: 10px; - overflow: auto; - width: 480px; -} - ->>>>>>> cb4e50a33e19b53328badcdf131908693b4ac41b #BP_sbutton { margin-bottom: 5px; margin-top: 10px; diff --git a/Lab1/client.js b/Lab1/client.js index 9434494734e7c3c4fe442740bf1ba117ff0b3127..cc9dacb3bde817e3e3fa6367aa499adff1942836 100644 --- a/Lab1/client.js +++ b/Lab1/client.js @@ -224,9 +224,11 @@ function openTab(tabName) { function display_wall_info(email, tab) { //check if we already have the data stored of if we have to call the server - if((localStorage.getItem("browsed_email") === null) || localStorage.getItem("browsed_email") != email || data_user === null) { + /*if((localStorage.getItem("browsed_email") === null) || localStorage.getItem("browsed_email") != email || data_user === null) { data_user = serverstub.getUserDataByEmail(localStorage.getItem("token"), email); - } + }*/ + + data_user = serverstub.getUserDataByEmail(localStorage.getItem("token"), email); if(data_user.success) { if(tab == "BP") {