mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-24 01:51:01 +00:00
Code Issues Projects Releases Wiki Activity
831 commits 13 branches 100 tags 170 MiB
Commit graph

336 commits

Author SHA1 Message Date
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
Nicolas Lœuillet
9d3b88b379 bug fix #266: make installation steps easier 2013-10-07 13:12:28 +02:00
Jean-Christophe Saad-Dupuy
2916d24b20 Added support for custom SSL port 2013-10-07 12:47:13 +02:00
Jean-Christophe Saad-Dupuy
125f9ee838 Added support for custom ssl port 2013-10-07 12:30:40 +02:00
NumEricR
2287bf06f5 Sort themes alphabetically in config list 2013-10-05 11:08:38 +02:00
NumEricR
89812ec81c Remove useless filter on .git folder 2013-10-05 10:52:08 +02:00
Nicolas Lœuillet
d47d2533ac change doc link 2013-10-03 19:03:52 +02:00
Nicolas Lœuillet
47baa1077e reopen #219 when archive last poched links from a page, redirect to an other page 2013-10-03 15:43:24 +02:00
Nicolas Lœuillet
f0f7b94362 remove print_r 2013-10-03 14:53:08 +02:00
Nicolas Lœuillet
747c6698b6 Merge branch 'dev' of git://github.com/tcitworld/poche into tcitworld-dev 2013-10-03 14:51:20 +02:00
Nicolas Lœuillet
8f91e10faa preparing to 1.0.0 2013-10-03 14:51:04 +02:00
Nicolas Lœuillet
6cd8af85da bug fix #227: Deleting element in archive redirect to home 2013-10-03 14:48:53 +02:00
Nicolas Lœuillet
34d67c835e bug fix #219: when archive last poched links from a page, redirect to an other page 2013-10-03 14:46:46 +02:00
Nicolas Lœuillet
7f17a38d35 change instructions messages 2013-10-03 14:23:03 +02:00
Nicolas Lœuillet
969a91a1e3 site_config is now embedded with poche 2013-10-03 13:48:58 +02:00
Thomas Citharel
4e5b04113d Changed Flattr Caching System 
From md5(url) to the ID of an article. Easier and faster.
 2013-09-27 11:11:45 +02:00
NumEricR
3cc22aab82 Avoid ".git" option in themes list of config page 2013-09-26 23:37:07 +02:00
Thomas Citharel
be2b9055b9 Changed url's encryption from base64 to md5 
Fixes Issue #243.
md5 hashes are only coded on 32 hexadecimal characters, so it won't make
too long file names.
 2013-09-26 22:00:44 +02:00
Nicolas Lœuillet
92cd6e9af8 change import files constants 2013-09-21 21:44:49 +02:00
Nicolas Lœuillet
58ace4941e bug fix #229: theme not stored on updated poches 2013-09-21 14:37:53 +02:00
Nicolas Lœuillet
37527034ab unactivate debug 2013-09-21 14:18:28 +02:00
Nicolas Lœuillet
3408ed48ba fix bug #225: blank page on article page 2013-09-20 14:09:26 +02:00
Nicolas Lœuillet
b8c67f8068 remove define.inc.php 2013-09-20 13:48:29 +02:00
Nicolas Lœuillet
7bda34c66b help when sqlite file not found 2013-09-20 11:25:44 +02:00
Nicolas Lœuillet
2af5015668 remove config.inc.php 2013-09-20 11:05:12 +02:00
Nicolas Lœuillet
5801355cbc chmod & mail address 2013-09-20 11:04:36 +02:00
Nicolas Lœuillet
00dbaf90bc merge #224 2013-09-20 10:21:39 +02:00
Nicolas Lœuillet
705250b93d fixes with new session class 2013-09-20 09:32:49 +02:00
Nicolas Lœuillet
0d64be15de remove csrf check 2013-09-18 09:25:28 +02:00
Nicolas Lœuillet
f6597c7cb9 fix bug #127: update session class 2013-09-17 14:48:16 +02:00
NumEricR
1b2abab6dd Add lang attribute in html tag 2013-09-14 10:06:59 +02:00
Nicolas Lœuillet
1a08e7b6f6 titles with colon bad parsed 2013-09-13 09:01:33 +02:00
Nicolas Lœuillet
b9523a0ba0 fix bug #209: titles with colon bad parsed 2013-09-12 19:28:59 +02:00
Nicolas Lœuillet
12d9cfbcaa Merge branch 'Flattr' of git://github.com/tcitworld/poche into tcitworld-Flattr 
Conflicts:
	inc/3rdparty/site_config
 2013-09-10 19:22:47 +02:00
Nicolas Lœuillet
f3a6080fce add site_config submodule 2013-09-10 18:50:42 +02:00
Nicolas Lœuillet
f16b0747a4 remove site_config to manage them by a submodule 2013-09-10 18:28:17 +02:00
Thomas Citharel
964481d023 Fixed bugs, added a flattr button and an option 
There's a button and an option in define.inc.php to show the button or
not.
 2013-09-10 18:23:56 +02:00
