dolibarr/htdocs/user
Laurent Destailleur 14ab409ca9 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/admin/stock.php
	htdocs/admin/system/index.php
	htdocs/comm/fiche.php
	htdocs/core/lib/admin.lib.php
	htdocs/core/lib/holiday.lib.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/login/functions_forceuser.php
	htdocs/core/login/functions_http.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/filefunc.inc.php
	htdocs/holiday/define_holiday.php
	htdocs/opensurvey/fonctions.php
	htdocs/societe/canvas/actions_card_common.class.php
	test/phpunit/CompanyBankAccountTest.php
	test/phpunit/ExportTest.php
	test/phpunit/FactureTest.php
	test/phpunit/FunctionsLibTest.php
	test/phpunit/PropalTest.php
	test/phpunit/SocieteTest.php
	test/phpunit/WebservicesInvoicesTest.php
	test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
..
admin ADD extrafields on usergroup 2014-09-22 16:31:58 +02:00
class Merge remote-tracking branch 'origin/3.6' into develop 2014-09-28 02:14:32 +02:00
group Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 2014-09-22 23:43:22 +02:00
agenda_extsites.php New: Each user can include its own external ics calendar into dolibarr 2014-08-15 17:08:05 +02:00
card.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
clicktodial.php Qual: remove PHP closing tag (again) 2014-05-26 13:51:25 +02:00
document.php New : add attachments on user cards 2014-08-05 16:01:40 +02:00
hierarchy.php Merge remote-tracking branch 'origin/3.5' into develop 2014-06-06 12:00:21 +02:00
home.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
index.php Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
info.php Removed closing php tag 2014-05-03 18:18:44 +02:00
ldap.php Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
logout.php Fix: missing global declarations 2014-08-20 19:03:58 +02:00
note.php Fix: ckeditor area is at wrong place 2014-09-09 15:33:41 +02:00
param_ihm.php Merge remote-tracking branch 'origin/3.5' into 3.6 2014-08-16 17:37:37 +02:00
passwordforgotten.php Removed closing php tag 2014-05-03 18:18:44 +02:00
perms.php Fix: Too many parameter 2014-08-01 14:51:40 +02:00