lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,957 Commits 43 Branches 150 Tags 886 MiB
9c3352d2de
Commit Graph

68957 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frédéric FRANCE
9c3352d2de
move phpcs:ignore 2018-09-02 23:44:53 +02:00
Frédéric FRANCE
489074af5c
move phpcs:ignore 2018-09-02 23:25:10 +02:00
Frédéric FRANCE
47e73bfd8e
move phpcs:ignore 2018-09-02 23:01:14 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
22b9632555
move phpcs:ignore 2018-09-02 21:08:57 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Frédéric FRANCE
03a5aba8a2
move phpcs:ignore 2018-09-02 18:49:23 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-02 18:19:45 +02:00
Frédéric FRANCE
61c4e9831f
move phpcs:ignore 2018-09-02 18:18:10 +02:00
Laurent Destailleur
d2afffaeca Fix phpcs 2018-09-02 17:53:31 +02:00
Laurent Destailleur
e081e8443b
Merge pull request #9204 from ptibogxiv/patch-32 
Fix payment in connect mode
 2018-09-02 17:25:27 +02:00
Laurent Destailleur
3cc268c840
Update stripe.class.php 2018-09-02 17:23:38 +02:00
Laurent Destailleur
7ca45cd117
Update stripe.class.php 2018-09-02 17:22:45 +02:00
Laurent Destailleur
4cca4ce020
Update stripe.class.php 2018-09-02 17:21:45 +02:00
Laurent Destailleur
a68f5cad77 Fix syntax error 2018-09-02 17:18:19 +02:00
Laurent Destailleur
edd55fc756 Fix all TODO in main and master files 2018-09-02 16:47:58 +02:00
Laurent Destailleur
887a40cf1d Remove TODO 2018-09-02 16:46:01 +02:00
Laurent Destailleur
0bf850c1ea Fix phpcs 2018-09-02 16:26:00 +02:00
Laurent Destailleur
3baaa2e975 Fix syntax error 2018-09-02 16:18:08 +02:00
Laurent Destailleur
ddd6ac296c Fix missing class 2018-09-02 16:09:40 +02:00
Laurent Destailleur
5488bfe1fe
Merge pull request #9018 from all3kcis/patch-10 
Enable auto update PDF on update note
 2018-09-02 16:01:22 +02:00
Laurent Destailleur
dda0c5699e
Update actions_setnotes.inc.php 2018-09-02 15:59:09 +02:00
Laurent Destailleur
e661eff329 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-02 15:48:43 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	.travis.yml
 2018-09-02 15:46:09 +02:00
Laurent Destailleur
b270563cd3
Merge pull request #9389 from frederic34/patch-17 
Update myobject.class.php
 2018-09-02 15:41:30 +02:00
Laurent Destailleur
1418adde8b
Merge pull request #9388 from frederic34/patch-16 
Update actioncommreminder.class.php
 2018-09-02 15:41:07 +02:00
Laurent Destailleur
b34731afb4
Merge pull request #9385 from frederic34/patch-15 
Update html_cerfafr.modules.php
 2018-09-02 15:38:19 +02:00
Laurent Destailleur
63217de5e0
Merge pull request #9384 from frederic34/patch-14 
comment missing and not camecaps are incompatible
 2018-09-02 15:37:38 +02:00
Laurent Destailleur
91809de1c3
Merge pull request #9383 from frederic34/patch-13 
Update doc_generic_user_odt.modules.php
 2018-09-02 15:35:54 +02:00
Laurent Destailleur
86331ee321
Merge pull request #9382 from frederic34/patch-11 
Update dav.class.php
 2018-09-02 15:35:41 +02:00
Laurent Destailleur
b90cecf728
Merge pull request #9380 from frederic34/patch-9 
remove superfluous space
 2018-09-02 15:35:29 +02:00
Laurent Destailleur
ff6a57d52a
Merge pull request #9381 from frederic34/patch-10 
remove superfluous space
 2018-09-02 15:35:18 +02:00
Laurent Destailleur
bb5fae0e46 Fix eol 2018-09-02 15:30:56 +02:00
Laurent Destailleur
f216da78d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	.travis.yml
 2018-09-02 15:27:03 +02:00
Laurent Destailleur
e0b272941f Fix mariadb 2018-09-02 15:25:27 +02:00
Laurent Destailleur
ebba0b9e67 phpunit 6.1 compatibility 2018-09-02 15:24:29 +02:00
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