Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-22 17:31:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,347 Commits 36 Branches 190 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

68347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ee870342ef Fix navigation/translation 2018-04-06 20:22:20 +02:00
Laurent Destailleur
0abcf5694c Fix message of discount 2018-04-06 20:18:36 +02:00
Laurent Destailleur
ebb418fe3a Fix CSRF test 2018-04-06 20:06:05 +02:00
Laurent Destailleur
35d2f0e441 Fix no lose entry when error on survey comment submission 2018-04-06 19:42:59 +02:00
Laurent Destailleur
84426c69e3 Fix not not saved 2018-04-06 19:26:24 +02:00
Laurent Destailleur
77f2b137b5 FIX XSS 2018-04-06 19:23:41 +02:00
Laurent Destailleur
1a321e19c8 FIX XSS in company setup page 2018-04-06 19:12:13 +02:00
Laurent Destailleur
417c07a6e8 Fix REFLECTED XSS 2018-04-06 18:33:51 +02:00
Laurent Destailleur
2d1183cbb7 FIX can bypass the CSRF protection with url with domain inside 2018-04-06 17:58:30 +02:00
Laurent Destailleur
7877854693 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-06 17:37:19 +02:00
Laurent Destailleur
1623fea618 FIX SQL Injection CWE-89 2018-04-06 17:25:22 +02:00
Laurent Destailleur
f56438112f FIX CWE-89 2018-04-06 17:22:14 +02:00
Laurent Destailleur
b412f0b76b Better interaction to setup email 2018-04-06 16:38:47 +02:00
Laurent Destailleur
85d4f7115b Better position of the substitution tooltip for emails 2018-04-06 16:16:08 +02:00
Laurent Destailleur
1319bb35fb Fix phpcs 2018-04-06 14:41:45 +02:00
Laurent Destailleur
99d72dc28c Debug 2018-04-06 14:30:18 +02:00
Laurent Destailleur
049b9b2a5f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-06 14:19:25 +02:00
Laurent Destailleur
9ba55f0d1f Debug list of transactions 2018-04-06 14:19:11 +02:00
Laurent Destailleur
8e778df0ff Debug stripe module 2018-04-06 14:05:07 +02:00
Laurent Destailleur
d3adbdfbbc FIX Restaure way to have empty entry menu 2018-04-06 14:04:52 +02:00
Laurent Destailleur
b0dc4c6d4a Merge pull request #8376 from ptibogxiv/patch-18 
NEW add internal stripe payment page for invoice
 2018-04-06 13:40:57 +02:00
Laurent Destailleur
1009a629d9 Try better Fix for #8432 2018-04-06 13:20:09 +02:00
Laurent Destailleur
a886fadc2d Merge pull request #8493 from aspangaro/8.0-a13 
NEW Module Assets
 2018-04-06 12:41:56 +02:00
Laurent Destailleur
956fc2376d FIX #8483 2018-04-06 12:27:55 +02:00
Laurent Destailleur
f3e1581ba0 Merge pull request #8483 from hregis/develop_ldap 
Fix: remove html tags and decode html entities
 2018-04-06 11:28:11 +02:00
Laurent Destailleur
9ce5d02fde Merge pull request #8517 from bafbes/master700 
define module part to include external modules menus
 2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4 Update conf.class.php 2018-04-06 11:25:48 +02:00
François J
a78c064461 Fix CommandeFournisseur::getDispachedLines line ID & return quantity 2018-04-06 11:22:15 +02:00
Laurent Destailleur
e20585daed Merge pull request #8505 from OPEN-DSI/fix-supplier-order-get-dispatched-line-id-add-quantity 
FIX CommandeFournisseur::getDispachedLines line ID & return quantity
 2018-04-06 09:17:51 +02:00
Laurent Destailleur
e7d69b18bd Merge pull request #8504 from ATM-Nicolas/develop 
NEW : Add link between credit note invoice and origin
 2018-04-06 09:15:02 +02:00
Regis Houssin
b43aca0f8d Fix: use dol_string_nohtmltag instead (with strip_tags) 2018-04-06 08:52:02 +02:00
Regis Houssin
c5cf2e4d50 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2018-04-06 08:13:37 +02:00
Alexandre SPANGARO
3e66f5e25b Update works 2018-04-06 06:04:03 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Laurent Destailleur
5d6d019fe7 Fix phpunit 2018-04-06 00:21:40 +02:00
Laurent Destailleur
723ac6fba0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-06 00:02:06 +02:00
Laurent Destailleur
920891ba70 Fix edit of default opportunit percent 2018-04-06 00:01:24 +02:00
Alexandre SPANGARO
06dc70df09 Merge remote-tracking branch 'uptream/develop' into 8.0-a13 2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
619805c7a5 Update works 2018-04-05 20:40:41 +02:00
Laurent Destailleur
658e1224d1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
2207e5e470 Fix tooltip 2018-04-05 19:23:36 +02:00
TuxGasy
47dcc0d5c6 fix notrigger ignored on BILL_CREATE 2018-04-05 18:32:41 +02:00
Laurent Destailleur
9892a97424 Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE 
fix notrigger ignored on BILL_CREATE
 2018-04-05 18:27:45 +02:00
Laurent Destailleur
2d547abaa9 Merge pull request #8498 from atm-john/New_import_lines_from_linked_element 
New import lines from linked element
 2018-04-05 18:26:47 +02:00
Laurent Destailleur
6c409b2670 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 18:08:19 +02:00
John
57db0d2a16 Add hidden conf 2018-04-05 17:26:08 +02:00
John
b02f34b038 Add line edit progress test 2018-04-05 17:13:45 +02:00
Laurent Destailleur
ba7261bf0c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-05 16:44:13 +02:00
Laurent Destailleur
d55657951d Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda 
FIX: img_pictos for remove assigned user in agenda card
 2018-04-05 16:42:40 +02:00