prepare release of 0.5.0

diff --git a/.gitignore b/.gitignore
index a195a9e1c1ff0140dfe45ba1a0dc0f4992d28494..6235ed53285150ee2de07f77b112b8165254e486 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/NEWS.html

 /README.html
 /repos
 /data/config.php
 /README.html
 /repos
 /data/config.php

diff --git a/ChangeLog b/ChangeLog
index e37ed9abf052752c8f2ae049e290e6036110f09b..5526640d670c7651d1547c380dbb4460887115b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-01-29  Christian Weiske  <cweiske@cweiske.de>
+
+       * Implement paste embedding
+       * Implement single file editing
+       * Implement automatic login
+       * Implement Elasticsearch 1.3 compatibility
+       * Work around PHP bug #68347 to parse ini files correctly
+       * Move clone URLs to sidebar
+       * Move additional button into text field
+       * Release version 0.5
+

 2014-07-15  Christian Weiske  <cweiske@cweiske.de>
 
        * Release version 0.4
 2014-07-15  Christian Weiske  <cweiske@cweiske.de>
 
        * Release version 0.4

diff --git a/NEWS.rst b/NEWS.rst
index c3936e8ff64a71a58ba68ab475588d62f89e39e3..f65231c1a4049899c8931c2a9ff164559596eb2d 100644 (file)
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -1,3 +1,14 @@
+Version 0.5.0 - 2015-01-29
+--------------------------
+* Implement paste embedding
+* Implement single file editing
+* Implement automatic login
+* Implement Elasticsearch 1.3 compatibility
+* Work around PHP bug #68347 to parse ini files correctly
+* Move clone URLs to sidebar
+* Move additional button into text field
+
+

 Version 0.4.0 - 2014-07-15
 --------------------------
 * Fix bug #27: Render .json files
 Version 0.4.0 - 2014-07-15
 --------------------------
 * Fix bug #27: Render .json files

diff --git a/README.rst b/README.rst
index 841b473aed8e2816caddb6e8671b750cbed174b3..889f474f4cfe88065a20d43a529e25dcd65194c5 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -22,6 +22,7 @@ Features
   - add new files
   - delete existing files
   - replace file with upload
   - add new files
   - delete existing files
   - replace file with upload

+- embedding of pastes in your blog

 - multiple files in one paste
   - option to edit single files in a multi-file paste
 - syntax highlighting with GeSHi
 - multiple files in one paste
   - option to edit single files in a multi-file paste
 - syntax highlighting with GeSHi


@@ -49,7 +50,7 @@ Installation
 
 .phar
 =====
 
 .phar
 =====

-Download ``phorkie-0.4.0.phar`` and put it in your web server's document root
+Download ``phorkie-0.5.0.phar`` and put it in your web server's document root

 directory.
 
 No further setup needed.
 directory.
 
 No further setup needed.


@@ -68,7 +69,7 @@ Zip package
 ===========
 1. Unzip the phorkie release file::
 
 ===========
 1. Unzip the phorkie release file::
 

-   $ tar xjvf phorkie-0.4.0.tar.bz2
+   $ tar xjvf phorkie-0.5.0.tar.bz2

 
 2. Create the git directories::
 
 
 2. Create the git directories::
 


@@ -150,6 +151,8 @@ phorkie makes use of an Elasticsearch__ installation, if you have one.
 
 It is used to provide search capabilities and the list of recent pastes.
 
 
 It is used to provide search capabilities and the list of recent pastes.
 

+Elasticsearch version 1.3 is supported.
+

 __ http://www.elasticsearch.org/
 
 
 __ http://www.elasticsearch.org/
 
 


@@ -296,25 +299,29 @@ URLs
   Index page.
 ``/[0-9]+``
   Display page for paste
   Index page.
 ``/[0-9]+``
   Display page for paste

-``/[0-9]/edit``
+``/[0-9]+/edit``

   Edit the paste
   Edit the paste

-``/[0-9]/edit/(.+)``
+``/[0-9]+/edit/(.+)``

   Edit a single file of the paste
   Edit a single file of the paste

+``/[0-9]+/embed``
+  JavaScript code that embeds the whole paste in a HTML page
+``/[0-9]+/embed/(.+)``
+  JavaScript code that embeds a single file in a HTML page

 ``/[0-9]+/raw/(.+)``
   Display raw file contents
 ``/[0-9]+/raw/(.+)``
   Display raw file contents

-``/[0-9]/tool/[a-zA-Z]+/(.+)``
+``/[0-9]+/tool/[a-zA-Z]+/(.+)``

   Run a tool on the given file
   Run a tool on the given file

