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

Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang

2018-06-13 23:07:30 +02:00

..

ajax

loadlangs

2018-05-26 23:52:52 +02:00

boxes

Fix conflict with external ticketsup module

2018-06-04 21:49:29 +02:00

class

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

2018-06-13 23:07:30 +02:00

db

Enhance sorting of field for lists on field with several sort criterias

2018-04-28 19:54:41 +02:00

filemanagerdol

Lowercase NULL, TRUE, FALSE according to PSR2

2018-04-16 13:51:16 +02:00

js

Debug module ticket

2018-04-30 10:33:36 +02:00

lib

Look and feel v8

2018-06-13 22:57:41 +02:00

login

NEW Add password_hash as hash algorithm

2018-01-15 00:33:25 +01:00

menus

Merge pull request #8821 from aspangaro/8.0-b26

2018-05-25 10:36:46 +02:00

modules

Merge pull request #8949 from atm-greg/Manage_product_units_in_supplier_proposal

2018-06-13 21:41:39 +02:00

tpl

Fix support of 'help' field property. Fix bad td closing.

2018-06-13 13:36:40 +02:00

triggers

FIX Sync third party change to Stripe only if we change Stripe data

2018-06-11 11:47:10 +02:00

actions_addupdatedelete.inc.php

Merge pull request #8563 from ATM-Marc/NEW_backurlforcard

2018-04-27 11:57:15 +02:00

actions_builddoc.inc.php

FIX Make a redirect after the remove_file action to avoid deletion done

2018-03-19 11:29:36 +01:00

actions_changeselectedfields.inc.php

Fix extrafields

2018-01-31 14:01:58 +01:00

actions_comments.inc.php

…

actions_dellink.inc.php

…

actions_extrafields.inc.php

…

actions_fetchobject.inc.php

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

2018-01-26 12:10:13 +01:00

actions_lineupdown.inc.php

…

actions_linkedfiles.inc.php

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

2018-04-07 12:30:30 +02:00

actions_massactions.inc.php

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

2018-05-21 23:35:09 +02:00

actions_printing.inc.php

…

actions_sendmails.inc.php

Fix option MAIN_MAIL_ENABLED_USER_DEST_SELECT

2018-05-22 20:17:31 +02:00

actions_setmoduleoptions.inc.php

Fix PSR2

2018-04-22 20:08:29 +02:00

actions_setnotes.inc.php

…

antispamimage.php

Fix refreshing of captcha broken if a cache-control set by server

2018-01-24 13:40:39 +01:00

commonfieldsinexport.inc.php

…

datepicker.php

…

doxygen.php

Fix https

2018-01-17 11:41:03 +01:00

extrafieldsinexport.inc.php

…

get_info.php

Clean defined constant at begin of pages

2018-04-21 12:00:55 +02:00

get_menudiv.php

Work on a page dedicated for external frontend (mobile, ...)

2018-03-29 11:34:01 +02:00

index.html

…

photos_resize.php

Fix conflict with external ticketsup module

2018-06-04 21:49:29 +02:00

search_page.php

…

search.php

Clean defined constant at begin of pages

2018-04-21 12:00:55 +02:00

tools.php

…

website.inc.php

…