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

59904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f0df9b8d23 Update package file 2017-06-19 05:06:50 +02:00
Laurent Destailleur
4ba6dc86cc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 04:15:46 +02:00
Laurent Destailleur
4c55700157 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-19 04:15:20 +02:00
Laurent Destailleur
71641c5743 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-19 04:14:07 +02:00
Laurent Destailleur
ebc18cd2d4 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 04:13:24 +02:00
Laurent Destailleur
d0d9de37f4 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 04:05:40 +02:00
Laurent Destailleur
1bfdc7438a Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 04:03:26 +02:00
Regis Houssin
9352ecca1f Fix: PHP 7 - Fatal error: 'break' not in the 'loop' or 'switch' context 2017-06-19 04:01:34 +02:00
Laurent Destailleur
caf48f32c4 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-19 03:01:01 +02:00
Laurent Destailleur
43f25b49a1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-19 03:00:29 +02:00
Laurent Destailleur
5cd5986211 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-06-19 02:59:49 +02:00
Laurent Destailleur
39419bb411 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-06-19 02:59:16 +02:00
Laurent Destailleur
774c624687 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-06-19 02:58:44 +02:00
Laurent Destailleur
b331176bf7 Fix bad data 2017-06-19 02:58:09 +02:00
Laurent Destailleur
52eeeebac9 Fix bad data in sql dump 2017-06-19 02:57:49 +02:00
Laurent Destailleur
5439390461 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-06-19 02:57:12 +02:00
Laurent Destailleur
6fc4dacd42 Fix migration opensurvey 2017-06-19 02:55:33 +02:00
Laurent Destailleur
8d84277e8c Complete repair script 2017-06-19 02:18:04 +02:00
Laurent Destailleur
a1f08be479 Fix phpcs 2017-06-18 22:21:42 +02:00
Laurent Destailleur
996ec4926b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/lib/files.lib.php
	htdocs/don/card.php
 2017-06-18 22:16:34 +02:00
Laurent Destailleur
317ab64d7c Fix escapement 2017-06-18 22:03:25 +02:00
Laurent Destailleur
f3a5975cf8 Fix sql injection 2017-06-18 21:58:56 +02:00
Laurent Destailleur
8debefa8ad Fix php sanitazing 2017-06-18 21:53:06 +02:00
Laurent Destailleur
0ef507ae7f Fix rename of file to remove .noexe extension. 2017-06-18 21:52:51 +02:00
Laurent Destailleur
819656bd89 Fix security: Check _SERVER["QUERY_STRING"] is escaped. 2017-06-18 21:27:49 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
abe736c6a6 Escape hml tags 2017-06-18 19:42:59 +02:00
Laurent Destailleur
cde0da6e12 Fix responsive 2017-06-18 12:48:58 +02:00
Laurent Destailleur
787d6946b2 Continue work started on module builder 2017-06-18 12:30:18 +02:00
Laurent Destailleur
862b12abfd Fix responsive 2017-06-17 21:28:29 +02:00
Laurent Destailleur
69b26dcb4e Work on modulebuilder 2017-06-17 21:23:52 +02:00
Laurent Destailleur
a6b4b15e07 Work on modulebuilder 2017-06-17 19:40:48 +02:00
Laurent Destailleur
c01bd37a82 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-06-17 18:23:38 +02:00
Laurent Destailleur
285b5563d6 Update changelog 2017-06-17 18:23:26 +02:00
Laurent Destailleur
9a04208150 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-06-17 18:04:04 +02:00
Laurent Destailleur
0482137620 Fix warning 2017-06-17 18:03:53 +02:00
Laurent Destailleur
b73228899a Merge pull request #7024 from defrance/patch-14 
Introduce weight conversion lb & oz
 2017-06-17 17:52:20 +02:00
Laurent Destailleur
af3e505587 Merge pull request #7022 from hregis/develop_mc 
Fix: missing hookmanager init
 2017-06-17 17:49:46 +02:00
Laurent Destailleur
60b278ac39 Merge pull request #7021 from Dolibarr/revert-7020-7.0-1 
Revert "Fix SPEC #7013 : use database type "numeric" to store monetary values"
 2017-06-17 17:48:37 +02:00
BENKE Charlene
fcdf68db6a Update commonobject.class.php 2017-06-17 16:31:54 +02:00
BENKE Charlene
db17363267 Update other.lang 2017-06-17 16:30:37 +02:00
BENKE Charlene
12cab2dfe0 Once to Ounce 2017-06-17 16:30:03 +02:00
Regis Houssin
d1b003f3c4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-17 12:01:14 +02:00
Laurent Destailleur
8a1de52f3c Fix translation 2017-06-17 12:00:33 +02:00
Laurent Destailleur
a4f34539ea Fix translation 2017-06-17 11:46:45 +02:00
Laurent Destailleur
7c41c9a3e4 Fix activation of dependency for a dedicated country. 
BlockedLog depends now on CashDesk only.
 2017-06-17 11:43:00 +02:00
Laurent Destailleur
bebe7baa80 Fix images into medias not reabable into send emails 2017-06-17 10:44:08 +02:00
Regis Houssin
49e8af7cc9 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2017-06-17 10:34:50 +02:00
BENKE Charlene
f0bc72cda4 WeightUnitonce translation 2017-06-17 10:27:00 +02:00
BENKE Charlene
17247c64f0 add WeightUnitonce 2017-06-17 10:26:01 +02:00