branch master updated (79c8956 -> b509d93)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository observe. See http://git.codelutin.com/observe.git from 79c8956 [jgitflow-maven-plugin]merging 'release/4.0.1' into 'master' adds 140d4aa [jgitflow-maven-plugin]updating poms for 4.0.2-SNAPSHOT development adds e9575b7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5183059 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 7254b37 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5549f18 Utilisation d'application config pour parser le fichier de log construit au chargement de l'application (refs #7456) adds 33e83f1 Correction du chemin de fichier de log (termine #7456) Merge branch 'feature/7456' into develop adds 6163df7 Correction du fond d'un renderer de boolean (refs #6710) adds 84c4414 Mise en forme des tableaux comprenant des cases à cocher (termine #6710) Merge branch 'feature/6710' into develop adds 73daf28 [jgitflow-maven-plugin]updating poms for 4.0.1.1 branch with snapshot versions adds a2320a4 Ajout de licenses manqauntes adds aaf1511 [jgitflow-maven-plugin]updating poms for branch'release/4.0.1.1' with non-snapshot versions adds b509d93 [jgitflow-maven-plugin]merging 'release/4.0.1.1' into 'master' No new revisions were added by this update. Summary of changes: observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- .../main/java/fr/ird/observe/ObserveConfig.java | 5 ++ .../main/java/fr/ird/observe/ObserveRunner.java | 15 +++- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 6 ++ .../table/ObserveBooleanTableCellRenderer.java | 100 +++++++++++++++++++++ .../main/{filters => resources}/log4j.properties | 2 +- .../observe-log4j.properties | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 130 insertions(+), 10 deletions(-) create mode 100644 observe-swing/src/main/java/fr/ird/observe/ui/util/table/ObserveBooleanTableCellRenderer.java rename observe-swing/src/main/{filters => resources}/log4j.properties (98%) rename observe-swing/src/main/{filters => resources}/observe-log4j.properties (95%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm