Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,197 Commits 36 Branches 190 Tags
b5c815367cbb211fef8f3fd2bc6213b0e2af902c
Commit Graph

4292 Commits

Author SHA1 Message Date
Laurent Destailleur
b5c815367c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-26 15:44:31 +01:00
Laurent Destailleur
bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
 2016-12-26 12:42:23 +01:00
Laurent Destailleur
e297b64722 Several security fix in using mailings. 2016-12-26 12:35:10 +01:00
Laurent Destailleur
c9c8079c3d Can add additionnal paramon mail to solve rare sendmail problems 2016-12-26 00:00:28 +01:00
Laurent Destailleur
a2133f391f Complete work on dol_banner 2016-12-23 14:52:25 +01:00
Laurent Destailleur
43942e6ea2 Fix css and fix navigation on resource tab. 2016-12-23 13:04:46 +01:00
Laurent Destailleur
ba7ca3da6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop6

Conflicts:
	htdocs/core/photos_resize.php
	htdocs/install/mysql/data/llx_c_action_trigger.sql
 2016-12-22 17:57:42 +01:00
Laurent Destailleur
b4ed0a1e12 Fix nb of lat approvals wrong 2016-12-22 17:30:39 +01:00
Laurent Destailleur
081d3f0814 Quick hack by adding hidden constant to solve a locking feature (how to 
add project if likned to another third on project view)
 2016-12-22 16:52:03 +01:00
Laurent Destailleur
d66bc10d05 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/list.php
 2016-12-22 15:54:01 +01:00
Laurent Destailleur
574f84bb84 Fix warning for approval delay. 2016-12-22 15:49:06 +01:00
Laurent Destailleur
77c320a092 Fix warning for expense report late 2016-12-22 15:33:43 +01:00
Laurent Destailleur
26098082d0 NEW Uploaded files are indexed into database 2016-12-20 22:14:27 +01:00
Laurent Destailleur
ed0ffd6f5a NEW Uploaded files are indexed into database 2016-12-20 19:42:25 +01:00
Laurent Destailleur
0ef963604f Fix option moreinheader not correctly supported with smtps 2016-12-20 12:38:24 +01:00
Laurent Destailleur
3c79f3acb5 Minor fixes or code comment 2016-12-20 12:06:26 +01:00
Laurent Destailleur
be19a999f5 Fix regression losing warning on not defined emails 2016-12-19 18:11:53 +01:00
Laurent Destailleur
0eded9a8b7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-19 02:36:10 +01:00
Laurent Destailleur
0d1d68d5d9 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/product/price.php
 2016-12-19 02:34:29 +01:00
Laurent Destailleur
74e00c4d80 More comment and hidden option to solve problems when sending emails. 2016-12-19 01:04:17 +01:00
Laurent Destailleur
dbf96b8f59 Log at wrong place 2016-12-18 23:32:31 +01:00
Laurent Destailleur
54aa8696ad Fix regression 2016-12-18 13:01:26 +01:00
Laurent Destailleur
9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2016-12-18 11:57:04 +01:00
Laurent Destailleur
0988a2f173 Merge pull request #6187 from gnovaro/patch-5 
var to public
 2016-12-18 11:30:24 +01:00
Laurent Destailleur
3d57a457eb Merge pull request #6176 from gnovaro/patch-2 
Replace attributes var for public
 2016-12-18 11:28:04 +01:00
Laurent Destailleur
4ece746437 Merge pull request #6168 from defrance/patch-61 
FIX navigation field is always ref
 2016-12-18 11:02:14 +01:00
Laurent Destailleur
27785323ae Merge pull request #6164 from hregis/4.0_bug 
Fix: missing date locale and date rfc
 2016-12-18 10:57:29 +01:00
Laurent Destailleur
12e919b99d Merge pull request #6182 from atm-ph/fix_develop_user_right_write_margin 
Fix user right write margin
 2016-12-18 10:53:34 +01:00
Laurent Destailleur
78bf209119 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6 2016-12-18 02:21:57 +01:00
Laurent Destailleur
394e284a4a Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/class/CMailFile.class.php
	htdocs/langs/en_US/errors.lang
 2016-12-18 02:16:40 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
Laurent Destailleur
c5db333af8 Fix translation of error message when sending email 2016-12-17 14:00:39 +01:00
Gustavo Novaro
7728576f19 var to public 
Improve code style
 2016-12-17 03:49:28 -03:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
phf
cca7967144 Merge branch 'fix_user_right_write_margin' into fix_develop_user_right_write_margin 2016-12-15 16:19:54 +01:00
Gustavo Novaro
54b433ff6b Replace attributes var for public 
Improve code style.
 2016-12-15 09:54:45 -03:00
Laurent Destailleur
8f3ce46c50 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-15 12:12:36 +01:00
Laurent Destailleur
2c4c48ad6f Better fix to add server name into email id. 2016-12-15 12:11:39 +01:00
phf
21a648a052 Fix user right on margin module to write buyprice 2016-12-15 12:01:46 +01:00
BENKE Charlie
2cebeb72aa FIX navigation field is always ref 2016-12-14 15:04:07 +01:00
Laurent Destailleur
ecab7cb70e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/class/product.class.php
 2016-12-14 12:29:41 +01:00
Laurent Destailleur
d2e4888bdd Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-12-14 12:21:33 +01:00
Laurent Destailleur
e4dd020887 Fix bad concat 2016-12-14 11:23:55 +01:00
Laurent Destailleur
af407a094a FIX Introduce hidden option MAIL_PREFIX_FOR_EMAIL_ID to solve pb of 
tracking email.
 2016-12-14 11:20:44 +01:00
Regis Houssin
337509d40f Fix: missing date locale and date rfc 2016-12-13 09:40:08 +01:00
Laurent Destailleur
d2d0e66c5c Fix style fo ECM module 2016-12-13 01:19:33 +01:00
Laurent Destailleur
902169cb66 Can sort on position on list of documents 2016-12-13 00:40:12 +01:00
Laurent Destailleur
e1a5a90f0a NEW Uploaded files are indexed into database 2016-12-13 00:15:21 +01:00
Laurent Destailleur
0c84a0f9af Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-12-11 22:10:34 +01:00
Laurent Destailleur
6c4f15df63 Fix lot of fix in css look to match v5 rules. 2016-12-11 16:11:42 +01:00