Laurent Destailleur 1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php

2018-03-07 11:54:48 +01:00

..

admin

Fix back link of look and feel v7

2018-02-26 09:20:05 +01:00

canvas

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-12-21 14:35:33 +01:00

cartes

Fix usage of option STOCK_SUPPORTS_SERVICES

2017-12-01 13:40:24 +01:00

class

FIX Trad and creation date in subscription create

2018-03-06 09:08:28 +01:00

stats

Look and feel v6

2017-07-04 13:05:02 +02:00

subscription

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-12-21 14:35:33 +01:00

tpl

FIX security vulnerability reported by ADLab of Venustech

2017-12-21 13:32:16 +01:00

agenda.php

Fix look and feel v7

2018-01-30 11:30:03 +01:00

card.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-03-07 11:54:48 +01:00

document.php

FIX Maxi debug of permission for users external or restricted to sales

2017-12-18 16:13:05 +01:00

htpasswd.php

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

2016-09-26 01:32:50 +02:00

index.php

Fix: differentiate sharing of "member" and "member_type"

2018-02-24 11:13:14 +01:00

ldap.php

Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap

2017-10-04 08:43:07 +02:00

list.php

Fix: missing hook parameters

2018-02-24 15:01:29 +01:00

note.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00

subscription.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-03-06 09:20:45 +01:00

type_ldap.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00

type.php

Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop

2018-02-25 15:01:19 +01:00