From baa16b4831f2a64ab5febb1b690612f24bb72b8a Mon Sep 17 00:00:00 2001 From: "Christophe.Boulain" <> Date: Fri, 29 May 2009 06:54:24 +0000 Subject: Fixed Issue#164 --- HISTORY | 1 + 1 file changed, 1 insertion(+) (limited to 'HISTORY') diff --git a/HISTORY b/HISTORY index ecf525d6..e3e78035 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,5 @@ Version 3.1.6 to be released +BUG: Issue#164 - CultureInfo::validCulture should be declared as a static method (Christophe) Version 3.1.5 May 24, 2009 BUG: Issue#55 - TPropertyAccess.get and has don't recognize magic getter __get (Yves) -- cgit v1.2.3 From 8e0cb0ff0a89603740c7a46a43c87a6d3267ca6f Mon Sep 17 00:00:00 2001 From: "Christophe.Boulain" <> Date: Tue, 2 Jun 2009 08:05:55 +0000 Subject: Rename assets folder in Drag&Drop demo so it will be present in next prado release. Fixed Issue#98 --- .gitattributes | 6 +++--- HISTORY | 1 + .../pages/ActiveControls/Samples/DragDrop/Home.page | 2 +- .../pages/ActiveControls/Samples/DragDrop/Home.php | 4 ++-- .../ActiveControls/Samples/DragDrop/assets/product1.png | Bin 10711 -> 0 bytes .../ActiveControls/Samples/DragDrop/assets/product2.png | Bin 9550 -> 0 bytes .../ActiveControls/Samples/DragDrop/assets/trash.png | Bin 783 -> 0 bytes .../ActiveControls/Samples/DragDrop/images/product1.png | Bin 0 -> 10711 bytes .../ActiveControls/Samples/DragDrop/images/product2.png | Bin 0 -> 9550 bytes .../ActiveControls/Samples/DragDrop/images/trash.png | Bin 0 -> 783 bytes 10 files changed, 7 insertions(+), 6 deletions(-) delete mode 100755 demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png delete mode 100755 demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png delete mode 100755 demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png create mode 100755 demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png create mode 100755 demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png create mode 100755 demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png (limited to 'HISTORY') diff --git a/.gitattributes b/.gitattributes index ffd8639a..e8b3efd0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1281,9 +1281,9 @@ demos/quickstart/protected/pages/ActiveControls/DragDrop.page -text demos/quickstart/protected/pages/ActiveControls/Home.page -text demos/quickstart/protected/pages/ActiveControls/Introduction.page -text demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page -text -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png -text svneol=unset#image/png -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png -text svneol=unset#image/png -demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png -text svneol=unset#image/png +demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png -text svneol=unset#image/png demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.page -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveButton/Home.php -text demos/quickstart/protected/pages/ActiveControls/Samples/TActiveCheckBox/Home.page -text diff --git a/HISTORY b/HISTORY index e3e78035..c68999cd 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,5 @@ Version 3.1.6 to be released +BUG: Issue#98 - Missing file in quickstart demo (Chrisotphe) BUG: Issue#164 - CultureInfo::validCulture should be declared as a static method (Christophe) Version 3.1.5 May 24, 2009 diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page index 89d64110..a826f5a8 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.page @@ -38,7 +38,7 @@ } .trash-hover { - background-image: url(<%~ assets/trash.png%>); + background-image: url(<%~ images/trash.png%>); } diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php index 276ee6a4..0e4f6193 100755 --- a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php +++ b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/Home.php @@ -20,12 +20,12 @@ class Home extends TPage return array ( array ( 'ProductId' => 'Product1', - 'ProductImageUrl' => $this->publishAsset('assets/product1.png'), + 'ProductImageUrl' => $this->publishAsset('images/product1.png'), 'ProductTitle' => 'Cup' ), array ( 'ProductId' => 'Product2', - 'ProductImageUrl' => $this->publishAsset('assets/product2.png'), + 'ProductImageUrl' => $this->publishAsset('images/product2.png'), 'ProductTitle' => 'T-Shirt' ) ); diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png deleted file mode 100755 index ae03d551..00000000 Binary files a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product1.png and /dev/null differ diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png deleted file mode 100755 index 25e81ad7..00000000 Binary files a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/product2.png and /dev/null differ diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png deleted file mode 100755 index 184f7628..00000000 Binary files a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/assets/trash.png and /dev/null differ diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png new file mode 100755 index 00000000..ae03d551 Binary files /dev/null and b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product1.png differ diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png new file mode 100755 index 00000000..25e81ad7 Binary files /dev/null and b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/product2.png differ diff --git a/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png new file mode 100755 index 00000000..184f7628 Binary files /dev/null and b/demos/quickstart/protected/pages/ActiveControls/Samples/DragDrop/images/trash.png differ -- cgit v1.2.3