aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--composer.json12
-rw-r--r--composer.lock98
-rwxr-xr-xinc/poche/global.inc.php3
3 files changed, 108 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index 7f0a75ea..8ceff37e 100644
--- a/composer.json
+++ b/composer.json
@@ -38,6 +38,14 @@
38 { 38 {
39 "type": "vcs", 39 "type": "vcs",
40 "url": "https://github.com/wallabag/PHPePub" 40 "url": "https://github.com/wallabag/PHPePub"
41 },
42 {
43 "type": "vcs",
44 "url": "https://github.com/wallabag/php-readability"
45 },
46 {
47 "type": "vcs",
48 "url": "https://github.com/wallabag/phpMobi"
41 } 49 }
42 ], 50 ],
43 "require": { 51 "require": {
@@ -51,7 +59,9 @@
51 "wallabag/PHP-Flash-Messages": "dev-master", 59 "wallabag/PHP-Flash-Messages": "dev-master",
52 "wallabag/kriss_php5": "dev-master", 60 "wallabag/kriss_php5": "dev-master",
53 "wallabag/pagination": "dev-master", 61 "wallabag/pagination": "dev-master",
54 "wallabag/PHPePub": "dev-master" 62 "wallabag/PHPePub": "dev-master",
63 "wallabag/php-readability": "dev-master",
64 "wallabag/phpMobi": "dev-master"
55 }, 65 },
56 "require-dev": { 66 "require-dev": {
57 "phpunit/phpunit": "~3.7" 67 "phpunit/phpunit": "~3.7"
diff --git a/composer.lock b/composer.lock
index b1a864b9..31f89158 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", 4 "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 "This file is @generated automatically" 5 "This file is @generated automatically"
6 ], 6 ],
7 "hash": "376dd2761a2a44043b834a7cb5897e37", 7 "hash": "40ed8709fd61a419755acbbaecf6b793",
8 "packages": [ 8 "packages": [
9 { 9 {
10 "name": "ezyang/htmlpurifier", 10 "name": "ezyang/htmlpurifier",
@@ -1758,6 +1758,98 @@
1758 "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/master" 1758 "source": "https://github.com/wallabag/PHP-Flash-Messages/tree/master"
1759 }, 1759 },
1760 "time": "2015-01-18 19:51:55" 1760 "time": "2015-01-18 19:51:55"
1761 },
1762 {
1763 "name": "wallabag/php-readability",
1764 "version": "dev-master",
1765 "source": {
1766 "type": "git",
1767 "url": "https://github.com/wallabag/php-readability.git",
1768 "reference": "a37a1482b9964ae1804dbed0bffa00988523c387"
1769 },
1770 "dist": {
1771 "type": "zip",
1772 "url": "https://api.github.com/repos/wallabag/php-readability/zipball/a37a1482b9964ae1804dbed0bffa00988523c387",
1773 "reference": "a37a1482b9964ae1804dbed0bffa00988523c387",
1774 "shasum": ""
1775 },
1776 "require": {
1777 "php": ">=5.2"
1778 },
1779 "type": "library",
1780 "autoload": {
1781 "psr-0": {
1782 "Readability": ""
1783 }
1784 },
1785 "license": [
1786 "Apache-2.0"
1787 ],
1788 "authors": [
1789 {
1790 "name": "Keyvan Minoukadeh",
1791 "email": "keyvan@keyvan.net",
1792 "homepage": "http://keyvan.net",
1793 "role": "Developer (ported original JS code to PHP)"
1794 },
1795 {
1796 "name": "Arc90",
1797 "homepage": "http://arc90.com",
1798 "role": "Developer (original JS version)"
1799 }
1800 ],
1801 "description": "Automatic article extraction from HTML",
1802 "homepage": "https://github.com/wallabag/php-readability",
1803 "keywords": [
1804 "article",
1805 "article extraction",
1806 "content",
1807 "content extraction",
1808 "extraction",
1809 "html"
1810 ],
1811 "support": {
1812 "source": "https://github.com/wallabag/php-readability/tree/master",
1813 "issues": "https://github.com/wallabag/php-readability/issues"
1814 },
1815 "time": "2015-01-19 12:25:38"
1816 },
1817 {
1818 "name": "wallabag/phpMobi",
1819 "version": "dev-master",
1820 "source": {
1821 "type": "git",
1822 "url": "https://github.com/wallabag/phpMobi.git",
1823 "reference": "67fa665a9e5eb78b3e9246629a9be4ef46c884ba"
1824 },
1825 "dist": {
1826 "type": "zip",
1827 "url": "https://api.github.com/repos/wallabag/phpMobi/zipball/67fa665a9e5eb78b3e9246629a9be4ef46c884ba",
1828 "reference": "67fa665a9e5eb78b3e9246629a9be4ef46c884ba",
1829 "shasum": ""
1830 },
1831 "require": {
1832 "php": ">=5.3.0"
1833 },
1834 "type": "library",
1835 "autoload": {
1836 "files": [
1837 "MOBIClass/MOBI.php"
1838 ]
1839 },
1840 "authors": [
1841 {
1842 "name": "Nicolas LÅ“uillet",
1843 "email": "nicolas@loeuillet.org",
1844 "homepage": "http://www.cdetc.fr"
1845 }
1846 ],
1847 "description": "An experimental Mobipocket file creator in PHP.",
1848 "homepage": "https://github.com/wallabag/phpMobi",
1849 "support": {
1850 "source": "https://github.com/wallabag/phpMobi/tree/master"
1851 },
1852 "time": "2015-01-19 12:35:44"
1761 } 1853 }
1762 ], 1854 ],
1763 "packages-dev": [ 1855 "packages-dev": [
@@ -2137,7 +2229,9 @@
2137 "wallabag/php-flash-messages": 20, 2229 "wallabag/php-flash-messages": 20,
2138 "wallabag/kriss_php5": 20, 2230 "wallabag/kriss_php5": 20,
2139 "wallabag/pagination": 20, 2231 "wallabag/pagination": 20,
2140 "wallabag/phpepub": 20 2232 "wallabag/phpepub": 20,
2233 "wallabag/php-readability": 20,
2234 "wallabag/phpmobi": 20
2141 }, 2235 },
2142 "prefer-stable": false, 2236 "prefer-stable": false,
2143 "prefer-lowest": false, 2237 "prefer-lowest": false,
diff --git a/inc/poche/global.inc.php b/inc/poche/global.inc.php
index 308a416f..8b62d5de 100755
--- a/inc/poche/global.inc.php
+++ b/inc/poche/global.inc.php
@@ -29,8 +29,7 @@ require_once INCLUDES . '/poche/FlattrItem.class.php';
29 29
30require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php'; 30require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedItem.php';
31require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php'; 31require_once INCLUDES . '/3rdparty/libraries/feedwriter/FeedWriter.php';
32# mobi library 32
33require_once INCLUDES . '/3rdparty/libraries/MOBIClass/MOBI.php';
34# pdf library 33# pdf library
35require_once INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php'; 34require_once INCLUDES . '/3rdparty/libraries/tcpdf/tcpdf.php';
36 35