Commit Graph

4013 Commits

Author SHA1 Message Date
Laurent Destailleur
40963f2f2a FIX #4207 2015-12-27 18:46:21 +01:00
Laurent Destailleur
2f8fc05cdb Fix: QRcode must not be random 2015-12-20 21:28:05 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
2015-12-13 16:23:33 +01:00
Laurent Destailleur
a462cd232d Merge remote-tracking branch 'origin/3.7' into 3.8 2015-12-13 16:09:09 +01:00
Laurent Destailleur
4a88c9ea9f Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/product/class/product.class.php
2015-12-13 15:53:57 +01:00
Laurent Destailleur
793e6e2a8f Example mut be excluded of packages 2015-12-11 16:56:25 +01:00
Raphaël Doursenaud
c0862762a5 Fix #3930 Removed executable bit
These files doesn't contain executable code and may pose a security
threat.
2015-12-09 13:28:36 +01:00
Raphaël Doursenaud
9257bfc5df Updated mobiledetect to 2.8.17 2015-12-07 13:53:59 +01:00
Raphaël Doursenaud
5dfa9ba369 Updated TCPDF to 6.2.12 2015-12-07 13:39:45 +01:00
Laurent Destailleur
f814bc11a0 Clean packaging 2015-11-26 01:27:59 +01:00
Laurent Destailleur
3c55479705 Restler #3544 2015-11-22 17:17:06 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
2015-11-13 12:35:10 +01:00
Jean-Pierre Morfin
0cb9cc2213 Correct pattern to match all odt var tags
some vars like {object_total_vat_local_x.y} or {object_total_vat_local_x,y} could not be tested to know if they were existing with [!-- IF {xxx} --] syntax
2015-11-12 09:24:04 +01:00
Laurent Destailleur
cb29f91434 FIX An external libray must contains also non obfuscated code into
source
2015-11-11 19:11:43 +01:00
Laurent Destailleur
327d764284 Merge branch 'dolibarr-php7' of https://github.com/GPCsolutions/dolibarr
into GPCsolutions-dolibarr-php7

Conflicts:
	.gitignore
2015-11-11 19:03:36 +01:00
Laurent Destailleur
ca62689a96 Merge pull request #3961 from frederic34/escpos
Escpos : install lib with composer
2015-11-11 18:30:57 +01:00
frederic34
954291ae0b re-add library escpos 2015-11-11 18:02:47 +01:00
frederic34
765e83d456 delete directory 2015-11-11 18:01:13 +01:00
Raphaël Doursenaud
c3ed30ffd8 Moved to new package for TCPDF
Previous one has been deprecated by upstream
2015-11-09 12:21:08 +01:00
Raphaël Doursenaud
e5915ce8d9 Upgraded PHPExcel to v1.8.1
Fixes issues with PHP 7
2015-11-09 12:19:48 +01:00
Raphaël Doursenaud
0e155be4e8 Reinstall ckeditor with composer
This time using the correct full package

Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
2015-11-09 12:18:50 +01:00
Raphaël Doursenaud
442431704b Upgraded ADOdb Date to v0.36
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
2015-11-09 12:16:04 +01:00
Raphaël Doursenaud
7c44198022 [Qual] Prevent GIT submodules in composer deps
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
2015-11-09 12:12:05 +01:00
Laurent Destailleur
e78ebf041a Fix deprecated code not working in jcrop. $.browser.msie and $.browser
is no more available in jquery 1.9+.
2015-11-06 02:03:41 +01:00
Laurent Destailleur
2dc644da30 Debug Direct print module using the OAuth setup. 2015-11-06 01:33:49 +01:00
Laurent Destailleur
e4bd99aaf3 Merge pull request #3904 from frederic34/printgcp
Google Cloud Print
2015-11-05 21:57:08 +01:00
Laurent Destailleur
5860491b14 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2015-11-05 21:33:54 +01:00
Laurent Destailleur
f3b8df3ea5 Merge pull request #3889 from frederic34/escpos
Receipt Printer conf and lang
2015-11-05 21:32:43 +01:00
frederic34
55dfa4859f Install lib with composer 2015-11-05 21:09:14 +01:00
frederic34
3ef6a92bb1 Google Cloud Print 2015-11-05 18:04:00 +01:00
Laurent Destailleur
11b7d8a44c Merge pull request #3873 from frederic34/escpos
Escpos Receipt printer
2015-11-05 02:18:09 +01:00
Laurent Destailleur
ffe1284a85 Merge pull request #3840 from frederic34/printgcp
Printing with Google Cloud Print
2015-11-02 20:09:13 +01:00
Laurent Destailleur
d0d4c5e7f8 NEW The conditional IF into ODT templates works also on not defined var
so we can show data only if defined. Close #3819
2015-11-02 15:44:47 +01:00
frederic34
2f3e6958f9 Receipt Printer 2015-11-01 00:58:08 +01:00
frederic34
1694c690ed Printing with Google Cloud Print 2015-10-30 17:22:06 +01:00
Laurent Destailleur
bf85caade6 Move a file that is not an external lib 2015-09-18 21:53:35 +02:00
Laurent Destailleur
397e409b9a Merge pull request #3543 from GPCsolutions/firephp
Installed FirePHP with composer
2015-09-18 20:53:27 +02:00
Laurent Destailleur
a4ab5f5552 Restore manual install of ckeditor. It seems upgrade with phpcomposer
make some plugins not working.
2015-09-18 12:10:47 +02:00
Raphaël Doursenaud
2cf0f240b9 Installed FirePHP with composer 2015-09-17 16:08:00 +02:00
Laurent Destailleur
f3c71a9a5a Dolibarr must not contains autoload feature.
The developer and user must decide which lib is used and it must not be
a random feature that take a library "randomly" (first one found is same
a randomly found).
By default, library embedded of dolibarr must be used. If we want to use
another one, an option to set the path of external libray must be
available.
2015-09-07 12:09:42 +02:00
Laurent Destailleur
51c5e01290 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-09-05 00:48:56 +02:00
Laurent Destailleur
7926fd8083 NEW ODT generators can set meta properties of ODT file 2015-09-05 00:47:06 +02:00
Raphaël Doursenaud
a6ef289470 New Added client-side Sentry logging
Using Raven.js allows logging client-side javascript errors to the
configured Sentry server.
2015-09-04 19:10:46 +02:00
Raphaël Doursenaud
7ef5cbfb96 Updated raven-php to v0.12.1 2015-09-04 19:10:38 +02:00
Raphaël Doursenaud
e5eefa685f Add Raven client for Sentry 2015-09-04 19:09:55 +02:00
Raphaël Doursenaud
e0312d048b Install TCPDF from composer 2015-09-04 19:06:04 +02:00
Raphaël Doursenaud
321094ab42 Install Restler framework from composer 2015-09-04 19:06:02 +02:00
Raphaël Doursenaud
1b7ed43c60 Install PHPExcel from composer 2015-09-04 19:06:02 +02:00
Raphaël Doursenaud
0eb0f52b6d Install mobiledetect from composer 2015-09-04 19:06:01 +02:00
Raphaël Doursenaud
7d934db183 Install CKEditor from composer 2015-09-04 19:06:01 +02:00