poche is dead, welcome wallabag

This commit is contained in:
Nicolas Lœuillet 2014-01-28 10:36:04 +01:00
parent 3ae345b3d7
commit c95b78a8ce
16 changed files with 45 additions and 106 deletions

View File

@ -1,11 +1,11 @@
# How contributing
## You found a bug
Please [open a new issue](https://github.com/inthepoche/poche/issues/new).
Please [open a new issue](https://github.com/wallabag/demo.wallabag.org/issues/new).
To fix the bug quickly, we need some infos:
* your poche version (in ./inc/poche/myconfig.inc.php)
* the link you want to poche and which causes problem
* your demo.wallabag.org version (in ./index.php)
* the link you want to save and which causes problem
## You want to fix a bug or to add a feature
Please fork poche and work with **the dev branch** only. Do not work on master branch.
Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.

View File

@ -1,4 +1,4 @@
poche is based on :
wallabag is based on :
* PHP Readability https://bitbucket.org/fivefilters/php-readability
* Full Text RSS http://code.fivefilters.org/full-text-rss/src
* Encoding https://github.com/neitanod/forceutf8
@ -10,6 +10,6 @@ poche is based on :
* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
* Pagination https://github.com/daveismyname/pagination
poche is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
Contributors : https://github.com/inthepoche/poche/graphs/contributors
Contributors : https://github.com/wallabag/wallabag/graphs/contributors

View File

@ -1,3 +0,0 @@
# Installing poche
Read the full documentation here: http://doc.inthepoche.com/doku.php?id=users:begin:install

View File

@ -1,29 +1,10 @@
# what is poche ?
Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is free (like in freedom) and open source.
# what is wallabag ?
wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time.
## Some features
* adding, deleting, archiving and setting as favorite a link
* import from pocket / readability / instapaper
* share links by email and on twitter
* a design adapted to tablets and smartphones
* extensions for Chrome and Firefox
* Android application
* multi languages: french, english, spanish, german.
* multi users (very soon!)
* update notification in configuration screen
* many storage modes (sqlite, mysql, postgresql)
* many templates: [have a look here](https://github.com/inthepoche/poche/tree/master/themes).
* ...
To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
To use poche hosting, [you can create an account here](http://app.inthepoche.com/).
## Installation
Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
To test wallabag, a demo website is online : [demo.wallabag.org](http://demo.wallabag.org) (login poche, password poche).
## License
Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
This work is free. You can redistribute it and/or modify it under the
terms of the Do What The Fuck You Want To Public License, Version 2,
as published by Sam Hocevar. See the COPYING file for more details.
as published by Sam Hocevar. See the COPYING file for more details.

View File

@ -1,9 +0,0 @@
# TODO
* pouvoir annuler la suppression
* conventions codage ? phing ? vérifier error_log qui trainent
* phpDocumentor
* minifier css
* barre fixe d'admin sur la page d'un billet ?
* revoir export (export vers pocket &cie ? )
* raccourcis clavier

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/
@ -29,7 +29,8 @@ class Poche
'dark' => array('requires' => array('default')),
'dmagenta' => array('requires' => array('default')),
'solarized' => array('requires' => array('default')),
'solarized-dark' => array('requires' => array('default'))
'solarized-dark' => array('requires' => array('default')),
'courgette' => array('requires' => array())
);
public function __construct()

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,9 +1,9 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/

View File

@ -1,14 +1,14 @@
<?php
/**
* poche, a read it later open source system
* wallabag, self hostable application allowing you to not miss any content anymore
*
* @category poche
* @author Nicolas Lœuillet <support@inthepoche.com>
* @category wallabag
* @author Nicolas Lœuillet <nicolas@loeuillet.org>
* @copyright 2013
* @license http://www.wtfpl.net/ see COPYING file
*/
define ('POCHE', '1.3.0');
define ('POCHE', '1.4.0');
require_once 'inc/poche/global.inc.php';
session_start();

View File

@ -1,31 +0,0 @@
# poche-themes
themes created by poche users
## list of themes
* dark ([preview](https://raw.github.com/inthepoche/poche/master/themes/dark/screenshot.jpg))
* dmagenta ([preview](https://raw.github.com/inthepoche/poche/master/themes/dmagenta/screenshot.jpg))
* solarized ([preview](https://raw.github.com/inthepoche/poche/master/themes/solarized/screenshot.jpg))
* solarized-dark ([preview](https://raw.github.com/inthepoche/poche/master/themes/solarized-dark/screenshot.jpg))
## installation
In your poche folder:
```
git submodule init
git submodule update
```
Then, in your config screen, select your favorite theme.
That's all !
## create a theme
Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme
## send a theme
Send your theme by email at support@inthepoche.com.

View File

@ -1,5 +1,5 @@
<?php
$app_name = 'poche 1.3';
$app_name = 'wallabag 1.3';
$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>='));
$pcre_ok = extension_loaded('pcre');
@ -313,13 +313,13 @@ div.chunk {
<?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok) { ?>
<h3>Bottom Line: Yes, you can!</h3>
<p><em>Your webhost has its act together!</em></p>
<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://inthepoche.com/download">inthepoche.com</a>.</p>
<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
<p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p>
<?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?>
<?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok) { ?>
<h3>Bottom Line: Yes, you can!</h3>
<p><em>For most feeds, it'll run with no problems.</em> There are certain languages that you might have a hard time with though.</p>
<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://inthepoche.com/download">inthepoche.com</a>.</p>
<p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
<p><strong>Note</strong>: Passing this test does not guarantee that <?php echo $app_name; ?> will run on your webhost &mdash; it only ensures that the basic requirements have been addressed. If you experience any problems, please let us know.</p>
<?php } else { ?>
<h3>Bottom Line: We're sorry…</h3>