Laurent Destailleur
5a0c66b9ad
Qual: Use getNomUrl for project into list of timesheet.
2014-08-14 13:29:24 +02:00
Laurent Destailleur
454cb1cbf8
Enhance skeleton
...
Add code_iso3 into array
2014-08-13 19:19:36 +02:00
Laurent Destailleur
e52d8a609f
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-06 11:01:43 +02:00
Laurent Destailleur
74d9ada517
Fix: Clean init data
2014-08-06 10:59:09 +02:00
Laurent Destailleur
544e75c2a1
Fix: Clean init data
2014-08-06 10:57:35 +02:00
Laurent Destailleur
9c6222a776
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-06 10:54:31 +02:00
Laurent Destailleur
338c4543fc
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:52:57 +02:00
Laurent Destailleur
098c5febd5
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:51:16 +02:00
Laurent Destailleur
272c438431
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:49:22 +02:00
Laurent Destailleur
800ded40d3
Fix: Removed table of external modules
2014-08-06 10:40:26 +02:00
Laurent Destailleur
d8fe7b904e
Fix: Removed table of external modules
2014-08-06 10:38:14 +02:00
Laurent Destailleur
35d2e4f84c
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-06 10:30:58 +02:00
Laurent Destailleur
230b1d4bb8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
test/phpunit/SqlTest.php
2014-08-06 10:28:37 +02:00
Laurent Destailleur
a430534768
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:22:34 +02:00
Laurent Destailleur
65b7f3d744
Fix: Clean data init
2014-08-06 10:18:32 +02:00
Laurent Destailleur
8c25fdfd2c
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:16:25 +02:00
Laurent Destailleur
86f4b874eb
Fix: Clean data init
2014-08-06 10:15:32 +02:00
Laurent Destailleur
7f0baa3d65
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:12:47 +02:00
Laurent Destailleur
bb201010e5
Fix: Clean data init
2014-08-06 10:12:02 +02:00
Laurent Destailleur
86c6709d02
Merge remote-tracking branch 'origin/3.4' into 3.5
2014-08-06 10:10:13 +02:00
Laurent Destailleur
0e2de54660
Fix: Clean data init
2014-08-06 10:02:02 +02:00
Laurent Destailleur
bb8ec0c8f9
Fix: Too many parameter
2014-08-01 14:26:13 +02:00
Laurent Destailleur
bdc9d5b463
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-08-01 00:34:24 +02:00
Laurent Destailleur
b1e3ac5181
Track we renamed getmypid into dol_getmypid.
2014-08-01 00:29:13 +02:00
frederic34
6645b8a454
Cannot redeclare getmypid()
2014-07-31 10:21:47 +02:00
Marcos García de La Fuente
0b31bfc067
Updated Vagrant Puphpet box
2014-07-29 11:23:13 +02:00
Laurent Destailleur
9ef3683acc
I grouped rules by Standard (PEAR, Generic, Zend, ...)
...
If a standard bring a rule that is duplicate than the other, we must
keep it commented saying duplicate with.
So at any time we know which rule we match for each standard.
2014-07-26 15:07:30 +02:00
Laurent Destailleur
9eb54ffb4b
Fix: Bad merge
2014-07-20 16:14:25 +02:00
Laurent Destailleur
5572364d2b
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
dev/codesniffer/ruleset.xml
2014-07-20 16:09:42 +02:00
Laurent Destailleur
85ccb094b4
Fix: More complete exclusion list
2014-07-20 15:54:37 +02:00
Laurent Destailleur
0452c2d68e
Qual: Enhance PHPCS sheet.
2014-07-20 15:39:38 +02:00
Laurent Destailleur
cfc337a79a
Qual: Enable php checkstyle rule Zend.Files.ClosingTag
...
Fix: Solve a lot of checkstyle errors.
2014-07-20 15:27:38 +02:00
Marcos García de La Fuente
43f6d3deaf
Moved dolibarr source to another folder of /var/www so that external libraries get separated from dolibarr core
2014-07-12 15:51:39 +02:00
Marcos García de La Fuente
0c8765bfe3
Updated vagrant box
2014-07-12 14:56:22 +02:00
Laurent Destailleur
aaa2d75dc3
Disable test on Zend.Files.ClosingTag for the moment to try to restore a
...
green status with travis.
2014-07-08 01:04:16 +02:00
Laurent Destailleur
07ff74b069
Revert "Update ruleset.xml"
...
This reverts commit 9cca9f352f
2014-07-08 00:19:00 +02:00
Laurent Destailleur
a2bc97210b
Merge pull request #1721 from frederic34/patch-6
...
Update ruleset.xml
2014-07-07 21:27:09 +02:00
Laurent Destailleur
8b9755e7c2
Merge pull request #1717 from frederic34/patch-5
...
Update ruleset.xml
2014-07-07 21:24:17 +02:00
Laurent Destailleur
9eaa096c79
Merge pull request #1716 from frederic34/patch-4
...
Update ruleset.xml
2014-07-07 21:24:00 +02:00
frederic34
9cca9f352f
Update ruleset.xml
...
PHP code MUST NOT contain any character before the opening tag
2014-07-07 21:11:03 +02:00
Laurent Destailleur
8ed0798939
Use id of module + delta
2014-07-06 20:53:38 +02:00
frederic34
f7586cdbfa
Update ruleset.xml
...
PHP code MUST use only UTF-8 without BOM.
2014-07-06 16:43:16 +02:00
frederic34
2080f58c2c
Update ruleset.xml
...
The closing ?> tag MUST be omitted from files containing only PHP.
2014-07-06 15:49:24 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
KreizIT
1e5c35093b
Review trigger for user module
2014-07-03 14:01:01 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Marcos García de La Fuente
4b3be7bc9a
Removed support to PHPmyAdmin
2014-06-23 12:30:24 +02:00
Marcos García de La Fuente
69ddac78cb
Updated .gitignore and README with new versions
2014-06-23 12:01:04 +02:00
Marcos García de La Fuente
e6da3d94ba
Updated PuPHPet vagrant box to latest version
2014-06-23 11:28:59 +02:00
Marcos García de La Fuente
56abf1cd72
Removed duplicated SQL error logging
2014-06-13 02:28:30 +02:00
