Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

1242 Commits

Author SHA1 Message Date
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
Marcos García de La Fuente
9fbd7806f0 More substitutions 2014-06-12 11:31:53 +02:00
Laurent Destailleur
39c1064261 Fix: Process only .lang files. 2014-05-30 18:30:24 +02:00
Raphaël Doursenaud
020c662537 Added a script to automatically remove PHP closing tag 2014-05-26 13:54:03 +02:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again) 
These were reintroduced by careless merge
 2014-05-26 13:51:25 +02:00
Laurent Destailleur
349d6177d1 Clean more secondary languages 
Add information of file and line number when a duplicate translation key
is found.
 2014-05-22 14:35:53 +02:00
Laurent Destailleur
e9ab84074e Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 14:33:42 +02:00
Laurent Destailleur
4e00d4467c Clean: Add script to clean secondary language files 
Clean language files for de_AT (only delta compared to de_DE).
 2014-05-22 12:41:43 +02:00
Laurent Destailleur
4f52f22735 Fix: Run script from correct dir 2014-05-18 12:06:09 +02:00
Florian HENRY
26b74a53a2 Fix initdata 3.6 for CommandeFournisseurTest.php run correctly 2014-05-14 14:17:03 +02:00
Florian HENRY
ff454130de add tobatch into into data product 2014-05-14 12:58:20 +02:00
Florian HENRY
100628622a fix insert data from initdata3.6 form url column into llx_product 2014-05-14 12:53:06 +02:00
Florian HENRY
9cd8b3a2b7 Add url column into llx_product into initdata for 3.6 (else phpunit is 
not happy)
 2014-05-14 11:49:54 +02:00
Laurent Destailleur
8985d60c5b Update doc 2014-05-08 20:15:44 +02:00
Laurent Destailleur
c2c0a9b4bb Merge pull request #1568 from GPCsolutions/closingtagremoval 
Qual: Remove the closing PHP tag
 2014-05-04 18:08:37 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
7f9f7aa84e Fixed problems with shared folders in Mac. Won't affect other OS 2014-05-01 13:21:09 +02:00
Marcos García de La Fuente
6037777e52 Ignored auto generated RSA keys 2014-05-01 13:20:38 +02:00
Marcos García de La Fuente
80bd018815 Updated Puphpet vagrant box to latest version 2014-05-01 12:32:23 +02:00
Laurent Destailleur
1b02cdd352 Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	ChangeLog
	dev/initdata/mysqldump_dolibarr_3.5.0.sql
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/product/index.php
	htdocs/user/fiche.php
 2014-04-12 00:53:25 +02:00
Laurent Destailleur
dc6a09f746 Doc 2014-04-07 00:00:30 +02:00
Laurent Destailleur
6a916a4ce9 Add sq_AL (albanian) language 2014-04-06 23:29:07 +02:00
Laurent Destailleur
90f5f0823f Prepare 3.5.2 2014-04-05 16:32:25 +02:00