Laurent Destailleur e5a945ba5b Merge remote-tracking branch 'origin/3.3' into develop ...

Conflicts:
	ChangeLog
	htdocs/admin/propal.php
	htdocs/compta/journal/purchasesjournal.php
	htdocs/compta/journal/sellsjournal.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/lib/files.lib.php
	htdocs/core/modules/mailings/contacts2.modules.php
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/en_US/admin.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/public/demo/index.php

2013-04-14 01:46:33 +02:00

..

admin

Merge remote-tracking branch 'origin/3.3' into develop

2013-04-14 01:46:33 +02:00

canvas

Fix: Fix ton of regression due to field name change

2013-03-09 20:34:38 +01:00

cartes

change birth instead of naiss

2013-03-13 22:17:03 +01:00

class

Qual: Mutualize code. Only one function to build address format.

2013-04-07 17:39:08 +02:00

stats

Qual: Uniformize way to get graph sizes.

2013-04-12 18:45:19 +02:00

agenda.php

Look: Start to use div to render actions buttons

2013-04-03 18:37:54 +02:00

card_subscriptions.php

Look: Minor optimization

2013-04-12 14:55:40 +02:00

cotisations.php

english language standardization

2013-02-23 15:26:39 +01:00

document.php

english language standardization

2013-02-23 15:26:39 +01:00

fiche_subscription.php

Look: Start to use div to render actions buttons

2013-04-03 18:37:54 +02:00

fiche.php

Look: Minor optimization

2013-04-12 14:55:40 +02:00

htpasswd.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

index.php

Fix: Bad div closing

2013-03-30 19:40:52 +01:00

info_subscription.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

info.php

Look: Minor optimization

2013-04-12 14:55:40 +02:00

ldap.php

Look: Start to use div to render actions buttons

2013-04-03 18:37:54 +02:00

liste.php

Added natural search to members

2013-03-15 15:48:03 +01:00

note.php

Qual: Reduce number of methods. Mutualize update_note code.

2013-04-10 10:58:38 +02:00

type.php

Qual: Reduce number of methods. Mutualize update_note code.

2013-04-10 10:58:38 +02:00