Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
77,937 Commits 36 Branches 189 Tags
2f46b40da2d058c5cea018dcee7185a22984b8fc
Commit Graph

1678 Commits

Author SHA1 Message Date
Laurent Destailleur
2f46b40da2 Prepare feature "Never show this message again" 2019-08-18 18:36:18 +02:00
Laurent Destailleur
b8e1cc8d16 Enhance #11643 2019-08-18 03:42:38 +02:00
Laurent Destailleur
467ad3ed22 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/product/stock/card.php
 2019-08-16 21:48:46 +02:00
Laurent Destailleur
898996da4a FIX vulenrability in uploading file found by 美创科技安全实验室 2019-08-16 21:45:13 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Laurent Destailleur
a03771ce61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:40 +02:00
Laurent Destailleur
bf14b4b3d5 Add Canada Dollar in currency that need symbol before 2019-08-01 16:20:18 +02:00
Laurent Destailleur
24bfd9d98b Merge pull request #11605 from grandoc/new_branch_01_08_2019 
add CAN$ within list of currencies before
 2019-08-01 16:18:37 +02:00
Laurent Destailleur
73715f00af Update functions.lib.php 2019-08-01 16:18:26 +02:00
Laurent Destailleur
008a54ea19 Update functions.lib.php 2019-08-01 16:14:53 +02:00
dolibarr95
b066431e0e Add phone format for Jamaica 2019-08-01 15:46:34 +02:00
Laurent Destailleur
d6ae62478c FIX #10984 FIX reposition on "Build backup" button 
FIX Fatal error on dol_htmloutput_mesg with corrupted array
 2019-08-01 15:42:44 +02:00
Philippe GRAND
4b8963587a add CAN$ within list of currencies before 2019-08-01 10:02:53 +02:00
Regis Houssin
d9ea61e47c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop_menu

Conflicts:
	htdocs/commande/class/commande.class.php
 2019-07-31 12:49:56 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Regis Houssin
7ffc46e1da FIX When we are in update mode, so we use $this->entity 2019-07-19 09:47:05 +02:00
Regis Houssin
cbda42d146 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-07-19 09:37:34 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +02:00
Laurent Destailleur
122c4eb8bd Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction 
FIX empty test
 2019-06-14 13:51:34 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00
ATM john
0ef9a8843a Fix empty test 2019-06-13 21:57:30 +02:00
Laurent Destailleur
a08dcec7fc Fix doc 2019-06-04 20:02:29 +02:00
Regis Houssin
e5e6111544 FIX wrong function name 2019-06-03 12:05:58 +02:00
Regis Houssin
b0042995ac FIX add docs 2019-06-03 12:04:17 +02:00
Regis Houssin
38246b4088 NEW add new function "setEntity()" 2019-06-03 11:13:26 +02:00
Laurent Destailleur
5530e003ba Fix title 2019-06-02 19:47:19 +02:00
Laurent Destailleur
e6100310af Fix missing title 2019-06-02 19:47:01 +02:00
Laurent Destailleur
ab73d8a6fc Merge pull request #11258 from hregis/develop_security 
FIX add Windows and Mac executable
 2019-05-29 13:52:19 +02:00
Laurent Destailleur
05063016e8 FIX #11244 Enhance repair tool 2019-05-29 12:21:51 +02:00
Laurent Destailleur
2404e6a521 Fix cast to int 2019-05-28 12:38:21 +02:00
Regis Houssin
3df6f0f6c3 FIX wrong extension 2019-05-27 11:43:06 +02:00
Regis Houssin
c1242f409b FIX add Windows and Mac executable 2019-05-27 11:32:46 +02:00
Laurent Destailleur
11bcfb4f5e Fix check on VAT syntax not visible on list 2019-05-22 15:37:59 +02:00
Laurent Destailleur
42f5ebed2d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/admin/system/database-tables.php
	htdocs/admin/tools/export_files.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/functions.lib.php
 2019-05-21 15:13:25 +02:00
Laurent Destailleur
f283e24b48 Fix the noexe must be added for dangerous extension like js and shells 2019-05-21 13:53:12 +02:00
Laurent Destailleur
94f5f6c655 Merge pull request #11207 from atm-john/FIX_scrutyniser 
FIX: scrutinizer feedback
 2019-05-18 16:05:24 +02:00
Laurent Destailleur
11fea03074 Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
2d0b3b7b23 Fix dol_sort_array for objects 2019-05-16 12:25:14 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
Laurent Destailleur
717cafe213 Fix doc 2019-05-15 17:50:35 +02:00
ptibogxiv
f50280f13b Fix img_credit_card with payment methods 2019-05-10 01:16:58 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9 FIX Default value on form to send email 2019-05-02 15:34:29 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
a75c6a81d1 FIX Follow rule to create a new page 2019-05-01 17:15:42 +02:00
Laurent Destailleur
10dde837d0 Debug email collector 2019-04-25 19:32:48 +02:00
Laurent Destailleur
f19d96bf8d NEW Show enabled modules in dol_print_error 2019-04-23 10:24:05 +02:00