-``/[0-9]/rev/[a-z0-9]+``
+``/[0-9]+/rev/[a-z0-9]+``

   Show specific revision of the paste
   Show specific revision of the paste

-``/[0-9]/delete``
+``/[0-9]+/delete``

   Delete the paste
   Delete the paste

-``/[0-9]/doap``
+``/[0-9]+/doap``

   Show DOAP document for paste
   Show DOAP document for paste

-``/[0-9]/fork``
+``/[0-9]+/fork``

   Create a fork of the paste
 ``/search?q=..(&page=[0-9]+)?``
   Search for term, with optional page
   Create a fork of the paste
 ``/search?q=..(&page=[0-9]+)?``
   Search for term, with optional page

-``/list(/[0-9])?``
+``/list(/[0-9]+)?``

   List all pastes, with optional page
 ``/fork-remote``
   Fork a remote URL
   List all pastes, with optional page
 ``/fork-remote``
   Fork a remote URL


@@ -356,6 +363,8 @@ If you use nginx, place the following lines into your ``server`` block:
     rewrite ^/([0-9]+)/doap$ /doap.php?id=$1;
     rewrite ^/([0-9]+)/edit$ /edit.php?id=$1;
     rewrite ^/([0-9]+)/edit/(.+)$ edit.php?id=$1&file=$2
     rewrite ^/([0-9]+)/doap$ /doap.php?id=$1;
     rewrite ^/([0-9]+)/edit$ /edit.php?id=$1;
     rewrite ^/([0-9]+)/edit/(.+)$ edit.php?id=$1&file=$2

+    rewrite ^/([0-9]+)/embed$ /embed.php?id=$1;
+    rewrite ^/([0-9]+)/embed/(.+)$ embed.php?id=$1&file=$2

     rewrite ^/([0-9]+)/fork$ /fork.php?id=$1;
     rewrite ^/([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2;
     rewrite ^/([0-9]+)/rev/(.+)$ /revision.php?id=$1&rev=$2;
     rewrite ^/([0-9]+)/fork$ /fork.php?id=$1;
     rewrite ^/([0-9]+)/raw/(.+)$ /raw.php?id=$1&file=$2;
     rewrite ^/([0-9]+)/rev/(.+)$ /revision.php?id=$1&rev=$2;

diff --git a/build.xml b/build.xml
index 261a351a342fd4617b9213ab0c45bfbbc5ea4a07..dd9614d16a1c3f31fd022b87996d4a11ca0be8ad 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -8,36 +8,19 @@
   -->
   <property file="build.properties" />
 
   -->
   <property file="build.properties" />
 

-  <property name="version-m"  value="0.4" />
-  <property name="version"    value="0.4.0" />
-  <property name="stability"  value="alpha" />
+  <property name="version-m"  value="0.5" />
+  <property name="version"    value="0.5.0" />
+  <property name="stability"  value="beta" />

   <property name="releasenotes" value="
   <property name="releasenotes" value="

-Version 0.4.0 - 2014-07-15
+Version 0.5.0 - 2015-01-29

 --------------------------
 --------------------------

-* Fix bug #27: Render .json files
-* Fix bug #31: Forked pastes cannot be remote forked
-* Fix bug #33: Do not index login page
-* Fix bug #41: AGPL link broken
-* Fix bug #43: github gist cloning does not work
-* Fix bug #44: Anchors of files with spaces in their name
-* Fix renaming of binary files
-* Implement request #6: Atom feed for new and updated pastes
-* Implement request #7: Track and display remote forks
-* Implement request #21: Send linkbacks when forking remote pastes
-* Implement request #32: Distribute phorkie as .phar file with all dependencies
-* Implement request #34: Store last OpenID in cookie and pre-fill login form
-* Implement request #35: Store author of a paste
-* Implement request #37: Show user icon in navbar and profile page
-* Implement request #42: Single click remote forking with web+fork: url handler
-* Add autoconfiguration for public git clone urls over http
-* Add baseurl setting to make phorkie run in a subdirectory of a domain
-* Add setupcheck page that checks dependencies and other things
-* Add support for file names with directories in pastes
-* Add support for UTF-8 characters in file names
-* Add support for web hooks
-* Add support for forking HTTP and HTTPS git URLs
-* Extract gist titles
-* Make it possible to install dependencies via composer
+* Implement paste embedding
+* Implement single file editing
+* Implement automatic login
+* Implement Elasticsearch 1.3 compatibility
+* Work around PHP bug #68347 to parse ini files correctly
+* Move clone URLs to sidebar
+* Move additional button into text field

 " />
   <property name="libdir"      value="${phing.dir}/lib"/>
 
 " />
   <property name="libdir"      value="${phing.dir}/lib"/>