Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,957 Commits 36 Branches 189 Tags
288aea190b5561f8b5bee8fc8a610c9417a9643b
Commit Graph

1719 Commits

Author SHA1 Message Date
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
981c5c877a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-27 20:02:08 +02:00
Laurent Destailleur
24ad67e0e1 Fix missing $conf 2019-09-27 20:01:57 +02:00
Laurent Destailleur
66cbb4020b Merge branch 'develop' into patch-4 2019-09-27 14:46:39 +02:00
Alexandre SPANGARO
4b73e09c60 Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-27 14:20:53 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
f96c9c3bb5 FIX #11931 #11963 2019-09-27 11:51:34 +02:00
Alexandre SPANGARO
e38bb89a2e NEW Add fa_icon on load_fiche_titre 2019-09-27 11:48:40 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
Alexandre SPANGARO
f4929c5315 NEW Add fa_icon "tools" for load_fiche_titre 2019-09-25 15:24:52 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
6431e8e16d FIX SQL injection on qty 2019-09-24 12:43:44 +02:00
Laurent Destailleur
40f75b16d8 FIX Substitution of __PROJECT_XXX__ not done 2019-09-23 13:04:22 +02:00
Frédéric FRANCE
e43f3a0f58 Update functions.lib.php 2019-09-16 18:07:06 +02:00
Frédéric FRANCE
5c00712c0a Update functions.lib.php 2019-09-16 17:57:40 +02:00
Laurent Destailleur
544a1237bc FIX regression with option to hide picto on top menu 2019-09-15 15:11:13 +02:00
Laurent Destailleur
7019e69ee2 FIX regression with option to hide picto on top menu 2019-09-15 15:09:36 +02:00
Laurent Destailleur
166d56f7a3 Removed function dol_micro_time. Use native PHP microtime instead. 2019-09-13 11:15:49 +02:00
Laurent Destailleur
5f236fda2e More complete error message with hour/min/sec 2019-09-11 00:28:09 +02:00
Laurent Destailleur
ca7ce63648 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-09-02 23:04:15 +02:00
Laurent Destailleur
a126b1e538 FIX Add char $ and ; in sanitizing of filenames. 2019-09-02 22:25:44 +02:00
Laurent Destailleur
7f5728ead9 A better message when database is off. 2019-08-31 19:39:39 +02:00
Laurent Destailleur
a3e221468a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Laurent Destailleur
01962cbc67 Clean code 2019-08-29 13:17:14 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
c10f755619 Fix compatibility with old multicompany modules 2019-08-29 00:19:46 +02:00
Laurent Destailleur
76e8384f09 NEW Add option multiselect for developers on the selector of language. 2019-08-28 16:06:19 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
 2019-08-22 12:45:23 +02:00
Laurent Destailleur
cdda08c0d3 FIX #11685 2019-08-22 11:47:03 +02:00
Laurent Destailleur
923eb935eb Revert "FIX for MAIN_MAXTABS_IN_CARD = $i card" 2019-08-22 11:28:49 +02:00
Laurent Destailleur
2bc0163354 Merge pull request #11685 from ptibogxiv/patch-224 
FIX for MAIN_MAXTABS_IN_CARD = $i card
 2019-08-22 11:25:08 +02:00
Laurent Destailleur
bfbabbf626 Update geoip v1 2019-08-21 18:26:41 +02:00
Laurent Destailleur
689aa4979e Code comment 2019-08-21 17:28:54 +02:00
Laurent Destailleur
c60fc6c3d4 Add param logcontext on dol_syslog 2019-08-20 13:57:25 +02:00
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
ptibogxiv
93d64bb84e Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64 FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +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