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

Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php

2013-02-12 15:17:22 +01:00

..

admin

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

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

class

New: Add push from Philippe to manager user hierarchy.

2013-02-11 20:45:36 +01:00

group

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

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

clicktodial.php

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

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

fiche.php

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

2013-02-12 15:17:22 +01:00

home.php

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

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

index.php

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

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

info.php

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

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

ldap.php

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

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

logout.php

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

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

note.php

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

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

param_ihm.php

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

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

passwordforgotten.php

New: hookmanager class is used frequently and is a factory object, so we

2013-01-25 19:12:54 +01:00

perms.php

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

2013-01-17 10:32:49 +01:00