Nicolas Lœuillet
d11e2bcf48 change doc url 2013-09-10 15:46:05 +02:00
Nicolas Lœuillet
3c33e40b61 change email address in header 2013-09-10 15:43:01 +02:00
Nicolas Lœuillet
eaf2c769be Merge branch 'dev' of https://github.com/inthepoche/poche into dev 2013-09-10 14:44:59 +02:00
Nicolas Lœuillet
ce4a1dcc19 changes to add url directly from poche 2013-09-10 14:41:58 +02:00
Thomas Citharel
af1d279226 Fixed errors and changed source of flattrs 
Fixed errors, and the number displayed is no longer the number of peope
who has flattred an article, but the number of flattrs he has got.
 2013-09-08 21:52:01 +02:00
Thomas Citharel
d5ce28df67 Fixed bugs due to migration 2013-09-08 21:26:30 +02:00
Thomas Citharel
693b3f8677 Implemented Add Button 
Added a button to add an URL when directly into Poche. If JS isn't
enabled, nothing happens.
 2013-09-08 21:07:59 +02:00
Thomas Citharel
a322312740 Implemented Flattr changes 
Added a button to say if the article is flattrable or not and how many
people have flattred this object.
 2013-09-08 20:54:11 +02:00
NumEricR
7f9f5281e5 Add number of results next to pager 2013-08-28 21:23:26 +02:00
NumEricR
3eb049036e Add warning message when there is no entry in current view 2013-08-27 16:03:50 +02:00
NumEricR
093f1efb21 Update comment 2013-08-27 16:03:50 +02:00
Nicolas Lœuillet
7d1778bbd2 config file for tldp.org 2013-08-27 12:52:35 +02:00
Nicolas Lœuillet
5ebf6eeca1 add configuration to parse bfmtv.com 2013-08-27 11:05:57 +02:00
Nicolas Lœuillet
6fb4600334 fix bug #186: content was empty when enabling downloading pictures 2013-08-26 17:38:01 +02:00
Nicolas Lœuillet
ec3972361d poche now uses Full Text RSS to fetch content 2013-08-25 20:10:23 +02:00
Nicolas Lœuillet
d7c2f0cc47 fix bug #175 IP addresses do not appear in view original 2013-08-25 08:01:18 +02:00
Nicolas Lœuillet
217bacc663 Merge pull request #173 from EliasZ/dev 
Graceful error-handling with imports and defining where import files are stored
 2013-08-24 22:42:37 -07:00
nicofrand
149df445d6 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:50:28 +02:00
nicofrand
38b95e7be9 Add IPv4 url support (and others beginning by a digit) 2013-08-24 16:31:22 +02:00
EliasZ
66b6a3b5e2 graceful error-handling with imports, define where import files are stored 2013-08-24 15:59:51 +02:00
nicofrand
7374ff30ef Add IPv4 url support (and others beginning by a digit) 2013-08-24 11:10:07 +02:00
Nicolas Lœuillet
679b6b85ad preparing to beta4 2013-08-23 22:43:16 +02:00
Nicolas Lœuillet
6d7defc87c new messages when update / install 2013-08-23 22:24:41 +02:00
Nicolas Lœuillet
b64a882696 notice with poche_version undefined' 2013-08-23 21:30:55 +02:00
Nicolas Lœuillet
70c39d1618 tabs2spaces 2013-08-23 21:07:32 +02:00
Nicolas Lœuillet
1e0f9166cc set shaarli to false 2013-08-23 19:49:17 +02:00
Nicolas Lœuillet
8340fedd64 fix bug #150 Add support of text files by setting a default title 2013-08-23 18:29:36 +02:00
Nicolas Frandeboeuf
57c91e427d Merge branch 'dev' of https://github.com/nicofrand/poche into dev 2013-08-22 00:57:11 +02:00
Nicolas Frandeboeuf
2bf93dc034 Fix #149 2013-08-22 00:49:23 +02:00
Nicolas Lœuillet
746f93c290 fix bug #148 Use of undefined constant POCHE_VERSION 2013-08-20 11:23:32 +02:00
Nicolas Lœuillet
abed0f2122 some precisons in updating poche 2013-08-16 20:40:31 +02:00
Nicolas Lœuillet
bb5a7d9ede updating script 2013-08-16 20:19:31 +02:00
Nicolas Lœuillet
0b05568c9f fix #138: change pattern to parse url with # 2013-08-15 11:46:40 +02:00
Nicolas Lœuillet
c0d321c1bf #136 error during readability import 2013-08-15 11:29:28 +02:00
Nicolas Lœuillet
4a2912880f more verif while installing 2013-08-15 10:54:14 +02:00
Nicolas Lœuillet
cd03b575df error msg when install folder exists 2013-08-12 14:27:51 +02:00
Nicolas Lœuillet
6a9e4bfc90 version number 2013-08-11 21:04:04 +02:00
Nicolas Lœuillet
b58e261db9 bug in downloading pictures : article content wasn't updated anymore 2013-08-09 23:30:20 +02:00
Nicolas Lœuillet
d8d1542e52 typo 2013-08-09 22:15:40 +02:00
Nicolas Lœuillet
6c15854448 Closed #111 : test of install folder moved before 2013-08-09 11:47:37 +02:00
Nicolas Lœuillet
d91787589b fix #113 - reading time 2013-08-09 08:25:16 +02:00
Nicolas Lœuillet
3d8bded89e debug false 2013-08-08 21:28:37 +02:00