Subversion Repositories eFlore/Applications.coel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1726 → Rev 1727

/branches/v1.2-mourvedre/widget/modules/carto/squelettes/carto.tpl.html
19,7 → 19,7
<script type="text/javascript" src="http://maps.google.com/maps/api/js?v=3.5&amp;sensor=true&amp;language=fr&amp;region=FR"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/1.6.2/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="http://www.tela-botanica.org/commun/jquery/jquery-ui/1.8.15/js/jquery-ui-1.8.15.custom.min.js"></script>
<script type="text/javascript" src="http://ajax.aspnetcdn.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js"></script>
<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js"></script>
<script type="text/javascript" src="<?=$url_base?>modules/carto/squelettes/scripts/carto.js"></script>
<script type="text/javascript">
//<![CDATA[
/branches/v1.2-mourvedre/doc/bdd/maj_v1.2.0.sql
5,3 → 5,4
UPDATE coel_structure SET cs_nbre_personne = NULL WHERE cs_nbre_personne = 0;
ALTER TABLE coel_structure_conservation MODIFY csc_mark_collection_commune TINYINT(1) NULL COMMENT 'Les collections botaniques sont-elles conservées avec d\'autres collections dans les mêmes locaux (problèe de conservation en commun) ?';
UPDATE coel_meta_liste_valeur SET cmlv_nom = 'Bretagne' WHERE cmlv_id_valeur = 4046;
UPDATE coel_meta_liste_valeur SET cmlv_nom = 'Corse' WHERE cmlv_id_valeur = 4049;
/branches/v1.2-mourvedre/doc/bdd
Property changes:
Modified: svn:mergeinfo
Merged /trunk/doc/bdd:r1722-1726
/branches/v1.2-mourvedre/.
Property changes:
Modified: svn:mergeinfo
Merged /trunk:r1724-1726