Laurent Destailleur
|
7f4bbcf9a5
|
Some minor fix in default values and modulebuilder
|
2019-02-09 13:40:22 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Frédéric FRANCE
|
77747ac2a3
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-28 16:35:12 +01:00 |
|
Laurent Destailleur
|
4398649af6
|
Add hooks to add column in list of payment modes
|
2019-01-28 01:46:59 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
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 |
|
Laurent Destailleur
|
b8d0e6ed8b
|
Update index.php
|
2018-12-22 18:22:12 +01:00 |
|
Philippe GRAND
|
c3a898daa6
|
better form display and fix
|
2018-12-20 13:44:49 +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
|
76e3390c2e
|
fix : bad url
|
2018-12-19 15:25:25 +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 |
|
Laurent Destailleur
|
d65bf1fbc7
|
Fix emailcollector
|
2018-11-05 15:31:41 +01:00 |
|
Laurent Destailleur
|
01d7b1e96a
|
Fix readme detection
|
2018-11-05 10:15:22 +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 |
|
Laurent Destailleur
|
0ca5da055f
|
Debug v9
|
2018-10-31 15:04:01 +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
|
68f6ebd0ff
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/core/lib/security.lib.php
htdocs/modulebuilder/template/myobject_card.php
|
2018-10-30 14:47:39 +01:00 |
|
Laurent Destailleur
|
b4c9df65f9
|
FIX #9907 Can set several modules on ->depends
|
2018-10-30 13:56:51 +01:00 |
|
Laurent Destailleur
|
8fbf5b1f33
|
FIX deletion on draft is allowed if we are allwoed to create
|
2018-10-29 18:28:19 +01:00 |
|
Regis Houssin
|
569d59d251
|
FIX change my deprecated email
|
2018-10-27 14:43:12 +02:00 |
|
Laurent Destailleur
|
0e464ea4f5
|
Merge pull request #9866 from frederic34/emptylines
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-26 15:31:24 +02:00 |
|
Laurent Destailleur
|
cae83cd8e7
|
Add solution to translate
|
2018-10-26 11:10:04 +02:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
762d82f2fe
|
Move declaration into common
|
2018-10-19 13:38:05 +02:00 |
|
Laurent Destailleur
|
97429aeb7a
|
Merge pull request #9721 from grandoc/new_branch_10_10_2018
Standardize and update code
|
2018-10-16 19:30:19 +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
|
502c52b78f
|
Show real path of module if not into custom
|
2018-10-16 18:09:43 +02:00 |
|
Laurent Destailleur
|
f5029bf52b
|
Fix template
|
2018-10-16 17:46:14 +02:00 |
|
Laurent Destailleur
|
e19453450d
|
Fix closing tag
|
2018-10-13 19:57:34 +02:00 |
|
Philippe GRAND
|
9e494e65e0
|
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
|
2018-10-12 19:04:02 +02:00 |
|
Philippe GRAND
|
849a1a9400
|
Standardize and update code
|
2018-10-12 09:26:58 +02:00 |
|
Abbes Bahfir
|
8160dcec6a
|
Fix: Undeclared global variable
|
2018-10-09 16:10:49 +01:00 |
|
Philippe GRAND
|
5583211246
|
Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018
|
2018-10-06 12:00:24 +02:00 |
|
Laurent Destailleur
|
e24117e75b
|
Fix position of modules is string on 2 digits
|
2018-10-06 11:57:53 +02:00 |
|
Philippe GRAND
|
073ec85208
|
Standardize code
|
2018-10-05 15:51:08 +02:00 |
|
Laurent Destailleur
|
0fd7a5a172
|
Merge pull request #9659 from frederic34/patch-15
typo in template
|
2018-10-04 17:22:47 +02:00 |
|
Laurent Destailleur
|
dec313810d
|
Update myobject_list.php
|
2018-10-04 17:09:19 +02:00 |
|
Frédéric FRANCE
|
a7b2b00230
|
typo in template
|
2018-10-02 15:56:12 +02:00 |
|
Abbes Bahfir
|
0cb5b52318
|
Fix : backtopage link in listings
|
2018-10-01 11:10:46 +01:00 |
|
Laurent Destailleur
|
873f43db94
|
Uniformize interface for tickets
|
2018-10-01 03:19:21 +02:00 |
|
Philippe GRAND
|
574cfad48f
|
Standardize and update code
|
2018-09-28 14:49:34 +02:00 |
|
Laurent Destailleur
|
ec2dd7ba4e
|
Remove not used code
|
2018-09-28 13:13:04 +02:00 |
|
Laurent Destailleur
|
e9dd967610
|
Support nomassaction param on list
|
2018-09-28 13:12:47 +02:00 |
|
Laurent Destailleur
|
a4cd96e03c
|
Clean code when there is no setup to do
|
2018-09-24 10:08:57 +02:00 |
|
Laurent Destailleur
|
e277670a70
|
Merge pull request #9573 from grandoc/new_branch_20_09_2018
Standardize and update code from New branch 20 09 2018
|
2018-09-23 15:35:42 +02:00 |
|
Laurent Destailleur
|
0abe05c6b7
|
Fix no form inside a table
|
2018-09-21 11:29:01 +02:00 |
|
Philippe GRAND
|
7c92157636
|
Standardize and update code
|
2018-09-20 14:25:53 +02:00 |
|
Laurent Destailleur
|
7fb2b1a769
|
Fix reset extrafields that must be unique when cloning
|
2018-09-16 22:30:13 +02:00 |
|
Laurent Destailleur
|
ab0f842db6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-16 12:55:44 +02:00 |
|
Laurent Destailleur
|
a0bcf999c5
|
FIX #9043
|
2018-09-16 09:45:33 +02:00 |
|