Commit Graph

1230 Commits

Author SHA1 Message Date
Laurent Destailleur
6d640ab83c Fix feature to drag and drop rows of table (not generic) 2018-11-15 19:58:06 +01:00
Philippe GRAND
2ed060a070 fix: Invalid argument supplied for foreach() 2018-11-13 10:07:04 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
ca3510e889 Merge pull request #9994 from ptibogxiv/patch-91
Fix Invalid argument supplied for foreach()
2018-11-11 17:30:06 +01:00
ptibogxiv
80782a366e Fix Invalid argument supplied for foreach() 2018-11-10 15:04:38 +01:00
ptibogxiv
5c96689c87 Fix Invalid argument supplied for foreach() 2018-11-10 15:02:50 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
1e801c7c8a Fix css 2018-11-06 16:50:31 +01:00
Laurent Destailleur
763f3cd518 Debug modulebuilder 2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
7c3cb7d73c Update commonfields_add.tpl.php 2018-11-05 09:54:11 +01:00
Abbes Bahfir
5f4d644cab New : help picto for fields in creation 2018-11-03 11:12:50 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
2018-10-30 18:29:28 +01:00
Laurent Destailleur
b4600fdc06 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/js/timesheet.js
2018-10-29 02:31:05 +01:00
Laurent Destailleur
553e984465 FIX Selection of addmaindocfile is lost on error 2018-10-29 02:14:41 +01:00
Laurent Destailleur
770f8c3f3b FIX Selection of addmaindocfile is lost on error 2018-10-29 02:11:33 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
atm-john
8a9b9f1736 Fix title 2018-10-25 21:53:48 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
e49f2bc562 Update document_actions_post_headers.tpl.php 2018-10-22 22:20:26 +02:00
Laurent Destailleur
d38c68e54f Remove unexpected char 2018-10-21 11:10:04 +02:00
Laurent Destailleur
c4e67de5c9 Merge pull request #9814 from Mavyre/patch-2
Fixed all resources displaying on add in projects, events...
2018-10-19 12:57:07 +02:00
Laurent Destailleur
696023c1aa NEW Enhancement in the generic file manager 2018-10-19 12:47:59 +02:00
Mavyre
32a3779d23 Fixed all ressources displaying 2018-10-18 22:08:23 +02:00
Laurent Destailleur
d4bc53660b Code comment and debug filemanager 2018-10-18 21:22:30 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
2018-10-16 18:47:11 +02:00
Laurent Destailleur
970c581bc9 css 2018-10-15 16:40:07 +02:00
Laurent Destailleur
532e05c42e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	ChangeLog
	htdocs/filefunc.inc.php
2018-10-13 14:29:51 +02:00
Laurent Destailleur
1e58b837f0 css 2018-10-13 14:11:44 +02:00
atm-ph
e2748953c3 Fix print extrafield date in list 2018-10-12 22:31:47 +02:00
atm-ph
4b32c8e100 Fix extrafield contact typed as date isn't show in the list from 'contact/address' tab of company 2018-10-11 14:24:55 +02:00
Laurent Destailleur
e2f450aa8c Fix regession losing description.
Rename updateligne into updateline.
2018-09-28 16:15:17 +02:00
Laurent Destailleur
e252a5f046 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-27 12:55:45 +02:00
Laurent Destailleur
62b31df069 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/rssparser.class.php
	htdocs/langs/en_US/boxes.lang
2018-09-27 12:55:25 +02:00
Laurent Destailleur
575c63f87d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/CMailFile.class.php
2018-09-27 12:52:10 +02:00
Laurent Destailleur
60c74a6255 Merge pull request #9582 from grandoc/new_branch_21_09_2018
Standardize and update code from New branch 21 09 2018
2018-09-27 10:07:15 +02:00
Laurent Destailleur
9630c7b5c7 Merge pull request #9614 from grandoc/new_branch_25_09_2018
Add some code comment
2018-09-27 09:31:19 +02:00
Philippe Grand
b7304e3d82 Merge branch 'develop' into new_branch_21_09_2018 2018-09-27 09:29:26 +02:00
Laurent Destailleur
29893daf6f Merge pull request #9599 from zeenlym/forgotten_passlink
NEW Change forgotten password link in general parameters
2018-09-27 09:17:28 +02:00
Philippe GRAND
746d73b8e6 Add some code comment 2018-09-25 17:26:57 +02:00
Frédéric FRANCE
a9f7bdead6 fix Option MAIN_DISABLE_NOTES_TAB #9611 2018-09-25 15:22:08 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Yanis LISIMA
753089a99d NEW Change forgotten password link in general parameters
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
2018-09-23 21:26:07 +02:00
Philippe GRAND
3464afe391 Update comment 2018-09-21 15:12:17 +02:00
Laurent Destailleur
5a0ffb68d7 Merge pull request #9576 from atm-john/FIX_attribute_closing
FIX attribute closing
2018-09-20 20:34:57 +02:00
Laurent Destailleur
b05954fb1e Merge pull request #9061 from delcroip/comptafiles
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
2018-09-20 19:45:46 +02:00
John BOTELLA
b59b0b0cc3 FIX attribute closing 2018-09-20 16:13:22 +02:00
Laurent Destailleur
d4ffc5e088 css 2018-09-20 00:48:00 +02:00
Laurent Destailleur
1d47569651 Brighter gradient 2018-09-19 15:06:14 +02:00