Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
37,360 Commits 39 Branches 191 Tags
07d64d472e1b6faefbf66e98f5ade435bdf45bd3
Commit Graph

37360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
07d64d472e Merge pull request #1022 from GPCsolutions/idea 
Ignore IntelliJIDEA module files
 2013-06-05 09:44:41 -07:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Regis Houssin
4819bc060a Merge pull request #1023 from GPCsolutions/normalized 
Normalized line endings to LF
 2013-06-05 07:22:07 -07:00
Raphaël Doursenaud
686f5add82 Normalized line endings to LF 2013-06-05 16:12:07 +02:00
Raphaël Doursenaud
95e657c171 Ignore IntelliJIDEA module files 2013-06-05 16:03:48 +02:00
Laurent Destailleur
e9ed4472d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-05 15:44:59 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
simnandez
26b36f3a4e Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:10:31 +02:00
Laurent Destailleur
7bae064415 Fix: Several fixes into scripts 2013-06-05 14:33:07 +02:00
Laurent Destailleur
e4d51c82c0 Fix: bad format of email content 2013-06-05 13:54:38 +02:00
Laurent Destailleur
3e1d2c3e63 Qual: Mutualized and uniformize code 2013-06-05 11:21:45 +02:00
Laurent Destailleur
c4f90f8174 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 11:10:25 +02:00
Laurent Destailleur
7aa145ae6a Fix: Previous fix was not complete 2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70 Fix: ModelDoc Activation bug 2013-06-05 10:49:12 +02:00
Laurent Destailleur
a34ab5a13f Look: Email at a better place 2013-06-04 23:19:04 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
67758c963b Fix: PHPUnit tests 2013-06-04 22:52:58 +02:00
Laurent Destailleur
7b0897a669 fix: LF 2013-06-04 22:03:11 +02:00
Laurent Destailleur
d3cf8479e3 Try to commit a file with a line with CRLF and see... 2013-06-04 19:36:41 +02:00
Laurent Destailleur
d30ece9f36 For eol also into extension definition. Let's see if this works. 2013-06-04 19:33:32 +02:00
Laurent Destailleur
633b389564 Merge pull request #1016 from GPCsolutions/gitattributes 
Added a gitattribute file to let git deal with line ending issues
 2013-06-04 10:21:01 -07:00
Raphaël Doursenaud
39e467afbc Force git to use LF line endings for PHP files 2013-06-04 12:32:36 +02:00
Laurent Destailleur
3ee668b4da Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-04 12:11:56 +02:00
Laurent Destailleur
c6c4a83850 Fix: Removed deprecated code fo local tax type 7 since we can use now 
the fiscal stamp that is a better implementation.
 2013-06-04 12:04:04 +02:00
Laurent Destailleur
3cb6e196b6 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:31:54 +02:00
Laurent Destailleur
073a04f8cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-04 00:31:04 +02:00
Laurent Destailleur
205ff535a9 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:30:38 +02:00
Laurent Destailleur
c60e94c723 Merge pull request #1018 from fappels/develop 
Added flemish legal forms to belgium entries
 2013-06-03 14:43:35 -07:00
Laurent Destailleur
e7989d9e51 Merge pull request #1017 from GPCsolutions/idea 
Added an ignore rule for JetBrains IntelliJIDEA IDE projects
 2013-06-03 14:42:57 -07:00
Laurent Destailleur
2e1170297c Merge pull request #1015 from defrance69/patch-17 
Update fiche.php
 2013-06-03 14:37:19 -07:00
Laurent Destailleur
a5800fbd8b Merge pull request #1014 from defrance69/patch-16 
Update fichinter.class.php
 2013-06-03 14:36:47 -07:00
Laurent Destailleur
b1a280de32 Fix: error message 2013-06-03 23:11:36 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
26ac8f9f28 Fix: Missing translation 2013-06-03 22:17:03 +02:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Laurent Destailleur
205335f347 Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
Laurent Destailleur
0530b231bb Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:52:53 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
3127d66b17 Fix: Regression 2013-06-03 19:46:43 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00
Laurent Destailleur
1aa5535741 New: Add function to get http content 2013-06-03 17:44:55 +02:00
Francis Appels
1a480b4e68 modified abrviation of code 227 2013-06-03 16:34:44 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Raphaël Doursenaud
e797563d34 Added an ignore rule for JetBrains IntelliJIDEA IDE projects 
This also include derived products such as PHPstorm
 2013-06-03 12:23:04 +02:00
Raphaël Doursenaud
6856ca3993 Added a gitattribute file to let git deal with line ending issues 2013-06-03 12:10:07 +02:00
Laurent Destailleur
7dc984fd6f Fix: Loading of boxes from external modules 2013-06-03 11:33:13 +02:00