Commit graph

414 commits

Author SHA1 Message Date
Nicolas Lœuillet
2a6440c134 Merge pull request #659 from mariroz/dev
last error: config.inc.default.php missed
2014-04-22 21:44:12 +02:00
Maryana Rozhankivska
4dbba60439 last error: config.inc.default.php missed 2014-04-22 22:38:10 +03:00
Nicolas Lœuillet
29cf52b677 Merge pull request #658 from mariroz/dev
inc/poche/config.inc.php.new removed
2014-04-22 20:48:42 +02:00
Maryana Rozhankivska
fd86559a5b inc/poche/config.inc.php.new removed 2014-04-22 21:39:03 +03:00
Nicolas Lœuillet
d70dd7ac69 Merge pull request #653 from mariroz/dev
print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view
2014-04-22 20:18:46 +02:00
Maryana Rozhankivska
43c7b978c3 config.inc.php.new renamed in config.inc.default.php 2014-04-22 20:58:40 +03:00
Maryana Rozhankivska
a4a870e1ec default config is included after user config to prevent undefined constant warning 2014-04-22 19:11:26 +03:00
jmlrt
03303cd71b parse mobile.lemondeinformatique.fr
site_config file created because the title isn't parsed by default for mobile version of lemondeinformatique.fr
2014-04-22 14:44:31 +02:00
Maryana Rozhankivska
c2cf7075c2 print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view 2014-04-22 10:45:09 +03:00
Nicolas Lœuillet
6212acfc81 [fix] rss feed content type set to text/xml #636 2014-04-15 21:49:00 +02:00
Maryana Rozhankivska
0f859c6f32 error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now. 2014-04-11 17:21:54 +03:00
Maryana Rozhankivska
5ce3978472 logging by import added; error by creation table if exists in postgresql fixed. 2014-04-11 14:43:17 +03:00
Maryana Rozhankivska
a8ef1f3f43 code formatting changes: tabs replaced with spaces, some other small formatting enhancements 2014-04-08 11:49:41 +03:00
Maryana Rozhankivska
86da39886d remove duplicates by import, code changes: tabs replaced with spaces 2014-04-08 11:41:06 +03:00
Nicolas Lœuillet
69c57493e7 [fix] with some config, http host is different 2014-04-07 15:44:05 +02:00
Nicolas Lœuillet
7a873ef1d7 remove unnecessary variable declaration 2014-04-06 20:53:31 +02:00
Nicolas Lœuillet
f86784c22d in RSS feed, add link to wallabag URL #556 2014-04-06 16:39:11 +02:00
Nicolas Lœuillet
29d9c0ffe1 [fix] Use of undefined constant ATOM #604 2014-04-06 16:21:48 +02:00
Maryana Rozhankivska
1bcbe8bebf postgres sequence error fix, issue #602 2014-04-05 11:22:33 +03:00
Maryana Rozhankivska
a297fb1e38 import w/o cron 2014-04-03 12:18:49 +03:00
Maryana Rozhankivska
a4585f7eaa import without cron 2014-04-02 22:33:06 +03:00
Maryana Rozhankivska
182faf2696 import without cron 2014-04-02 20:55:19 +03:00
tcit
d967a1fa14 Important fixes for search engine (thx @mariroz)
So sorry for the mess... :(
* search only in users' own articles
* sanitized what is searched
* display what is searched
* pagination, sorting available when searching
* use existing function to query db
* bad encoding caracters fixed
* link to JQuery into default theme, no longer in each theme
* some spaces instead of tabs
2014-04-02 17:44:47 +02:00
tcit
ad697686c0 Final Fix of #570
Adds a date information to the exported data file.
2014-03-28 16:53:06 +01:00
tcit
b152f2b6ba Fix to bug #570
Forces the download of the data exported file as a poche-export file.
2014-03-28 00:57:07 +01:00
tcit
ad03eb6286 Fix of #580 : Add some random for Windows hosts 2014-03-26 17:19:57 +01:00
tcit
cc60cbbbab Finished search engine function
Now searches also in title and in original url
2014-03-26 16:36:42 +01:00
Nicolas Lœuillet
d619120fc4 Merge pull request #582 from mariroz/fix-session-livetime
fix of localhost cookie related to nginx binding to 0.0.0.0
2014-03-24 11:12:56 +01:00
tcit
2c4e7a1cea Fixes to search engine
Changed the search parameter from POST to GET.
Also, adapted the Baggy theme.
2014-03-23 23:52:05 +01:00
tcit
a33a3d2afb Implemented rudimental search engine 2014-03-22 11:09:18 +01:00
Maryana Rozhankivska
03832b45e1 fix of localhost cookie related to nginx binding to 0.0.0.0 2014-03-21 21:56:40 +02:00
Maryana Rozhankivska
ad53faf25c fix of issue under nginx and php-fpm 2014-03-21 14:59:30 +02:00
Maryana Rozhankivska
6fa3f70bc2 fix of _SESSION - indefined variable 2014-03-19 19:22:04 +02:00
Maryana Rozhankivska
2a97194253 fix of #115, server relater config value added 2014-03-18 17:39:19 +02:00
Maryana Rozhankivska
eb5b677250 fix of #115 - stay connected and session livetime 2014-03-17 22:22:05 +02:00
camporez
5805ac4574 Update brazilian traslation title to "Português (Brasil)" 2014-03-16 16:43:46 -03:00
Nicolas Lœuillet
ed02e38e1d [fix] in RSS, link to original article 2014-03-14 09:35:48 +01:00
Nicolas Lœuillet
8d7cd2ccd5 [add] remove import file in CACHE when import is over 2014-03-14 08:54:44 +01:00
Maryana Rozhankivska
fb26cc9375 a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542 2014-03-10 16:28:47 +02:00
Nicolas Lœuillet
17b2afefad [fix] test if user_id doesn't exist in feeds generation 2014-03-10 08:10:03 +01:00
Maryana Rozhankivska
042486c511 fix of #530 - import fail from Poche 2014-03-07 14:52:52 +02:00
Nicolas Lœuillet
ded2c63312 Merge pull request #532 from wallabag/upload-file
New import system
2014-03-07 13:26:56 +01:00
Maryana Rozhankivska
f98373cc34 getPageContent moved to Tools, fix of #426 2014-03-07 12:54:08 +02:00
Nicolas Lœuillet
71b0d53c5e [fix] #115 cookie lifetime was empty 2014-03-02 08:38:26 +01:00
Nicolas Lœuillet
11c680f97a [add] display last check of wallabag release 2014-03-01 19:10:17 +01:00
Nicolas Lœuillet
223268c2fa [fix] RSS Feeds don't validate / W3C #384 2014-03-01 13:09:37 +01:00
Nicolas Lœuillet
53e3158dfe [add] cron to fetch content on imported entries 2014-02-28 21:49:38 +01:00
Nicolas Lœuillet
31a10069a5 [add] upload form for import 2014-02-28 20:36:32 +01:00
Nicolas Lœuillet
49c803425c Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-28 14:06:59 +01:00
Maryana Rozhankivska
6065553c13 effect of block rebuilding on next page removed, issue #479 2014-02-28 13:08:11 +02:00
Nicolas Lœuillet
346380e131 [add] label for brazilian language on config screen 2014-02-27 21:37:25 +01:00
Nicolas Lœuillet
affbd83b48 Merge pull request #515 from mariroz/dev
fix of #509, related to php 5.3
2014-02-27 21:23:10 +01:00
Maryana Rozhankivska
decb9a5814 fix of #509, related to php 5.3 2014-02-27 18:12:43 +02:00
Nicolas Lœuillet
e145f767f3 [add] empty cache after changing language #492 2014-02-27 13:26:07 +01:00
Nicolas Lœuillet
56532c4e72 [add] Empty cache after changing theme #503 2014-02-27 13:24:29 +01:00
Maryana Rozhankivska
cbcae4037c translation related: how-to md file added, script to generate php from all twig templates, polish mo file compiled 2014-02-26 15:43:49 +02:00
Maryana Rozhankivska
f5b5622a89 fix of #498, #493, #494 - because disappeared in last commit 2014-02-25 19:08:18 +02:00
Maryana Rozhankivska
4b842b20ce fix of #486 - import issue 2014-02-24 19:13:54 +02:00
Maryana Rozhankivska
25e1213d1b fix of global $http visibility, issues #493, #494 2014-02-24 12:19:46 +02:00
Nicolas Lœuillet
92fc97eeb3 [fix] redirect on config page after token generation #491 2014-02-23 09:56:21 +01:00
Nicolas Lœuillet
1570a65381 [fix] content is now cleaned by HTML purifier from prevent XSS attack 2014-02-21 15:44:13 +01:00
Nicolas Lœuillet
d4949327ef [add] HTML Purifier added to clean code 2014-02-21 15:43:14 +01:00
Nicolas Lœuillet
c9bd17a100 [add] languages well displayed on config page #480 2014-02-21 15:24:33 +01:00
Nicolas Lœuillet
e7345a2c4f Merge branch 'dev' of git://github.com/mariroz/wallabag into dev 2014-02-21 13:44:30 +01:00
Maryana Rozhankivska
032e0ca13a a lot of refactoring: tag action is now handled by home view and uses sorting and pagination. Some small view enhacenments. Fix of #476, #461 for baggy and other themes 2014-02-20 19:28:39 +02:00
Nicolas Lœuillet
3ade95a3d7 [fix] themes sorted A->Z #470 2014-02-20 13:29:53 +01:00
Nicolas Lœuillet
fddf4fbacc Merge branch 'dev' of git://github.com/arnaudmm/wallabag into arnaudmm-dev 2014-02-20 13:15:27 +01:00
arnaudmm
926acd7bba Feature #457 : import from pocket now import tags too 2014-02-20 13:09:27 +01:00
Maryana Rozhankivska
e83cf5a787 multiple tag entry displayed fix, issue #474 2014-02-20 10:41:16 +02:00
Maryana Rozhankivska
b4fd2154fe Full-Text RSS included as a script instead of file_get_contents call. Tnx to @Faless. Fix issues #366 and #463 2014-02-19 19:08:19 +02:00
Nicolas Lœuillet
b89d5a2bf4 [fix] security problems with tags 2014-02-19 13:25:28 +01:00
Maryana Rozhankivska
488fc63b67 duplicate check added. fix of issue #400 2014-02-14 17:27:22 +02:00
Nicolas Lœuillet
6285e57c49 [add] link to empty cache in config screen, #454 2014-02-14 15:11:57 +01:00
Nicolas Lœuillet
c9357429fd [fix] remove htacces in inc/, bug to fetch content 2014-02-13 19:22:54 +01:00
Nicolas Lœuillet
41265e07d4 add help about vendor.zip 2014-02-13 18:57:57 +01:00
Nicolas Lœuillet
2e4440c3f8 [change] wallabag in feeds title 2014-02-13 08:57:44 +01:00
Nicolas Lœuillet
3141347214 new default theme, baggy \o/ 2014-02-12 21:59:02 +01:00
Nicolas Lœuillet
16fd1cce61 [change] time for session 2014-02-12 21:52:51 +01:00
Nicolas Lœuillet
f14807de06 [add] mark all as read #385 2014-02-12 21:52:01 +01:00
Nicolas Lœuillet
68268c0199 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2014-02-12 20:05:51 +01:00
Nicolas Lœuillet
26929c08d3 bug fix #430 - welcome to your wallabag 2014-02-12 20:04:47 +01:00
Nicolas Lœuillet
044bf638a8 bug fix #364 - RSS Feed URL problem with + sign 2014-02-12 19:58:49 +01:00
Nicolas Lœuillet
58f6269f36 Merge pull request #439 from flolauck/master
Adding .htaccess files to prohibit access to critical directories, e.g., db/
2014-02-10 12:10:08 +01:00
Florian Lauck
3a68883ae9 Adding .htaccess files to prohibit access to critical directories, e.g., db/ 2014-02-10 08:58:21 +01:00
Maryana Rozhankivska
c515ffec9c Polish and Ukrainian translations added. Russian - updated. Plust 2 small translation related fixes in code. 2014-02-07 17:49:27 +02:00
nicosomb
fa0bfb775a [fix] #389 Empty article title (blank title tag) 2014-02-03 17:11:14 +01:00
Nicolas Lœuillet
445a1a1c8d [fix] Add support for X-Forwarded-Proto header field #413 2014-02-03 12:46:09 +01:00
Maryana Rozhankivska
6af66b1106 fix of bug #368 Endless redirects or user doesn't exist with basic authentication 2014-01-30 16:35:31 +02:00
Nicolas Lœuillet
f4fbfaa7cb some fix to courgette theme 2014-01-28 11:19:06 +01:00
Nicolas Lœuillet
1b539ba1ec Merge branch 'extraction-with-basic-auth' of git://github.com/aaa2000/poche into aaa2000-extraction-with-basic-auth 2014-01-28 10:56:57 +01:00
Nicolas Lœuillet
3e0e7e1208 [fix] inthepoche.com => wallabag.org 2014-01-28 10:49:57 +01:00
Nicolas Lœuillet
c95b78a8ce poche is dead, welcome wallabag 2014-01-28 10:36:04 +01:00
Lonnytunes
d1d3498b62 [fix] Stops multiplication, in database, of a same user config item (error of variable name). 2014-01-20 00:44:51 +01:00
adev
f878daeb8b add basic auth in file_get_contents for content extraction when user use basic auth 2014-01-12 17:08:52 +01:00
Nicolas Lœuillet
8905191413 [add] import from poche, thank you @tsadiq #388 2014-01-07 20:21:43 +01:00
Nicolas Lœuillet
e1cf0fda27 [add] user_agent in file_get_contents 2014-01-07 13:15:43 +01:00
Nicolas Lœuillet
be4c8197eb Merge pull request #381 from tcitworld/dev
Flattr Class : Bug 359
2014-01-06 10:07:29 -08:00
adev
a562e3905a Create sqlite table tags_entries only if not already exists 2014-01-05 15:03:05 +01:00
Thomas Citharel
607e12b4f2 Fixes bug 359 2014-01-04 21:50:08 +01:00
Nicolas Lœuillet
2abcccb371 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2014-01-03 15:18:32 +01:00
Nicolas Lœuillet
9bc32632af [fix] #375 Readability.com changed its export format 2014-01-03 15:18:13 +01:00
Nicolas Lœuillet
52e3f58c72 Merge pull request #380 from F1reF0x/dev
Change Permissions in pochePictures.php
2014-01-03 02:20:40 -08:00
FireFox
b5c1ed1227 Change Permissions in pochePictures.php
Stored Pictures are not accessible (on my server), when permission is set to 0705, but instead, when using 0755 (or for example to 0715) all is working as expected. So maybe it would be good, considering in changing the permission of created directories in the assets directory
2014-01-03 11:17:15 +01:00
Nicolas Lœuillet
cb4fba5a33 [del] remove inthepoche.com config file, website has changed 2014-01-03 10:22:12 +01:00
Nicolas Lœuillet
4a84d94e91 [add] config file for interviewmagazine.com 2014-01-03 10:21:18 +01:00
Nicolas Lœuillet
0b57c6825a [fix] bugs #374 and #376 - encoding in rss 2014-01-03 10:15:05 +01:00
Nicolas Lœuillet
9de34d4e84 [fix] error in query to get entries and tags 2014-01-03 10:06:26 +01:00
Nicolas Lœuillet
da5fc42f61 [fix] bug with queries when postgresql is used 2013-12-23 11:23:12 +01:00
Nicolas Lœuillet
5cfafc6110 [add] check tags tables 2013-12-23 10:35:09 +01:00
Nicolas Lœuillet
1810c13b55 PHP_AUTH_USER isn't available when using php as cgi 2013-12-23 09:09:10 +01:00
Dmitry Sandalov
a0aa150418 fix for long lasting session 2013-12-21 23:39:45 +04:00
Nicolas Lœuillet
05d6dd487c Merge pull request #356 from inthepoche/tags
Tags feature
2013-12-12 01:48:24 -08:00
Nicolas Lœuillet
d460914f65 [add] download database if sqlite is on 2013-12-12 09:42:19 +01:00
Nicolas Lœuillet
c432fa1674 [add] assign and remove a tag to an entry 2013-12-06 15:07:51 +01:00
Nicolas Lœuillet
f778e47283 [add] rss for tag 2013-12-06 14:37:42 +01:00
Nicolas Lœuillet
4886ed6d36 [add] page which lists entries for a tag 2013-12-06 14:22:29 +01:00
Nicolas Lœuillet
74ec445a66 [change] simplify Tools::getTplFile 2013-12-06 14:07:00 +01:00
Nicolas Lœuillet
6cab59c340 [add] edit tags page 2013-12-06 14:03:14 +01:00
Nicolas Lœuillet
2e2ebe5ec7 [add] create tags page 2013-12-06 13:15:06 +01:00
Nicolas Lœuillet
7b171c7340 [add] send tags to article view 2013-12-06 13:02:38 +01:00
Nicolas Lœuillet
5bea1a4d31 [add] function to get tags by entry 2013-12-06 13:02:15 +01:00
Nicolas Lœuillet
9e7c840b18 [fix] RSS feeds were buggy when I update full-text RSS 2013-12-06 10:14:59 +01:00
Nicolas Lœuillet
ac4d114214 [add] new specific configuration files 2013-12-06 10:13:03 +01:00
Nicolas Lœuillet
42c80841c8 [change] we now use Full-Text RSS 3.1, thank you so much @fivefilters 2013-12-06 09:45:27 +01:00
Nicolas Lœuillet
59cc585271 [add] add RSS feed for archive 2013-12-05 15:13:32 +01:00
Nicolas Lœuillet
72c20a5297 [add] atom feeds for unread / fav items 2013-12-03 10:40:27 +01:00
Nicolas Lœuillet
5846b0f1b3 [change] getConfigUser is now a public function 2013-12-03 10:39:45 +01:00
Nicolas Lœuillet
39cc09dfc3 [change] update FeedWriter class 2013-12-03 10:39:00 +01:00
Jason
16ac4e3dbe Subdomain to domain failover left incorrect leading '.'. This has been remedied. 2013-11-30 13:02:18 -05:00
Jason Ghent
2ab37d6205 Addition of stackexchange parser. 2013-11-30 13:00:24 -05:00
Jason Ghent
e070b9b511 Added stackoverflow parsing. 2013-11-30 12:08:17 -05:00
Nicolas Lœuillet
0c2f453750 Fix Undefined offset Notice (thx @vjousse) 2013-11-20 10:22:21 +01:00
Nicolas Lœuillet
760d44d194 Merge branch 'DmitrySandalov-master' into dev 2013-11-13 15:23:52 +01:00
Nicolas Lœuillet
f2d3ee98a6 [fix] bug fix #287: test if open_basedir & safe_mode are active to use CURLOPT_FOLLOWLOCATION 2013-11-13 15:17:34 +01:00
Nicolas Lœuillet
705f04937f Merge branch 'master' of git://github.com/DmitrySandalov/poche into DmitrySandalov-master 2013-11-13 14:52:28 +01:00
Dmitry Sandalov
45e9e0f565 fix #270 access from remote machine
Replacing SERVER_NAME with HTTP_HOST allows me to use Poche on remote machines
2013-11-05 12:13:55 +03:00
banux
f616ab60ef use 2 seprate variable for autoclosing windows to avoid to quick closing when sharing, the popup can be close before the link is save 2013-10-27 07:47:14 +01:00
banux
363bc4eb86 Add a autoclose parameters. When we use sharing method in plugins like the tiny tiny rss one or the firefox plugins we can passe the autoclose=true parameters that close the popup. 2013-10-27 07:37:05 +01:00
Nicolas Lœuillet
83020b993c parse dilbert.com 2013-10-25 15:50:16 +02:00
Nicolas Lœuillet
985ce3ec53 bug fix #259: Deleting article doesn't redirect 2013-10-25 14:25:37 +02:00
Denis Sacchet
027b4e1568 Adding support for http_auth 2013-10-20 23:28:45 +02:00
Denis Sacchet
df6afaf090 Added support for http_auth 2013-10-20 16:53:54 +02:00
Nicolas Lœuillet
0c994bd934 Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-10-10 14:07:13 +02:00
Nicolas Lœuillet
18889e230a remove empty file 2013-10-10 14:06:53 +02:00
Nicolas Lœuillet
e557b7bb44 Merge pull request #274 from NumEricR/select-theme
Update select theme filter and sort names (dev branch PR)
2013-10-08 23:33:48 -07:00
Nicolas Lœuillet
5188585864 Merge pull request #272 from jcsaaddupuy/custom_ssl_port
Custom ssl port
2013-10-08 03:48:49 -07:00
Nicolas Lœuillet
1e98ee1de0 bug fix: changing password was buggy 2013-10-07 14:56:21 +02:00
Nicolas Lœuillet
5011388f39 bug fix #215: change language from config screen 2013-10-07 14:26:25 +02:00
Jean-Christophe Saad-Dupuy
5e07dc8b51 Merge remote branch 'upstream/dev' into dev
Conflicts:
	themes/default/_head.twig
2013-10-07 14:25:24 +02:00
Nicolas Lœuillet
031df528b6 bug fix #268: move POCHE_VERSION in index.php and change the name to avoid conflicts when updating 2013-10-07 13:19:34 +02:00