Commit Graph

6 Commits

Author SHA1 Message Date
Laurent Destailleur
e3a8041b0d Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/facture.php
	htdocs/user/fiche.php
2014-11-16 15:46:08 +01:00
Andrelec1
5742e42689 Fix require FormOther !
If agenda module is desable
2014-11-05 14:24:02 +01:00
Laurent Destailleur
6bbeaee8fe Fix: Selection of users color was not user owner of event. 2014-10-18 15:35:32 +02:00
aspangaro
c1d016a531 Add field to select color of the user in user's card 2014-10-16 06:20:54 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00