Laurent Destailleur
|
29414251f5
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/files.lib.php
|
2020-09-29 13:19:03 +02:00 |
|
Laurent Destailleur
|
628978be53
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/adherents/card.php
|
2020-09-28 21:16:25 +02:00 |
|
Alexandre SPANGARO
|
55e3f8365e
|
FIX Yogosha report 4434 (backport)
|
2020-09-16 21:36:55 +02:00 |
|
Laurent Destailleur
|
058a0d4fa7
|
Fix look and feel v12
|
2020-06-22 04:27:16 +02:00 |
|
Laurent Destailleur
|
a305c43901
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/societe/card.php
htdocs/ticket/card.php
|
2020-06-06 11:51:39 +02:00 |
|
Laurent Destailleur
|
2344435416
|
Fix XSS CWE-ID CWE-79
|
2020-06-05 23:41:29 +02:00 |
|
Laurent Destailleur
|
4ff503d20a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/product/stock/list.php
htdocs/supplier_proposal/list.php
|
2020-04-10 02:07:51 +02:00 |
|
Laurent Destailleur
|
7fe8c7eab3
|
FIX #11855
|
2020-04-10 01:37:04 +02:00 |
|
Laurent Destailleur
|
be2d6494a7
|
FIX #12908
|
2020-01-28 21:23:05 +01:00 |
|
Frédéric FRANCE
|
90235d0528
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-31 13:57:40 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Frédéric FRANCE
|
57055bad03
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-13 14:36:00 +01:00 |
|
Laurent Destailleur
|
cb497cb08e
|
Translation
|
2019-12-06 08:58:16 +01:00 |
|
Laurent Destailleur
|
93d66d8213
|
Debug v11
|
2019-12-06 08:50:26 +01:00 |
|
Frédéric FRANCE
|
4c5c6b6ff1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-12-03 17:56:43 +01:00 |
|
Laurent Destailleur
|
92070fa491
|
Fix name of variable $trigger_name into $triggersendname
|
2019-12-02 09:38:16 +01:00 |
|
Laurent Destailleur
|
83f7f3a6e9
|
Trans
|
2019-12-01 18:16:51 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Laurent Destailleur
|
2689f7515c
|
Fix pb with colspan and extrafields.
Fix remove empty id
|
2019-11-16 14:38:05 +01:00 |
|
Frédéric FRANCE
|
a3e092b227
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-14 09:21:26 +01:00 |
|
Frédéric FRANCE
|
3bac051521
|
use class CONST
|
2019-11-14 08:07:16 +01:00 |
|
Scrutinizer Auto-Fixer
|
87585c0f2a
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 17:32:11 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
94bd0f71d9
|
Fix pb with permission
|
2019-11-05 19:41:30 +01:00 |
|
Frédéric FRANCE
|
872f58f261
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-11-03 21:48:24 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Laurent Destailleur
|
433f6918fd
|
Look and feel v11
|
2019-10-23 21:21:39 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Frédéric FRANCE
|
360bf55f5b
|
clean indent
|
2019-10-20 01:09:11 +02:00 |
|
Frédéric FRANCE
|
f253315c8d
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 18:30:58 +02:00 |
|
Laurent Destailleur
|
3acf7211c3
|
Merge pull request #11847 from ptibogxiv/patch-257
NEW: Option to allow to create members from third-party
|
2019-10-08 15:08:34 +02:00 |
|
Frédéric FRANCE
|
ec8569dd85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-06 15:56:21 +02:00 |
|
Laurent Destailleur
|
2b66282b61
|
NEW Code for extrafields uses the new array $extrafields->attributes
|
2019-10-06 14:41:52 +02:00 |
|
Frédéric FRANCE
|
98023353fe
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-03 17:21:31 +02:00 |
|
stickler-ci
|
09b423d14d
|
Fixing style errors.
|
2019-10-02 22:35:09 +00:00 |
|
Sebastien Baguet
|
9daffcbe07
|
Fix for no subscription members
|
2019-10-03 00:29:41 +02:00 |
|
Frédéric FRANCE
|
3afb4355a8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-02 18:59:18 +02:00 |
|
Laurent Destailleur
|
d8a8c4fbe6
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:36:36 +02:00 |
|
Frédéric FRANCE
|
aca9d92db8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-01 22:03:33 +02:00 |
|
Alexandre SPANGARO
|
91b3bf76fd
|
Merge branch 'develop' into 11.0_https
|
2019-10-01 06:11:43 +02:00 |
|
Frédéric FRANCE
|
1b151da776
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-29 11:28:54 +02:00 |
|
Laurent Destailleur
|
db32ca99c6
|
Fix translation and sql request
|
2019-09-28 12:36:09 +02:00 |
|
Frédéric FRANCE
|
cea3669ffa
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-09-28 00:35:14 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Alexandre SPANGARO
|
278312f38f
|
Translate
|
2019-09-20 07:02:14 +02:00 |
|
Frédéric FRANCE
|
ccaa4cc1f3
|
work on contact
|
2019-09-14 16:35:18 +02:00 |
|
Frédéric FRANCE
|
af63ac4051
|
work on contact
|
2019-09-14 13:31:26 +02:00 |
|
Frédéric FRANCE
|
1cd59cc16a
|
work on user
|
2019-09-14 11:26:31 +02:00 |
|
Frédéric FRANCE
|
cd109d04cd
|
add function
|
2019-09-12 20:44:24 +02:00 |
|