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

72858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
0b34acae7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-09-02 15:22:56 +02:00
Laurent Destailleur
42cb2b07db Only min and max version 2018-09-02 15:22:49 +02:00
Laurent Destailleur
a7dfc88b59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	test/phpunit/CoreTest.php
 2018-09-02 15:21:21 +02:00
Laurent Destailleur
32a03f3c0b Fix eol 2018-09-02 14:25:52 +02:00
Laurent Destailleur
bd3647a9d7 Prepare phpunit 6.1 compatibility 2018-09-02 14:23:52 +02:00
Laurent Destailleur
b9c95a5a5c Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-09-02 14:19:43 +02:00
Laurent Destailleur
5bab9d59b2 Fix var_dump 2018-09-02 14:19:23 +02:00
Laurent Destailleur
df721a5fbc Only min and max php version 2018-09-02 14:18:04 +02:00
Laurent Destailleur
37fb70d983 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-09-02 14:15:32 +02:00
Laurent Destailleur
02bedc49d3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
 2018-09-02 14:15:17 +02:00
Laurent Destailleur
e41b55af13 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-09-02 14:10:28 +02:00
Laurent Destailleur
a69c3caf2c Prepare compatibility with phpunit 6.1 2018-09-02 14:10:06 +02:00
Frédéric FRANCE
2a5c994009
move phpcs:ignore 2018-09-02 14:01:37 +02:00
Laurent Destailleur
53caac13a9 Test phpunit 2018-09-02 13:57:51 +02:00
Frédéric FRANCE
04c1a7d4af
move phpcs:ignore 2018-09-02 13:38:11 +02:00
Frédéric FRANCE
4ea582ad4a
move phpcs:ignore 2018-09-02 11:12:07 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Frédéric FRANCE
b60f7db60a
move phpcs:ignore 2018-09-02 10:43:34 +02:00
Philippe GRAND
c4f05aff28 Standardize and update code 2018-09-02 10:42:31 +02:00
Frédéric FRANCE
0c16761f48
Update myobject.class.php 2018-09-02 10:23:00 +02:00
Frédéric FRANCE
47879d44bc
move phpcs:ignore 2018-09-02 09:57:19 +02:00
Frédéric FRANCE
e98b8e5e25
move phpcs:ignore 2018-09-02 09:27:59 +02:00
Frédéric FRANCE
71977514d7
Update actioncommreminder.class.php 2018-09-02 09:06:51 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Philippe GRAND
bb18982f78 Standardize and Update code 2018-09-01 23:24:59 +02:00
Philippe GRAND
db32d8903e Standardize and Update code 2018-09-01 23:20:20 +02:00
Philippe GRAND
5cd9557318 Standardize and Update code 2018-09-01 23:12:20 +02:00
Philippe GRAND
ae2df6be11 Standardize and Update code 2018-09-01 23:04:46 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
d86d7323fb Update code 2018-09-01 22:46:35 +02:00
Philippe GRAND
091b8269a6 fix conflict 2018-09-01 22:42:42 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
df26ae764e Fix typo 2018-09-01 17:56:52 +02:00
Laurent Destailleur
0bf967ab10 Fix setup 2018-09-01 17:50:13 +02:00
Laurent Destailleur
5f2eeb552a Fix setup of email 2018-09-01 17:48:35 +02:00
Laurent Destailleur
dfda029da4 FIX a removed option was still in setup 2018-09-01 17:44:07 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject 2018-09-01 17:42:16 +02:00
Laurent Destailleur
ada6d2c963 More logs 2018-09-01 17:27:14 +02:00
Philippe Grand
df4a4aa6c9
Merge branch 'develop' into develop 2018-09-01 17:23:43 +02:00
Laurent Destailleur
32baec1c9a Fix logs 2018-09-01 17:10:47 +02:00
Laurent Destailleur
c17233a409 More logs 2018-09-01 16:51:40 +02:00
Frédéric FRANCE
49a1e33fc9
Update html_cerfafr.modules.php 2018-09-01 16:23:30 +02:00
Frédéric FRANCE
83a647ce0d
comment missing and not camecaps are incompatible 2018-09-01 15:56:14 +02:00
Laurent Destailleur
c3438b79c8 Fix merge 2018-09-01 15:39:11 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Laurent Destailleur
d8fb18e6a9 Reduce travis test to min and max php only 2018-09-01 15:35:34 +02:00
Laurent Destailleur
948c95c0f6 Reduce travis test to min and max php only 2018-09-01 15:34:25 +02:00
Frédéric FRANCE
ae52b737b3
Update doc_generic_user_odt.modules.php 2018-09-01 15:29:41 +02:00
Philippe GRAND
45cbc36a15 Standardize and update code 2018-09-01 15:27:55 +02:00
Frédéric FRANCE
beeaf9cf8a
Update dav.class.php 2018-09-01 15:27:51 +02:00