diff --git a/README.md b/README.md index 610e210..82a469f 100644 --- a/README.md +++ b/README.md @@ -53,11 +53,11 @@ Logiciel testé et validé sur les configurations suivantes : VERSION ACTUELLE -Date: 18/02/2020 -Version: 2.13.15 -Author: EP +Date: 28/02/2020 +Version: 2.14.0 +Author: Jeanne Prugniel (stagiaire CRAL) Commentaire: - cleanup et bugfix accent perdu sur menu gauche + Application maintenant "responsive" avec l'utilisation de boostrap (ok sur pc, tablette, et mobile) IMPORTANT : - Pour connaitre la version actuelle, taper "./VERSION" @@ -92,29 +92,32 @@ La liste ci-dessous n'est plus à jour, elle est désormais en ligne ici : https ----------------------------------------------------------------------------------------------------------- -29/01-17/02/2020 Version: 2.13.13-14 (EP) +18/02/2020 Version 2.13.15 (EP) + Cleanup et bugfix accent perdu sur menu gauche (mac only !!!) + +29/01-17/02/2020 Version 2.13.13-14 (EP) Ajout bootstrap-ui -21/01/2019 Version: 2.13.12 (EP) +21/01/2019 Version 2.13.12 (EP) Bugfix connexion superadmin en mode SANS LDAP (en cours...) Bugfix et amélioration script installation (script création users BDD...) Amélioration script update (ajout mise à jour auto des plugins php) -17/07/2019 Version: 2.13.10 (EP) +17/07/2019 Version 2.13.10 (EP) Bugfix et grosse amelioration : validation d'un materiel TECHNIQUE => desormais possible pour un Responsable de groupe (metier ou thematique) Bugfix : depuis la vue d'un matériel, actions faites sur matériel (valider, invalider, tba, archiver) ramènent à cette fiche Bugfix : emails envoyés aux responsables sur action sur un matos (valider, invalider, tba, archive) ne plantent plus !!! Refactorisation des ACL => toujours plus simple -13/06/2019 Version: 2.13.9 (EP) +13/06/2019 Version 2.13.9 (EP) Refonte des fichiers d'installation (installation.sh et fichiers BD) -13/06/2019 Version: 2.13.7-8 (EP) +13/06/2019 Version 2.13.7-8 (EP) Bugfix envoi mail avec doc (photo) attachée Ajout 2 logos pour le CRAL -06/06/2019 Version: 2.13.0-6 (EP) +06/06/2019 Version 2.13.0-6 (EP) LDAP CACHED cleanup Bugfixed materiels/find/puis tri /puis export CSV (ne marchait pas) Amélioration materiels/index Export CSV => trié par numéro labo (desc) @@ -122,18 +125,18 @@ La liste ci-dessous n'est plus à jour, elle est désormais en ligne ici : https Bugfix fichiers liés send by email (webroot) Adapté code pour doc admission pour le CRAL -06/06/2019 Version: 2.12.28-35 (EP) +06/06/2019 Version 2.12.28-35 (EP) LDAP CACHED v8 Nouvelle fonction $mydebug($D, $arg) disponible dans toutes les vues Pagination Utilisateurs avec "debut" et "fin" -05/06/2019 Version: 2.12.27 (EP) +05/06/2019 Version 2.12.27 (EP) Bugfix et Améliorations Export CSV -04/06/2019 Version: 2.12.26 (EP) +04/06/2019 Version 2.12.26 (EP) Bugfix et Améliorations Emprunt -03/06/2019 Version: 2.12.24-25 (EP) +03/06/2019 Version 2.12.24-25 (EP) LDAP CACHED v3 24/05/2019 Version: 2.12.22-23 (EP) diff --git a/src/Template/Materiels/add.ctp b/src/Template/Materiels/add.ctp index a075bc8..87a2762 100755 --- a/src/Template/Materiels/add.ctp +++ b/src/Template/Materiels/add.ctp @@ -2,6 +2,11 @@ use Cake\ORM\TableRegistry; +// Extending from bootstrap example layouts : +//$this->extend('../Layout/BootstrapLayoutSamples/cover'); +//$this->extend('../Layout/BootstrapLayoutSamples/dashboard'); +//$this->extend('../Layout/BootstrapLayoutSamples/signin'); + //debug($materiel); //debug($users_option_list); //debug($users_login_and_email); diff --git a/webroot/doc/diagrams/GIT state diag.txt b/webroot/doc/diagrams/GIT state diag.txt index 5e1dbf5..503473b 100755 --- a/webroot/doc/diagrams/GIT state diag.txt +++ b/webroot/doc/diagrams/GIT state diag.txt @@ -11,33 +11,33 @@ state "**CREATED** (créé)" as WD /' ALL STATES '/ -WORK_DIR: Brouillon \n("git diff" to see last changes made)\n("git clean" to delete last changes) +1_WORK_DIR: Brouillon \n("git diff " to see last changes made)\n("git clean" to delete last changes) -STASHED: Put in a temporary place \n("git stash list" to see content)\n("git stash show" to show changes from latest stash entry)\n("git stash branch {BRANCH NAME}" creates a branch, starting from the HEAD at the moment you've stashed the changes, and applies the stashed changes to that branch) +STASHED: Put in a temporary place \n("git stash list" to see content)\n("git stash show" to show changes from latest stash entry)\n("git stash drop" to show changes from latest stash entry)\n("git stash branch {BRANCH NAME}" creates a branch, starting from the HEAD at the moment you've stashed the changes, and applies the stashed changes to that branch) -STAGED: Ready to be commited\n("git diff --staged" to see last changes made and added) +2_STAGED: Ready to be commited\n("git diff --staged" to see last changes made and added) -LOCAL_REP: Local Repository (my device)\n("git log [-- graph]" to see all commits)\n("git diff HEAD^!" to see last commit changes)\n("git diff ^!" to see changes introduced by commit-num)\n("git diff commit-num-from commit-num-to" to see changes between commit-num-from and commit-num-to) +3_LOCAL_REP: Local Repository (my device)\n("git log [-- graph]" to see all commits)\n("git diff HEAD^!" to see last commit changes)\n("git diff ^!" to see changes introduced by commit-num)\n("git diff commit-num-from commit-num-to" to see changes between commit-num-from and commit-num-to) -REMOTE_REP: Remote Repository (a distant server...) +4_REMOTE_REP: Remote Repository (a distant server...) -[*] --> WORK_DIR : create new file +[*] --> 1_WORK_DIR : git clone (or git init) -WORK_DIR -r-> STASHED : git **stash [push]** -STASHED -l-> WORK_DIR : git **stash pop** +1_WORK_DIR -r-> STASHED : git **stash [push | save] []** +STASHED -l-> 1_WORK_DIR : git **stash pop | apply** -WORK_DIR -d-> STAGED : git **add** (file | .) -STAGED -l-> WORK_DIR : git **checkout** -- (file | '*.py') -STAGED --> WORK_DIR : git **reset** +1_WORK_DIR -d-> 2_STAGED : git **add** (file | .) +2_STAGED -l-> 1_WORK_DIR : git **checkout** -- (file | '*.py') +2_STAGED --> 1_WORK_DIR : git **reset** [--hard] [HEAD ] -STAGED --> LOCAL_REP : git **commit** -m "message" [ file | . ] [origin ] -LOCAL_REP --> STAGED : git **reset --soft** HEAD^ \n(= commit -1) +2_STAGED --> 3_LOCAL_REP : git **commit** -m "message" [ file | . ] [origin ] +3_LOCAL_REP --> 2_STAGED : git **reset --soft** HEAD^ \n(= commit -1) -LOCAL_REP --> REMOTE_REP : git **push** [origin ] -REMOTE_REP --> LOCAL_REP : ??? +3_LOCAL_REP --> 4_REMOTE_REP : git **push** [origin ] +4_REMOTE_REP --> 3_LOCAL_REP : WHICH COMMAND ??? @enduml -- libgit2 0.21.2