[Galette-cvs] r1885 - in /trunk/galette: ./ classes/ includes/jquery/ install/sql/ lang/ templates/default/ templates/default/images/ templates/default/jstree/ -- January 27, 2012 - 00:17

Author: trashy
Date: Fri Jan 27 00:17:10 2012
New Revision: 1885

URL: http://svn.gna.org/viewcvs/galette?rev=1885&view=rev
Log:
Merge branch 'groups'

Added:
    trunk/galette/ajax_group.php
      - copied, changed from r1884, trunk/galette/ajax_groups.php
    trunk/galette/ajax_unique_group.php
      - copied, changed from r1884, trunk/galette/ajax_group_members.php
    trunk/galette/classes/group.class.php
      - copied, changed from r1884, trunk/galette/classes/groups.class.php
    trunk/galette/includes/jquery/jquery.jstree.js
    trunk/galette/templates/default/group_persons.tpl
    trunk/galette/templates/default/group_tree_item.tpl
    trunk/galette/templates/default/images/icon-group.png
    trunk/galette/templates/default/jstree/
    trunk/galette/templates/default/jstree/d.png
    trunk/galette/templates/default/jstree/style.css
Modified:
    trunk/galette/ajax_group_members.php
    trunk/galette/ajax_groups.php
    trunk/galette/ajax_members.php
    trunk/galette/ajouter_groupe.php
    trunk/galette/classes/adherent.class.php
    trunk/galette/classes/authentication.class.php
    trunk/galette/classes/galette-login.class.php
    trunk/galette/classes/groups.class.php
    trunk/galette/classes/members.class.php
    trunk/galette/desktop.php
    trunk/galette/gestion_adherents.php
    trunk/galette/gestion_groupes.php
    trunk/galette/install/sql/mysql.sql
    trunk/galette/install/sql/pgsql.sql
    trunk/galette/install/sql/upgrade-to-0.7-mysql.sql
    trunk/galette/install/sql/upgrade-to-0.7-pgsql.sql
    trunk/galette/lang/fr_FR.utf8.po
    trunk/galette/templates/default/ajax_groups.tpl
    trunk/galette/templates/default/desktop.tpl
    trunk/galette/templates/default/galette.css
    trunk/galette/templates/default/gestion_adherents.tpl
    trunk/galette/templates/default/gestion_groupes.tpl
    trunk/galette/templates/default/group.tpl
    trunk/galette/templates/default/member.tpl
    trunk/galette/templates/default/page.tpl
    trunk/galette/templates/default/voir_adherent.tpl
    trunk/galette/voir_adherent.php