lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
64,912 Commits 43 Branches 150 Tags 886 MiB
0d15d8e0ad
Commit Graph

64912 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0d15d8e0ad Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/user/card.php
 2018-04-11 14:45:11 +02:00
Laurent Destailleur
804703c9c9 Fix regression 2018-04-11 14:43:16 +02:00
Laurent Destailleur
e1c83df086 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-04-11 14:39:13 +02:00
Laurent Destailleur
560038fa18 Fix regression in update contact 2018-04-11 14:38:56 +02:00
Laurent Destailleur
c2eb2bf10e
Merge pull request #8542 from ATM-Marc/FIX_user_autocomplete 
FIX: weird password autocompletion in Google Chrome (issue #8479)
 2018-04-11 13:22:42 +02:00
Laurent Destailleur
4f7fbb80ba Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:36 +02:00
Laurent Destailleur
21c65f812a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 13:21:20 +02:00
Laurent Destailleur
edb59c05dc
Merge pull request #8525 from atm-greg/Add_projettaskcard_hook 
add doActions hook on projettaskcard
 2018-04-11 13:20:07 +02:00
Laurent Destailleur
73aa34dfbe
Merge pull request #8528 from hregis/7.0_bug6 
FIX avoid Error: Call to undefined method mysqli::get_charset()
 2018-04-11 13:19:33 +02:00
Laurent Destailleur
ba526dd7f2
Merge pull request #8530 from hregis/7.0_bug3 
FIX missing User object with API REST
 2018-04-11 13:11:27 +02:00
Laurent Destailleur
e642535389
Merge pull request #8561 from frederic34/patch-11 
Update combinations.php
 2018-04-11 13:09:34 +02:00
Laurent Destailleur
6731e238a3
Merge pull request #8550 from atm-quentin/FIX_Issue_8037 
FIX issue #8037
 2018-04-11 13:06:26 +02:00
Laurent Destailleur
7d7c0624d2
Update traduction.php 2018-04-11 12:59:24 +02:00
Laurent Destailleur
50dd75632c
Merge pull request #8532 from atm-arnaud/FIX_8359_project_link_categ_list 
FIX #8359
 2018-04-11 12:57:41 +02:00
Laurent Destailleur
c958a4f865
Merge pull request #8558 from atm-greg/Fix_contact_birthday_update 
FIX #8259 can't update contact birthday with REST API
 2018-04-11 12:53:41 +02:00
Laurent Destailleur
d02405dccd
Merge pull request #8533 from atm-quentin/FIX_issues_8470 
FIX issue #8470
 2018-04-11 12:52:44 +02:00
Laurent Destailleur
dfe93bce21
Merge pull request #8534 from atm-maxime/fix_suporder_defaultcurrency 
FIX default currency not set on supplier order creation from commercial menu #8459
 2018-04-11 12:52:17 +02:00
Frédéric FRANCE
a95bc76afb
Update combinations.php 2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383
Update getCombinations.php 2018-04-11 12:05:23 +02:00
Frédéric FRANCE
2c76a6cd80
Update combinations.php 2018-04-11 11:44:22 +02:00
atm-greg
7cdc1c8bef Fix #8259 can't update contact birthday with REST API 2018-04-11 07:08:40 +02:00
atm-quentin
809b2a91ed FIX issue #8037 2018-04-10 16:27:18 +02:00
Marc de Lima Lucio
307ede8b22 FIX: weird password autocompletion in Goocle Chrome (issue #8479) 2018-04-10 15:03:50 +02:00
Maxime Kohlhaas
cb1a011b50 Fix default currency not set on supplier order creation from commercial menu #8459 2018-04-10 14:14:16 +02:00
atm-arnaud
d24b36f768 FIX #8359 2018-04-10 14:10:40 +02:00
atm-quentin
6277928b67 FIX issue #8470 2018-04-10 14:01:35 +02:00
Regis Houssin
97bf6fff7f Fix: missing User object with API REST 2018-04-10 08:07:23 +02:00
Regis Houssin
89ec185f51 Fix: avoid Error: Call to undefined method mysqli::get_charset() 2018-04-09 12:53:03 +02:00
Regis Houssin
976b5c26c7 Fix: TODO get_charset() function don't exists 2018-04-09 12:26:39 +02:00
atm-greg
b1469ba761 add doActions hook on projettaskcard 2018-04-09 07:06:20 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
Laurent Destailleur
3d36e3ee49 Fix search criteria in bookkeeping table 2018-04-08 12:41:03 +02:00
Laurent Destailleur
560c84be0d FIX When clearing filter, we must not save tmp criterias in session 2018-04-08 12:40:19 +02:00
Laurent Destailleur
8cca3dabd6 FIX look and feel v7 "back to" for bookkeeping record 2018-04-08 11:29:30 +02:00
Laurent Destailleur
aad99bdcc0 FIX Removed error when no error on accounting setup page 2018-04-07 22:27:42 +02:00
Laurent Destailleur
304adff973 FIX view of balance before field 
Conflicts:
	htdocs/compta/bank/bankentries_list.php
 2018-04-07 21:49:59 +02:00
Laurent Destailleur
989d1c87c6 Fix link to reconcile 2018-04-07 20:06:19 +02:00
Laurent Destailleur
bacee3c298 Translation 2018-04-07 20:06:14 +02:00
Laurent Destailleur
5a34a22934 Code comment 2018-04-07 13:04:52 +02:00
Laurent Destailleur
15c7bbf9d8 Fix input lost when error 2018-04-07 12:28:10 +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