RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-30 01:06:03 +03:00
Code Issues Projects Releases Wiki Activity
1,093 Commits 14 Branches 14 Tags 22 MiB
a287bd44df
Commit Graph

1093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MarkBaker
ab693eafcd Feature: (bolovincev) Work Item GH-269 - Update Worksheet.php getStyleByColumnAndRow() to allow a range of cells rather than just a single cell 2014-07-27 13:12:44 +01:00
Mark Baker
983843d50c Merge pull request #269 from bolovincev/patch-1 
Update Worksheet.php getStyleByColumnAndRow()
 2014-07-27 13:07:19 +01:00
MarkBaker
698a56eb92 Bugfix: Work Item GH-350 - Keep/set the value on Reader _loadSheetsOnly as NULL, courtesy of Restless-ET 2014-07-27 12:51:38 +01:00
MarkBaker
6a0d5b3c2a Update change log 2014-07-27 12:39:01 +01:00
Mark Baker
23479fdde2 Merge pull request #379 from frost-nzcr4/ft-camelcase 
Change the getter/setter for zeroHeight to camel case
 2014-07-27 12:21:13 +01:00
Mark Baker
2a06bc9675 Merge pull request #405 from ymaerschalck/develop 
XML External Entity (XXE) Processing
 2014-07-27 12:18:58 +01:00
MarkBaker
3e6cf13df2 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-07-26 19:46:43 +01:00
MarkBaker
fe6273f8e0 Fix for nested collapsed grouping when writing BIFF-format files, courtesy of ShadowEDX 2014-07-26 19:46:00 +01:00
Mark Baker
af03e186b3 Merge pull request #334 from atannus/develop 
Fixes html entities to prevent parsing error of generated documentation.
 2014-07-26 16:11:55 +01:00
MarkBaker
59cb459899 Case-sensitivity error 2014-07-26 15:45:44 +01:00
MarkBaker
134bd0fda6 Feature - New methods added for testing cell status within merge groups 2014-07-24 22:50:53 +01:00
MarkBaker
dff9880582 Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-07-22 23:48:52 +01:00
MarkBaker
9065cab60c DOMDocument not domDocument 2014-07-22 23:48:32 +01:00
Mark Baker
c3432f0ef7 Merge pull request #408 from matteofilippetto/develop 
again division by zero
 2014-07-22 22:57:52 +01:00
matteofilippetto
38ff5a49f8 again division by zero 
$this->_width and $this->_height are defined as float so !== will return TRUE also if the value is 0 ( as !== use OR )
 2014-07-22 17:40:31 +02:00
Yves Maerschalck
0787e56d41 XML External Entity (XXE) Processing 
https://www.owasp.org/index.php/XML_External_Entity_(XXE)_Processing

change simplexml_load_file to
simplexml_load_string(file_get_contents()) because load_file doesn't
work when
http://php.net/manual/en/function.libxml-disable-entity-loader.php is
true
 2014-07-16 09:28:33 +02:00
MarkBaker
87be8d3d8e Bugfix to ensure that current cell is maintained when executing formula calculations 2014-07-15 23:33:06 +01:00
MarkBaker
c6d0a4d3d0 Additional divide by zero handling 2014-07-14 23:45:46 +01:00
Mark Baker
311d03b4c3 Merge pull request #329 from sarciszewski/patch-2 
Update BaseDrawing.php
 2014-07-14 23:37:03 +01:00
Mark Baker
b21fdba7ea Merge pull request #389 from CQD/develop 
Add Mac CJK codepage definition.
 2014-07-14 23:12:05 +01:00
MarkBaker
944a9ee32e PRs in changelog 2014-07-14 23:07:00 +01:00
Mark Baker
abd0db5ba7 Merge pull request #403 from frost-nzcr4/ft-157-ODF-comments 
ODS read/write comments in the cell
 2014-07-14 23:04:21 +01:00
Mark Baker
0e14e41299 Merge pull request #397 from goncons/develop 
Open Document cell with not numeric formula
 2014-07-14 23:01:13 +01:00
Mark Baker
11f906d932 Merge pull request #404 from WiktrzGE/develop 
--Added 3 new classes: PHPExcel_Chart_Axis, PHPExcel_Chart_GridLines, PH...
 2014-07-14 22:52:17 +01:00
Wiktor
568038c5bf --Added 3 new classes: PHPExcel_Chart_Axis, PHPExcel_Chart_GridLines, PHPExcel_Chart_Properties.php 
--Modified Chart.php and Writer/Excel2007/Chart.php for using new classes
--Now it is possible to set some (most of existing) options of Axis, Major Grid-lines and Minor Grid-lines
--No need to use that feature
 2014-07-14 16:59:53 +02:00
