Commit Graph

500 Commits

Author SHA1 Message Date
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
844643c37d Merge pull request #10375 from grandoc/new_branch_19_01_2019
update with html5 compliant code
2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime
Fix
2019-01-19 13:22:38 +01:00
Philippe GRAND
6fc28af92b update with html5 compliant code 2019-01-19 12:53:47 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
e3d53867f4 WIP Billing task time 2019-01-18 18:11:10 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
f4dd8a4e50 Update myobject_card.php 2019-01-16 12:47:44 +01:00
Bahfir Abbes
66f17ac422 simplification 2019-01-16 12:47:36 +01:00
Abbes Bahfir
6b808acfbb linl back to list if cancelled on create 2019-01-16 12:47:31 +01:00
Laurent Destailleur
0f2406c202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 10:55:28 +01:00
Laurent Destailleur
8c6fde72f8 Several fixes in look and feel of module survey 2019-01-13 19:36:00 +01:00
Laurent Destailleur
38ebb4ce4e Fix XFRAMEOPTIONS_ALLOWALL 2019-01-11 17:05:50 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
2019-01-06 01:22:10 +01:00
Laurent Destailleur
b1559dbc39 Fix perms 2019-01-05 15:22:24 +01:00
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
2019-01-04 19:36:20 +01:00
ldestailleur
1b19f5153b Fix cash fence feature 2019-01-03 14:18:02 +01:00
ldestailleur
dbbfdd984a Fix emailcollector can't be used without syntax rules 2019-01-03 11:47:27 +01:00
Laurent Destailleur
fccd76aeae Fix phpcs 2018-12-22 19:25:08 +01:00
Laurent Destailleur
ecb790ad8f Merge branch 'develop' into new_branch_20_12_2018 2018-12-22 18:23:44 +01:00
Philippe GRAND
33d035139f fix typo and add translation 2018-12-20 10:17:52 +01:00
Philippe GRAND
1fea8a2968 fix : syntax error 2018-12-19 15:58:23 +01:00
Philippe GRAND
1d59b582d7 add comments 2018-12-19 13:56:51 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
5ec9a1ca7f Remove deprecated parameter 2018-12-11 10:15:13 +01:00
Laurent Destailleur
bb565d33f9 FIX Several fixes in fetchAll 2018-11-27 16:39:08 +01:00
Laurent Destailleur
61fddadc3f Complete the fetchAll of modulebuilder + websitepage 2018-11-20 18:29:29 +01:00
Laurent Destailleur
e020597ba7 Fix deletion for class build with modulebuilder 2018-11-19 21:11:26 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +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
35419fa206 Dolibarize code 2018-11-11 15:06:08 +01:00
Laurent Destailleur
bae1ff67a4 Merge pull request #9986 from frederic34/patch-9
remove warning
2018-11-10 12:16:10 +01:00
Laurent Destailleur
e86e3ec7ac Work on email collector 2018-11-09 19:30:44 +01:00
Frédéric FRANCE
172468587d Update mymodulewidget1.php 2018-11-09 18:13:13 +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
Frédéric FRANCE
1fd398234f remove warning 2018-11-09 15:29:49 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Frédéric FRANCE
aa8236dd98 fix phpcs 2018-10-31 21:33:37 +01:00
Laurent Destailleur
970f501147 Debug modulebuilder 2018-10-31 20:10:20 +01:00
Laurent Destailleur
e4cfc2c6cb Fix public 2018-10-31 17:30:08 +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