Laurent Destailleur
|
a5711a51ab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/core/lib/json.lib.php
test/phpunit/JsonLibTest.php
|
2019-03-02 18:30:17 +01:00 |
|
Frédéric FRANCE
|
40d34940f1
|
fix exclude from phpcs
|
2019-03-02 10:00:51 +01:00 |
|
Frédéric FRANCE
|
42a1387218
|
wip
|
2019-02-25 00:56:48 +01:00 |
|
Laurent Destailleur
|
bd3647a9d7
|
Prepare phpunit 6.1 compatibility
|
2018-09-02 14:23:52 +02:00 |
|
Laurent Destailleur
|
a69c3caf2c
|
Prepare compatibility with phpunit 6.1
|
2018-09-02 14:10:06 +02:00 |
|
Laurent Destailleur
|
eef5df583e
|
Fix php 7.2
|
2017-06-20 00:50:30 +02:00 |
|
Laurent Destailleur
|
4b741c6b9c
|
Fix permissions
|
2015-12-13 16:16:30 +01:00 |
|
frederic34
|
73fda2cb86
|
WIP PSR2
|
2015-01-08 18:36:03 +01:00 |
|
Marcos García de La Fuente
|
972d3c69b6
|
Removed duplicated requires.
Json.lib.php is included with functions.lib.php
|
2014-07-30 15:42:58 +02:00 |
|
Marcos García de La Fuente
|
42c7fc1c8d
|
Revert "Testing dol_json_encode is not interesting now as it uses a core function"
|
2014-07-30 15:19:31 +02:00 |
|
Marcos García de La Fuente
|
5baf48fc15
|
Revert "Removed empty test"
This reverts commit cf1a2c44a3.
|
2014-07-26 19:12:11 +02:00 |
|
Marcos García de La Fuente
|
cf1a2c44a3
|
Removed empty test
|
2014-07-20 08:33:56 +02:00 |
|
Marcos García de La Fuente
|
3e160fb209
|
Testing dol_json_encode is not interesting now as it uses a core function
|
2014-07-18 12:05: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
|
0e13ded641
|
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
test/phpunit/CoreTest.php
test/phpunit/Functions2Test.php
test/phpunit/FunctionsTest.php
|
2014-05-18 11:57:18 +02:00 |
|
Laurent Destailleur
|
7216b2a843
|
Fix phpunit to be compatible with new version of phpunit
|
2014-05-02 00:08:27 +02:00 |
|
Laurent Destailleur
|
876a35d1a1
|
Fix phpunit to be compatible with new version of phpunit
|
2014-05-02 00:08:19 +02:00 |
|
Laurent Destailleur
|
de97cd1812
|
Fix: json
|
2013-10-11 18:33:21 +02:00 |
|
Laurent Destailleur
|
f1f7ff315f
|
Fix: CRLF
|
2013-01-16 15:54:07 +01:00 |
|
Laurent Destailleur
|
8d206fdfb0
|
Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
|
2013-01-16 15:36:08 +01:00 |
|
Laurent Destailleur
|
ca6e9643ea
|
Fix: Pb in json function for objects
|
2012-12-29 12:21:13 +01:00 |
|