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

823 Commits

Author SHA1 Message Date
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now 
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
 2015-01-25 21:32:40 +01:00
Laurent Destailleur
820fc3dbc9 Merge pull request #2276 from aspangaro/3.7 
Correct link & typo
 2015-01-25 18:13:29 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
Laurent Destailleur
04afe935a5 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-01-22 21:47:32 +01:00
Laurent Destailleur
b7cff09ce6 Fixed travis errors 2015-01-22 21:46:22 +01:00
aspangaro
e9e552533f Correct link 2015-01-22 21:13:08 +01:00
Laurent Destailleur
5c007e53be Update sample examples 2015-01-22 18:35:02 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
38b51c0a14 Prepare 3.7 release 2014-12-21 21:07:31 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
5bcb195c15 Update codesniffer to remove travis errors. 2014-12-20 00:14:53 +01:00
Laurent Destailleur
d8838f9438 Update codesniffer to remove travis errors. 2014-12-20 00:11:43 +01:00
Laurent Destailleur
11368e48fe Update codesniffer to remove travis errors. 2014-12-20 00:11:12 +01:00
Laurent Destailleur
78ef12cc0d Merge remote-tracking branch 'origin/3.7' into develop 2014-12-19 19:12:05 +01:00
Laurent Destailleur
748b076d61 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-19 19:11:06 +01:00
Laurent Destailleur
789d588fde Update codesniffer to remove travis errors. 2014-12-19 19:10:41 +01:00
Laurent Destailleur
0bb431c4d0 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-19 19:03:05 +01:00
Laurent Destailleur
47cab90336 Update codesniffer to remove travis errors. 2014-12-19 19:01:29 +01:00
Laurent Destailleur
c120e7b3df Clean deprecated files. 
Add utility tool
 2014-12-19 16:10:11 +01:00
Laurent Destailleur
c163223957 Moved vagrant dir into obsolete repo 2014-12-19 12:39:20 +01:00
Laurent Destailleur
c3ac607e4f Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
 2014-12-18 23:56:40 +01:00
Laurent Destailleur
c571013fc9 Merge remote-tracking branch 'origin/3.6' into 3.7 2014-12-18 23:55:07 +01:00
Laurent Destailleur
3debf56c68 Update phpcs 2014-12-18 23:54:39 +01:00
Laurent Destailleur
b1c4d32fbf Update phpcs file 2014-12-18 23:53:17 +01:00
Laurent Destailleur
ad515ef5e5 Exclude test 2014-12-18 23:49:07 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
cf641194a1 Fix: CRLF 2014-12-09 00:02:43 +01:00
Laurent Destailleur
72c3954f36 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
 2014-12-05 21:12:35 +01:00
Laurent Destailleur
df066c3741 Fix: PHPCS 2014-12-05 20:34:36 +01:00
Laurent Destailleur
344aa40858 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	.travis.yml
	dev/codesniffer/ruleset.xml
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
 2014-12-05 20:21:40 +01:00
Laurent Destailleur
9b5a03fa82 Fix: PHPCS 2014-12-05 20:08:37 +01:00
Laurent Destailleur
46f9ab15da Fixed: PHPCS 2014-12-05 19:26:21 +01:00
Laurent Destailleur
5755a046c5 Fix: PHPCS 2014-12-05 19:25:08 +01:00
Laurent Destailleur
4ad93cd069 Fix: PHPCS 2014-12-05 17:49:27 +01:00
Laurent Destailleur
a5bdf952ee Fix: PHPCS 2014-12-05 17:44:47 +01:00
Laurent Destailleur
c36d362248 Fix: PHPCS 2.0 2014-12-05 17:38:34 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
 2014-12-03 12:54:42 +01:00
Laurent Destailleur
931c1fc671 Sync from transifex 2014-11-30 16:20:58 +01:00
Laurent Destailleur
ef4bdcdb2a Merge remote-tracking branch 'origin/3.7' into develop 2014-11-30 15:43:04 +01:00
Laurent Destailleur
86e04cb62f Enhance tool to fix images 2014-11-30 15:40:28 +01:00
Laurent Destailleur
e395fd8096 Fix CRLF 2014-11-30 15:24:39 +01:00
Laurent Destailleur
d39dbe66c8 Fix: Removed duplicate entrie into language files 
Renamed tool so all script to run before release start with "fix".
 2014-11-30 14:51:57 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Raphaël Doursenaud
7a7097a106 Work around bug #1643 2014-11-17 14:58:48 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Juanjo Menent
d9b27fc280 Qual: Skeleton class updated by using table_element instead "mytable" 
and __METHOD__ for syslog
 2014-11-11 21:43:56 +01:00
Laurent Destailleur
7da4edda01 Incresae value for warning 2014-11-10 09:48:26 +01:00
Laurent Destailleur
a99bd1c835 Fix: Fix permission on files. 2014-10-17 15:30:38 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
Raphaël Doursenaud
b9954f5b2b PHP 5.6 compatibility 
$HTTP_RAW_POST_DATA is now DEPRECATED
Replaced all usages by the recommended file_get_contents("php://input")
 2014-09-16 21:21:34 +02:00
Laurent Destailleur
be3f458754 Fix: Pb with pgsql 2014-09-03 11:30:13 +02:00
Laurent Destailleur
911cccba80 Disable rule FunctionDoubleUnderscore that seems to be bugged. 2014-08-28 12:31:57 +02:00
Raphaël Doursenaud
d4414bc0f2 Added dev script for optimizing images 2014-08-19 12:38:50 +02:00
Laurent Destailleur
b6ff6527bc Enhance skeleton 2014-08-17 18:37:33 +02:00
Laurent Destailleur
2eb01cfbf9 Squelette plus complet. 2014-08-15 21:18:56 +02:00
Laurent Destailleur
c79fc516d3 Maj squelette 2014-08-14 17:27:28 +02:00
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