surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Aggiornamento a 0.6.1"

Browse Source 
This reverts commit 701e1f1968.
This commit is contained in:
Surya Paolo
2023-04-07 18:38:46 +02:00
parent eb4998dcd2
commit 9c08ebaacd
10 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.development
View File

@@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
APP_VERSION="0.5.84" APP_VERSION="0.5.84"
======= =======
APP_VERSION="0.5.85" APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

4
.env.example.production
View File

@@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
APP_VERSION="0.5.84" APP_VERSION="0.5.84"
======= =======
APP_VERSION="0.5.85" APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

4
.env.test.risosrv
View File

@@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
APP_VERSION="0.5.84" APP_VERSION="0.5.84"
======= =======
APP_VERSION="0.5.85" APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

4
_ALL_SITES/riso.app/.env.development
View File

@@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
APP_VERSION="0.5.84" APP_VERSION="0.5.84"
======= =======
APP_VERSION="0.5.85" APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

4
_ALL_SITES/riso.app/.env.production
View File

@@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
APP_VERSION="0.5.84" APP_VERSION="0.5.84"
======= =======
APP_VERSION="0.5.85" APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13" APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet DIRECTORY_LOCAL=newfreeplanet

4
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,8 +1,12 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
APP_VERSION="0.5.84" APP_VERSION="0.5.84"
======= =======
APP_VERSION="0.5.85" APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
APP_VERSION="0.5.85"
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
SERVICE_WORKER_FILE="service-worker.js" SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14" APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet" DIRECTORY_LOCAL="newfreeplanet"

6
src/components/CGridTableRec/CGridTableRec.vue
View File

@@ -1105,13 +1105,19 @@
</CMyCardCircuitPopup> </CMyCardCircuitPopup>
<CMyCardService v-else-if="mytable === 'myskills'" <CMyCardService v-else-if="mytable === 'myskills'"
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
=======
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
:table="mytable" :prop_myrec="myrecdialog"> :table="mytable" :prop_myrec="myrecdialog">
</CMyCardService> </CMyCardService>
<CMyCardService v-else-if="mytable === 'mygoods'" <CMyCardService v-else-if="mytable === 'mygoods'"
:table="mytable" :prop_myrec="myrecdialog"> :table="mytable" :prop_myrec="myrecdialog">
</CMyCardService> </CMyCardService>
<CMyCardService v-else-if="mytable === 'myhosps'" <CMyCardService v-else-if="mytable === 'myhosps'"
<<<<<<< HEAD
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
:table="mytable" :prop_myrec="myrecdialog"> :table="mytable" :prop_myrec="myrecdialog">
</CMyCardService> </CMyCardService>

3
src/components/CMyCardService/CMyCardService.vue
View File

@@ -146,9 +146,12 @@
}}</q-item-label> }}</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<q-item> <q-item>
======= =======
=======
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
<q-item v-if="getSectorByRec(myrec)"> <q-item v-if="getSectorByRec(myrec)">
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)

3
src/css/app.scss
View File

@@ -1630,4 +1630,7 @@ h3 {
color: grey; color: grey;
font-size: 0.8rem; font-size: 0.8rem;
} }
<<<<<<< HEAD
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
=======
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1) >>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)

5
src/statics/lang/it.js
View File

@@ -1489,6 +1489,11 @@ const msg_it = {
bookmark_set: 'Aggiunto ai Segnalibri', bookmark_set: 'Aggiunto ai Segnalibri',
bookmark_unset: 'Rimosso dai Segnalibri', bookmark_unset: 'Rimosso dai Segnalibri',
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
favorite: 'Utenti Favoriti',
bookmark: 'Utenti Segnalibri',
>>>>>>> parent of 701e1f1 (Aggiornamento a 0.6.1)
======= =======
favorite: 'Utenti Favoriti', favorite: 'Utenti Favoriti',
bookmark: 'Utenti Segnalibri', bookmark: 'Utenti Segnalibri',