From c8b4ef7fed01c4d94ac9d2325bd2c6e97f831bad Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 19 Nov 2014 16:27:56 +0100 Subject: implementing carrot into wallabag --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index f666f468..21cbaf71 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -49,6 +49,7 @@ @define ('NOT_FLATTRABLE', '0'); @define ('FLATTRABLE', '1'); @define ('FLATTRED', '2'); +@define ('CARROT', TRUE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. @@ -67,4 +68,3 @@ @define ('IMPORT_LIMIT', 5); //delay between downloads (in sec) @define ('IMPORT_DELAY', 5); - -- cgit v1.2.3 From b13376e918aa157be5c0dfd53a655cc5d387f522 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 19 Nov 2014 16:35:44 +0100 Subject: fix Flattrs --- inc/poche/config.inc.default.php | 1 - 1 file changed, 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index f666f468..304b3924 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -67,4 +67,3 @@ @define ('IMPORT_LIMIT', 5); //delay between downloads (in sec) @define ('IMPORT_DELAY', 5); - -- cgit v1.2.3 From d25a3f13c2617d6d3f6d6433d426fab47727f038 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 19 Nov 2014 16:40:02 +0100 Subject: default deactivated --- inc/poche/config.inc.default.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 21cbaf71..de992a9c 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -49,7 +49,7 @@ @define ('NOT_FLATTRABLE', '0'); @define ('FLATTRABLE', '1'); @define ('FLATTRED', '2'); -@define ('CARROT', TRUE); +@define ('CARROT', FALSE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. @@ -67,4 +67,4 @@ //limit for download of articles during import @define ('IMPORT_LIMIT', 5); //delay between downloads (in sec) -@define ('IMPORT_DELAY', 5); +@define ('IMPORT_DELAY', 5); \ No newline at end of file -- cgit v1.2.3 From 7c2c49d9b10104e0850f536d33588b8216416a45 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 6 Dec 2014 18:42:29 +0100 Subject: added diaspora sharing --- inc/poche/config.inc.default.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 0f88f335..3eaee3a3 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -44,6 +44,8 @@ @define ('SHARE_MAIL', TRUE); @define ('SHARE_SHAARLI', FALSE); @define ('SHAARLI_URL', 'http://myshaarliurl.com'); +@define ('SHARE_DIASPORA', FALSE); +@define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end @define ('FLATTR', TRUE); @define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); @define ('NOT_FLATTRABLE', '0'); -- cgit v1.2.3 From 44b95cb81deae35f58e0058910afde2f2ffb9a60 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 13 Dec 2014 22:56:30 +0100 Subject: added reload function --- inc/poche/config.inc.default.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 3eaee3a3..0d249c64 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -56,6 +56,7 @@ @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. @define ('SHOW_READPERCENT', '1'); +@define ('RELOAD_ARTICLE', TRUE); @define ('ABS_PATH', 'assets/'); @define ('DEFAULT_THEME', 'baggy'); -- cgit v1.2.3 From 5ea5310ab450035143e2f5637f9fa69773f7879b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 14 Dec 2014 15:17:39 +0100 Subject: enable showing or not for epub/mobi/pdf export buttons --- inc/poche/config.inc.default.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 3eaee3a3..a159e713 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -52,6 +52,12 @@ @define ('FLATTRABLE', '1'); @define ('FLATTRED', '2'); @define ('CARROT', FALSE); + +// ebook +@define ('EPUB', TRUE); +@define ('MOBI', FALSE); +@define ('PDF', FALSE); + // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. -- cgit v1.2.3 From 121691e90026dcfaaecef0a1db07d40cd43a9278 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 23 Jan 2015 16:34:56 +0100 Subject: working on registration support --- inc/poche/config.inc.default.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index a159e713..3156b56c 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -31,7 +31,9 @@ @define ('SSL_PORT', 443); @define ('MODE_DEMO', FALSE); -@define ('DEBUG_POCHE', FALSE); +@define ('DEBUG_POCHE', TRUE); + +@define ('ALLOW_REGISTER', TRUE); //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); -- cgit v1.2.3 From 1fbef3bfb57b3f73e6817115f10b5876dd0e57ef Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 24 Jan 2015 12:54:58 +0100 Subject: resetting debug to false --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 3156b56c..000faf1c 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -31,7 +31,7 @@ @define ('SSL_PORT', 443); @define ('MODE_DEMO', FALSE); -@define ('DEBUG_POCHE', TRUE); +@define ('DEBUG_POCHE', FALSE); @define ('ALLOW_REGISTER', TRUE); -- cgit v1.2.3 From 571b99e8045ab45bfa04bbc2a90dc566dba59452 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 4 Feb 2015 23:50:33 +0100 Subject: added evernote support --- inc/poche/config.inc.default.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index aaaf12a6..91b50c24 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -44,6 +44,7 @@ @define ('SHARE_MAIL', TRUE); @define ('SHARE_SHAARLI', FALSE); @define ('SHAARLI_URL', 'http://myshaarliurl.com'); +@define ('SHARE_EVERNOTE', FALSE); @define ('SHARE_DIASPORA', FALSE); @define ('DIASPORA_URL', 'http://diasporapod.com'); # Don't add a / at the end @define ('FLATTR', TRUE); -- cgit v1.2.3 From 6cb5e1c9f511996d52b45b459bb26047f0dead38 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Feb 2015 19:10:22 +0100 Subject: improvements to internal registration and translations --- inc/poche/config.inc.default.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 91b50c24..fbf4ae9a 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -59,6 +59,9 @@ @define ('MOBI', FALSE); @define ('PDF', FALSE); +// registration +@define ('SEND_CONFIRMATION_EMAIL', TRUE); + // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. -- cgit v1.2.3 From dc6ec987585a1c51f678c404143e37b0d844d796 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Feb 2015 19:14:56 +0100 Subject: just a reminder --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index fbf4ae9a..0fd9bc0e 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -60,7 +60,7 @@ @define ('PDF', FALSE); // registration -@define ('SEND_CONFIRMATION_EMAIL', TRUE); +@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); -- cgit v1.2.3 From f2321633b9dcc806b3c036a742bde1e4c9bcbef9 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 13 Feb 2015 19:39:48 +0100 Subject: couple improvements, translations --- inc/poche/config.inc.default.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index e569dddd..7c27856d 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -33,8 +33,6 @@ @define ('MODE_DEMO', FALSE); @define ('DEBUG_POCHE', FALSE); -@define ('ALLOW_REGISTER', TRUE); - //default level of error reporting in application. Developers should override it in their config.inc.php: set to E_ALL. @define ('ERROR_REPORTING', E_ALL & ~E_NOTICE); @@ -63,6 +61,7 @@ // registration @define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL +@define ('ALLOW_REGISTER', TRUE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); -- cgit v1.2.3 From 698eda739e705f5605711af927eb5e3720c7c97c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 14 Feb 2015 12:35:22 +0100 Subject: mainly css improvements --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 7c27856d..6750383e 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -60,7 +60,7 @@ @define ('PDF', FALSE); // registration -@define ('SEND_CONFIRMATION_EMAIL', TRUE); // TO BE CHANGED DEPENDING ON POLL +@define ('SEND_CONFIRMATION_EMAIL', FALSE); @define ('ALLOW_REGISTER', TRUE); // display or not print link in article view -- cgit v1.2.3 From 054c9d8838e6d339f46d22f90655576fa1d1231d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 14 Feb 2015 15:12:02 +0100 Subject: (definitely) fixed utf8mb4 and check if user already exists in database before installing first user --- inc/poche/config.inc.default.php | 1 + 1 file changed, 1 insertion(+) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 6750383e..16b96f7e 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -20,6 +20,7 @@ @define ('STORAGE_DB', 'poche'); @define ('STORAGE_USER', 'poche'); @define ('STORAGE_PASSWORD', 'poche'); +@define ('MYSQL_USE_UTF8MB4', FALSE); // This should be false unless you know what it is ################################################################################# # Do not trespass unless you know what you are doing -- cgit v1.2.3 From 50b752c21e9f4d0e9153db091f5293c927cd1735 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 14 Feb 2015 15:12:56 +0100 Subject: set registration to false --- inc/poche/config.inc.default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'inc/poche/config.inc.default.php') diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 16b96f7e..09d3aa9a 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -61,8 +61,8 @@ @define ('PDF', FALSE); // registration +@define ('ALLOW_REGISTER', FALSE); @define ('SEND_CONFIRMATION_EMAIL', FALSE); -@define ('ALLOW_REGISTER', TRUE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); -- cgit v1.2.3