Alexander Pervakov
524c093895 Fix reader when comment within text:p element 2014-07-14 17:55:46 +04:00
Alexander Pervakov
a81a7da661 Add cell comment 2014-07-14 17:55:46 +04:00
Alexander Pervakov
927d1513cf Fix output in ODS example 2014-07-14 17:55:45 +04:00
Progi1984
f3df66a971 Merge pull request #399 from Nyholm/patch-1 
Added PHP 5.6 and HHVM to travis.yml
 2014-07-09 21:17:28 +02:00
Tobias Nyholm
4f6256e621 Added PHP 5.6 and HHVM to travis.yml 2014-07-09 12:18:09 +02:00
Progi1984
6335e6c008 Merge pull request #398 from papettoTV/develop 
Fixed failed include PHPExcel.php in Examples/34chartupdate.php
 2014-07-09 08:31:19 +02:00
yokota
1694960cd5 Fixed failed include PHPExcel.php 2014-07-09 10:53:03 +09:00
goncons
d03ffd6776 Open Document cell with not numeric formula 
Trying to write a Open Document with non numeric formula in a cell this exception was generated:
"XMLWriter::writeAttribute() expects parameter 2 to be string, array given"
The problem was that writer was using
PHPExcel_Calculation::getInstance()->calculateCellValue($cell);
instead of
$cell->getCalculatedValue();
 2014-07-06 18:48:07 -04:30
MarkBaker
59ef7c3325 Don't cache column width adjustment, because it should be based on the font size being used for a cell, and so should be dynamic 2014-07-03 01:01:39 +01:00
MarkBaker
ddec5e9706 Improve speed of calculation for autosize columns to reduce save time 2014-07-03 00:43:29 +01:00
CQD
ae2e4c9a01 Add MAC CJK codepage 
Refering to 
http://msdn.microsoft.com/en-us/library/system.text.encodinginfo.codepage%28v=vs.110%29.aspx
 2014-06-23 14:18:48 +08:00
CQD
05dbc90392 Code formating 2014-06-23 14:13:27 +08:00
CQD
0ff99cb6ab Code formating 2014-06-23 14:10:09 +08:00
Progi1984
78a065754d Merge pull request #387 from trxndynamics/develop 
Minor Docblock update: corrected the return value from PHPExcel_Shared_Date::ExcelToPHPObject updated to reflect the PHP DateTime object that is to be returned.
 2014-06-15 21:26:15 +02:00
Martin Evans
487888414a Minor Docblock update: corrected the return value from PHPExcel_Shared_Date::ExcelToPHPObject updated to reflect the PHP DateTime object that is to be returned. 2014-06-15 18:05:51 +01:00
Mark Baker
a396ec09bb Merge pull request #383 from alex-ception/develop 
Fixed bug on jpgraph dependencies
 2014-06-14 10:33:56 +01:00
Progi1984
0ce009a4d4 Merge pull request #386 from trxndynamics/develop 
Minor Docblock update: return values on load function for PHPExcel_Reade...
 2014-06-12 10:42:51 +02:00
Martin Evans
a6672451a5 Minor Docblock update: return values on load function for PHPExcel_Reader_IReader and Excel2007 now listed as @return PHPExcel in order to utilize auto complete via IDE. 2014-06-12 09:20:16 +01:00
Mark Baker
b2da39fc5d Merge pull request #367 from januarsiregar/develop 
change sequential validation for orientation dompdf
 2014-06-08 18:00:25 +01:00
Mark Baker
afb0101a32 Merge pull request #349 from luxbet/poisson_fix 
Allow value of 0 to be passed into POISSON formula
 2014-06-08 17:57:42 +01:00
Mark Baker
5c708feba8 Merge pull request #378 from frost-nzcr4/ft-157-ODF 
Add basic ODS writing functionality
 2014-06-08 17:52:35 +01:00
Mark Baker
cef1b274cd Merge pull request #352 from ke20/patch-1 
Bug "Undefined variable: options"
 2014-06-08 17:48:36 +01:00
MarkBaker
4935236f7b Merge branch 'develop' of https://github.com/PHPOffice/PHPExcel into develop 2014-06-06 23:57:40 +01:00
MarkBaker
5ab877958f Reduce memory usage after an xls load 2014-06-06 23:56:57 +01:00
Alexandre ANDRÉ
f5c0d0a3fd Fixed bug on jpgraph dependencies (It's suggested to use composer jpgraph/jpgraph instead of requiring these files) 2014-06-06 15:56:40 +02:00