| /branches/v1.8-narince/src/org/tela_botanica/client/configuration |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/configuration:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/util |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/util:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/http |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/http:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/Constantes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/ErrorMessages.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/Constantes.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.properties:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/ErrorMessages.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/PopupChargement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/PopupChargement.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/EnteteVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/EnteteVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/StatutVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/StatutVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/Formulaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/Formulaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneForm.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FenetreForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FenetreForm.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FormulaireOnglet.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FormulaireOnglet.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureListeVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureForm.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/DetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/DetailVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FenetreJournal.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FenetreJournal.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/MenuVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/MenuVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/BarrePaginationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/BarrePaginationVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/accueil |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/accueil:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java |
|---|
| 41,6 → 41,7 |
| import com.extjs.gxt.ui.client.widget.layout.FitLayout; |
| import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; |
| import com.google.gwt.core.client.GWT; |
| import com.google.gwt.user.client.Window; |
| public class PublicationListeVue extends ContentPanel implements Rafraichissable { |
| 153,7 → 154,11 |
| importer.setIcon(Images.ICONES.importerCsv()); |
| importer.addSelectionListener(new SelectionListener<ButtonEvent>() { |
| public void componentSelected(ButtonEvent be) { |
| mediateur.clicImporterPublication(PublicationListeVue.this); |
| if(mediateur.getUtilisateur().isIdentifie()) { |
| mediateur.clicImporterPublication(PublicationListeVue.this); |
| } else { |
| Window.alert(i18nC.identificationNecessaire()); |
| } |
| } |
| }); |
| importer.setToolTip(i18nC.indicationImporterUnePubli()); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/ContenuVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/ContenuVue.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/interfaces |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/interfaces:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/HashMapComposants.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/InfoLogger.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/InfoLogger.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/AproposFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/IdentificationFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/Proxy.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/Proxy.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampCaseACocher.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/AideFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AideFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/LicenceFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Information.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Information.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/Publication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Valeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Valeur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Aide.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Aide.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Menu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Menu.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/MenuApplicationId.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonnee.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonnee.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/Personne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/Personne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Utilisateur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Utilisateur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonneeListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteRangement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/Collection.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteBase.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureConservation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/Structure.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeur.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1882 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles:r1882 |