aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTING.md8
-rw-r--r--CREDITS.md6
-rw-r--r--INSTALL.md3
-rw-r--r--README.md29
-rw-r--r--TODO.md9
-rw-r--r--inc/poche/Database.class.php6
-rw-r--r--inc/poche/Poche.class.php9
-rw-r--r--inc/poche/Tools.class.php6
-rw-r--r--inc/poche/Url.class.php6
-rw-r--r--inc/poche/User.class.php6
-rwxr-xr-xinc/poche/config.inc.php.new6
-rw-r--r--inc/poche/global.inc.php6
-rw-r--r--inc/poche/pochePictures.php6
-rw-r--r--index.php8
-rw-r--r--themes/README.md31
-rw-r--r--wallabag_compatibility_test.php (renamed from poche_compatibility_test.php)6
16 files changed, 45 insertions, 106 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c89411f3..7fdca652 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,11 +1,11 @@
1# How contributing 1# How contributing
2 2
3## You found a bug 3## You found a bug
4Please [open a new issue](https://github.com/inthepoche/poche/issues/new). 4Please [open a new issue](https://github.com/wallabag/demo.wallabag.org/issues/new).
5 5
6To fix the bug quickly, we need some infos: 6To fix the bug quickly, we need some infos:
7* your poche version (in ./inc/poche/myconfig.inc.php) 7* your demo.wallabag.org version (in ./index.php)
8* the link you want to poche and which causes problem 8* the link you want to save and which causes problem
9 9
10## You want to fix a bug or to add a feature 10## You want to fix a bug or to add a feature
11Please fork poche and work with **the dev branch** only. Do not work on master branch. 11Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**. \ No newline at end of file
diff --git a/CREDITS.md b/CREDITS.md
index 6046a6aa..391f53c5 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,4 +1,4 @@
1poche is based on : 1wallabag is based on :
2* PHP Readability https://bitbucket.org/fivefilters/php-readability 2* PHP Readability https://bitbucket.org/fivefilters/php-readability
3* Full Text RSS http://code.fivefilters.org/full-text-rss/src 3* Full Text RSS http://code.fivefilters.org/full-text-rss/src
4* Encoding https://github.com/neitanod/forceutf8 4* Encoding https://github.com/neitanod/forceutf8
@@ -10,6 +10,6 @@ poche is based on :
10* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages 10* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
11* Pagination https://github.com/daveismyname/pagination 11* Pagination https://github.com/daveismyname/pagination
12 12
13poche is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License 13wallabag is developed by Nicolas Lœuillet under the Do What the Fuck You Want to Public License
14 14
15Contributors : https://github.com/inthepoche/poche/graphs/contributors \ No newline at end of file 15Contributors : https://github.com/wallabag/wallabag/graphs/contributors \ No newline at end of file
diff --git a/INSTALL.md b/INSTALL.md
deleted file mode 100644
index df245ff0..00000000
--- a/INSTALL.md
+++ /dev/null
@@ -1,3 +0,0 @@
1# Installing poche
2
3Read the full documentation here: http://doc.inthepoche.com/doku.php?id=users:begin:install
diff --git a/README.md b/README.md
index d1ed79ee..30fc9657 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,10 @@
1# what is poche ? 1# what is wallabag ?
2Abandon Pocket, Instapaper and other Readability service : adopt poche. It is the same, but it is free (like in freedom) and open source. 2wallabag 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.
3 3
4## Some features 4To test wallabag, a demo website is online : [demo.wallabag.org](http://demo.wallabag.org) (login poche, password poche).
5* adding, deleting, archiving and setting as favorite a link
6* import from pocket / readability / instapaper
7* share links by email and on twitter
8* a design adapted to tablets and smartphones
9* extensions for Chrome and Firefox
10* Android application
11* multi languages: french, english, spanish, german.
12* multi users (very soon!)
13* update notification in configuration screen
14* many storage modes (sqlite, mysql, postgresql)
15* many templates: [have a look here](https://github.com/inthepoche/poche/tree/master/themes).
16* ...
17
18To test poche, a demo website is online : [demo.inthepoche.com](http://demo.inthepoche.com) (login poche, password poche).
19
20To use poche hosting, [you can create an account here](http://app.inthepoche.com/).
21
22## Installation
23Read the [INSTALL.md file](https://github.com/inthepoche/poche/blob/master/INSTALL.md).
24 5
25## License 6## License
26Copyright © 2010-2013 Nicolas Lœuillet <nicolas.loeuillet@gmail.com> 7Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
27This work is free. You can redistribute it and/or modify it under the 8This work is free. You can redistribute it and/or modify it under the
28terms of the Do What The Fuck You Want To Public License, Version 2, 9terms of the Do What The Fuck You Want To Public License, Version 2,
29as published by Sam Hocevar. See the COPYING file for more details. 10as published by Sam Hocevar. See the COPYING file for more details. \ No newline at end of file
diff --git a/TODO.md b/TODO.md
deleted file mode 100644
index fdba2a51..00000000
--- a/TODO.md
+++ /dev/null
@@ -1,9 +0,0 @@
1# TODO
2
3* pouvoir annuler la suppression
4* conventions codage ? phing ? vérifier error_log qui trainent
5* phpDocumentor
6* minifier css
7* barre fixe d'admin sur la page d'un billet ?
8* revoir export (export vers pocket &cie ? )
9* raccourcis clavier \ No newline at end of file
diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php
index 48ec5abf..3b0f455e 100644
--- a/inc/poche/Database.class.php
+++ b/inc/poche/Database.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index e033ad74..4a5a954b 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
@@ -29,7 +29,8 @@ class Poche
29 'dark' => array('requires' => array('default')), 29 'dark' => array('requires' => array('default')),
30 'dmagenta' => array('requires' => array('default')), 30 'dmagenta' => array('requires' => array('default')),
31 'solarized' => array('requires' => array('default')), 31 'solarized' => array('requires' => array('default')),
32 'solarized-dark' => array('requires' => array('default')) 32 'solarized-dark' => array('requires' => array('default')),
33 'courgette' => array('requires' => array())
33 ); 34 );
34 35
35 public function __construct() 36 public function __construct()
diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php
index 63916582..248a44d7 100644
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php
index 8b3468c3..aba236fa 100644
--- a/inc/poche/Url.class.php
+++ b/inc/poche/Url.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php
index 6dac7839..cc8bec65 100644
--- a/inc/poche/User.class.php
+++ b/inc/poche/User.class.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new
index 1c93be07..39cb2f2f 100755
--- a/inc/poche/config.inc.php.new
+++ b/inc/poche/config.inc.php.new
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 846699d3..e2beade1 100644
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php
index b0cfb9df..e4b0b160 100644
--- a/inc/poche/pochePictures.php
+++ b/inc/poche/pochePictures.php
@@ -1,9 +1,9 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
diff --git a/index.php b/index.php
index 4e86fe11..9113f193 100644
--- a/index.php
+++ b/index.php
@@ -1,14 +1,14 @@
1<?php 1<?php
2/** 2/**
3 * poche, a read it later open source system 3 * wallabag, self hostable application allowing you to not miss any content anymore
4 * 4 *
5 * @category poche 5 * @category wallabag
6 * @author Nicolas Lœuillet <support@inthepoche.com> 6 * @author Nicolas Lœuillet <nicolas@loeuillet.org>
7 * @copyright 2013 7 * @copyright 2013
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11define ('POCHE', '1.3.0'); 11define ('POCHE', '1.4.0');
12require_once 'inc/poche/global.inc.php'; 12require_once 'inc/poche/global.inc.php';
13session_start(); 13session_start();
14 14
diff --git a/themes/README.md b/themes/README.md
deleted file mode 100644
index b5d925b4..00000000
--- a/themes/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
1# poche-themes
2
3themes created by poche users
4
5## list of themes
6
7* dark ([preview](https://raw.github.com/inthepoche/poche/master/themes/dark/screenshot.jpg))
8* dmagenta ([preview](https://raw.github.com/inthepoche/poche/master/themes/dmagenta/screenshot.jpg))
9* solarized ([preview](https://raw.github.com/inthepoche/poche/master/themes/solarized/screenshot.jpg))
10* solarized-dark ([preview](https://raw.github.com/inthepoche/poche/master/themes/solarized-dark/screenshot.jpg))
11
12## installation
13
14In your poche folder:
15
16```
17git submodule init
18git submodule update
19```
20
21Then, in your config screen, select your favorite theme.
22
23That's all !
24
25## create a theme
26
27Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme
28
29## send a theme
30
31Send your theme by email at support@inthepoche.com.
diff --git a/poche_compatibility_test.php b/wallabag_compatibility_test.php
index 42faaa2c..49c4e3b8 100644
--- a/poche_compatibility_test.php
+++ b/wallabag_compatibility_test.php
@@ -1,5 +1,5 @@
1<?php 1<?php
2$app_name = 'poche 1.3'; 2$app_name = 'wallabag 1.3';
3 3
4$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>=')); 4$php_ok = (function_exists('version_compare') && version_compare(phpversion(), '5.3.3', '>='));
5$pcre_ok = extension_loaded('pcre'); 5$pcre_ok = extension_loaded('pcre');
@@ -313,13 +313,13 @@ div.chunk {
313 <?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok) { ?> 313 <?php if ($php_ok && $xml_ok && $pcre_ok && $filter_ok && $allow_url_fopen_ok) { ?>
314 <h3>Bottom Line: Yes, you can!</h3> 314 <h3>Bottom Line: Yes, you can!</h3>
315 <p><em>Your webhost has its act together!</em></p> 315 <p><em>Your webhost has its act together!</em></p>
316 <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://inthepoche.com/download">inthepoche.com</a>.</p> 316 <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
317 <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> 317 <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>
318 <?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?> 318 <?php //} else if ($php_ok && $xml_ok && $pcre_ok && $mbstring_ok && $allow_url_fopen_ok && $filter_ok) { ?>
319 <?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok) { ?> 319 <?php } else if ($php_ok && $xml_ok && $pcre_ok && $allow_url_fopen_ok && $filter_ok) { ?>
320 <h3>Bottom Line: Yes, you can!</h3> 320 <h3>Bottom Line: Yes, you can!</h3>
321 <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> 321 <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>
322 <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://inthepoche.com/download">inthepoche.com</a>.</p> 322 <p>You can download the latest version of <?php echo $app_name; ?> from <a href="http://wallabag.org/download">wallabag.org</a>.</p>
323 <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> 323 <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>
324 <?php } else { ?> 324 <?php } else { ?>
325 <h3>Bottom Line: We're sorry…</h3> 325 <h3>Bottom Line: We're sorry…</h3>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 11:20:31 +0000