andreubisquerra
|
220f02805d
|
Update image path after move image directory
We need change path after move image in the commit:
de4183ea65 (diff-7af3f43d430a17d6e548d766fbacecc2)
Conflicts:
htdocs/core/class/dolreceiptprinter.class.php
|
2020-02-05 14:12:29 +01:00 |
|
Laurent Destailleur
|
320dd69923
|
Merge pull request #13002 from andreubisquerra/develop
Update image path after move image directory
|
2020-02-05 14:10:12 +01:00 |
|
Laurent Destailleur
|
5a81e3e181
|
Merge pull request #13012 from ptibogxiv/patch-299
fix url field in edit mode societe/card.php
|
2020-02-05 14:09:04 +01:00 |
|
Laurent Destailleur
|
a36cf1f86b
|
Fix phpunit
|
2020-02-05 14:08:13 +01:00 |
|
Laurent Destailleur
|
ddd1ca26b9
|
CSS
|
2020-02-05 14:04:19 +01:00 |
|
Laurent Destailleur
|
db43b2d3dd
|
Fix unique key on llx_holiday_users
|
2020-02-05 13:53:35 +01:00 |
|
Laurent Destailleur
|
334c69841a
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-02-05 13:41:30 +01:00 |
|
Laurent Destailleur
|
796cdad6fc
|
Merge pull request #13008 from hregis/10.0_mc
FIX compatibility with multicompany (avoid duplicate data)
|
2020-02-05 13:41:20 +01:00 |
|
Laurent Destailleur
|
9100b8a548
|
FIX SQL request and phpunit
|
2020-02-05 13:41:10 +01:00 |
|
Laurent Destailleur
|
c101c3dd55
|
Update holiday.class.php
|
2020-02-05 13:27:22 +01:00 |
|
Laurent Destailleur
|
d35994e5db
|
Update holiday.class.php
|
2020-02-05 13:25:51 +01:00 |
|
Laurent Destailleur
|
b589db813e
|
Merge pull request #13029 from OPEN-DSI/v10-fix-product-index-links
FIX links in products/services index
|
2020-02-05 13:05:35 +01:00 |
|
Laurent Destailleur
|
0315b53f1f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-02-05 13:03:54 +01:00 |
|
Laurent Destailleur
|
bd90cdf492
|
FIX #13023
|
2020-02-05 13:03:43 +01:00 |
|
Laurent Destailleur
|
2cf970f617
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-02-05 12:51:54 +01:00 |
|
Laurent Destailleur
|
ac5b8ef0e0
|
Merge pull request #13030 from ptibogxiv/patch-300
new fix Count of Stripe payment mode must take test/live into account
|
2020-02-05 12:50:05 +01:00 |
|
Laurent Destailleur
|
f8daed7f56
|
Update company.lib.php
|
2020-02-05 12:49:56 +01:00 |
|
Laurent Destailleur
|
8051e916c0
|
Merge pull request #13017 from andreubisquerra/develop
Add bold tags to Receipt Printers module
|
2020-02-05 12:40:07 +01:00 |
|
Laurent Destailleur
|
af22eb92d9
|
Merge pull request #13021 from mapiolca/patch-29
Fix Compatbility with Multicompany
|
2020-02-05 12:39:33 +01:00 |
|
Laurent Destailleur
|
63ba601906
|
Update box_project.php
|
2020-02-05 12:39:00 +01:00 |
|
Tobias Sekan
|
efcd4d0c63
|
Fix unset gender property in contact class
|
2020-02-05 12:34:29 +01:00 |
|
Laurent Destailleur
|
a11ef1c606
|
Merge pull request #13020 from TobiasSekan/FixGenderPhotoInContactCard
[Fix] Missing gender photo in contact card
|
2020-02-05 12:22:35 +01:00 |
|
ptibogxiv
|
94fd2b40c7
|
new fix Count of Stripe payment mode must take test/live into account
fix error message for if no stripe enabled 0b891d5e0c
|
2020-02-05 12:04:27 +01:00 |
|
VESSILLER
|
c3cf9e62b3
|
FIX links in products/services index
|
2020-02-05 11:31:02 +01:00 |
|
Laurent Destailleur
|
373b4ca0d9
|
Use constant
|
2020-02-05 10:59:32 +01:00 |
|
Pierre Ardoin
|
81ed70ffc7
|
Update box_project.php
|
2020-02-05 09:18:39 +01:00 |
|
Pierre Ardoin
|
d5b74a8ca3
|
Update box_project.php
|
2020-02-05 09:06:43 +01:00 |
|
Pierre Ardoin
|
262d889700
|
Update box_project.php
|
2020-02-05 08:50:51 +01:00 |
|
Laurent Destailleur
|
0b891d5e0c
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:47 +01:00 |
|
Laurent Destailleur
|
bc19f72306
|
FIX Count of Stripe payment mode must take test/live into account
|
2020-02-04 19:33:20 +01:00 |
|
Laurent Destailleur
|
0b45ceaf92
|
More logs
|
2020-02-04 18:59:49 +01:00 |
|
Laurent Destailleur
|
9c8119def9
|
Fix phpcs
|
2020-02-04 18:03:32 +01:00 |
|
Laurent Destailleur
|
71d0ed0754
|
css
|
2020-02-04 16:44:46 +01:00 |
|
Laurent Destailleur
|
bb1c9a66dd
|
Fix code alignement on modulebuilder
|
2020-02-04 16:37:30 +01:00 |
|
Laurent Destailleur
|
af7a5b510d
|
Fix phpcs
|
2020-02-04 14:47:30 +01:00 |
|
Laurent Destailleur
|
c5da131749
|
Fix param not defined
|
2020-02-04 14:40:11 +01:00 |
|
Laurent Destailleur
|
bb9f4c8ec3
|
Fix var_dump
|
2020-02-04 14:34:40 +01:00 |
|
Laurent Destailleur
|
976ce0a954
|
Fix scrutinizer
|
2020-02-04 14:33:25 +01:00 |
|
Laurent Destailleur
|
157745a1bb
|
Fix phpcs
|
2020-02-04 14:18:37 +01:00 |
|
AdrianDominik
|
4695172028
|
Merge remote-tracking branch 'upstream/11.0' into 11.0
|
2020-02-04 11:40:37 +01:00 |
|
Pierre Ardoin
|
d93a597a1e
|
Fix Compatbility with Multicompany
Before : Show all projects of all entities
Now : Show only projects that are allowed by permissions
|
2020-02-04 09:17:02 +01:00 |
|
Tobias Sekan
|
24c305dc7f
|
Fix unset gender property in contact class
|
2020-02-04 09:00:31 +01:00 |
|
root
|
2419f122c4
|
referer XSS patches
|
2020-02-03 23:10:04 +00:00 |
|
Laurent Destailleur
|
bf4fca0c7e
|
Fix warning
|
2020-02-03 22:09:21 +01:00 |
|
Laurent Destailleur
|
c367c6f34e
|
Avoid warning
|
2020-02-03 21:17:45 +01:00 |
|
Laurent Destailleur
|
d4ae8b81e4
|
Card examples
|
2020-02-03 20:49:21 +01:00 |
|
Mufeed VH
|
a2bd77ef58
|
Fix for the Cross-site Scripting (XSS) Vulnerability
|
2020-02-04 01:02:16 +05:30 |
|
andreubisquerra
|
5a248f31a6
|
Add langs
|
2020-02-03 19:34:39 +01:00 |
|
andreubisquerra
|
e6dc384ee9
|
Add bold tags
|
2020-02-03 19:33:23 +01:00 |
|
Laurent Destailleur
|
36461afea9
|
FIX Creation of Stripe card from backoffice must return a clean message
|
2020-02-03 14:55:02 +01:00 |
|