moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 09:32:15 -05:00
Code Issues Releases Wiki Activity
907 Commits 13 Branches 34 Tags 42 MiB
1f78bd8471
Commit Graph

907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Lœuillet
1f78bd8471 Merge branch 'dev' of github.com:anno1337/wallabag into anno1337-dev 2014-07-22 21:26:02 +02:00
Nicolas Lœuillet
f83ffc3ac3 Merge branch 'feature/programmingCodeSyntaxHighlighting' into dev 2014-07-22 19:33:34 +02:00
Nicolas Lœuillet
392f9a1b9c Merge branch 'dev' into feature/programmingCodeSyntaxHighlighting 2014-07-22 19:32:24 +02:00
Maryana Rozhankivska
9f8541ef2a highlight.js library added to highlight programming code examples in article view 2014-07-22 20:17:15 +03:00
Marc Wilhelm
9c67b1b829 Split up check_setup.php into two files. The new file check_essentials.php takes care of stuff like the PHP version and is executed before the config files are included which are needed by check_setup. This patch addresses issue #773 2014-07-22 11:52:18 +02:00
Nicolas Lœuillet
955fc67438 Merge pull request #775 from wallabag/feature/someMoreSitesConfig 
issue #750 - config for dn.pt site added
 2014-07-21 21:31:45 +02:00
Nicolas Lœuillet
91b6be3186 Merge branch 'skibbipl-dev' into dev 2014-07-21 21:22:34 +02:00
Nicolas Lœuillet
17065e613f Merge branch 'dev' of github.com:skibbipl/wallabag into skibbipl-dev 
Conflicts:
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.mo
	locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po
 2014-07-21 21:21:55 +02:00
skibbipl
cec19bd866 Updated polish translation 2014-07-21 20:58:58 +02:00
Maryana Rozhankivska
5594d7d054 issue #750 - config for dn.pt site added 2014-07-21 19:34:59 +03:00
Nicolas Lœuillet
26452f891f Merge pull request #752 from mariroz/dev 
fix of issue #650, #619 and other similar, error in JSLikeHTMLElement: node no longer exists.
 2014-07-12 19:28:16 +02:00
Nicolas Lœuillet
d14e3f1e22 Merge pull request #754 from sinisterstuf/about.com 
Add support for *.about.com
 2014-07-12 15:10:05 +02:00
Siôn Le Roux
d59536deea Add support for *.about.com 
Includes next_page_link for multi-page articles and strips pesky in-line
'next' links from the article body. Also includes an Xpath for author
but I can't see where this is used in the wallabag UI.

The 'tidy' option is turned off because it messed up bulleted lists.

Tested with psychology.about.com and food.about.com.
 2014-07-11 00:04:24 +02:00
Nicolas Lœuillet
6400371ff9 I removed my previous commit. We have to create a new branch for that. 2014-07-10 13:17:04 +02:00
Maryana Rozhankivska
c1aad6d574 fix of issue #619 and other similar, error in JSLikeHTMLElement: node no longer exists. 2014-07-09 16:56:52 +03:00
Maryana Rozhankivska
cc1ec61b85 fix of issue #619 and other similar, error in JSLikeHTMLElement: node no longer exists. 2014-07-09 16:50:52 +03:00
Nicolas Lœuillet
c710f977b2 new call for having domain name in entry view 2014-07-08 21:57:53 +02:00
Nicolas Lœuillet
5425b0dd82 new fields in database, reading time / date and domain name are stored 2014-07-08 21:46:32 +02:00
Nicolas Lœuillet
4247b37551 Merge pull request #751 from mariroz/dev 
quick fix of issue #750: mulipage content for politico.com/magazine articles
 2014-07-07 21:11:07 +02:00
Maryana Rozhankivska
82980a148b quick fix of issue #750: mulipage content for politico.com/magazine articles 2014-07-07 19:17:55 +03:00
Nicolas Lœuillet
c13aac1bc3 1.7.1 2014-07-05 15:49:40 +02:00
tcitworld
da87848cee new config file, fix for #740 2014-07-01 10:18:44 +02:00
tcitworld
25052a76ca fix for #738 2014-06-30 23:24:46 +02:00
tcitworld
a13ff95777 security check 2014-06-30 22:15:55 +02:00
tcitworld
cdda041a90 Merge pull request #737 from mariroz/dev 
fix of issue #677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters
 2014-06-25 19:33:28 +02:00
Maryana Rozhankivska
6924253423 fix of issue #677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters 2014-06-25 20:00:00 +03:00
tcitworld
69213014d1 Merge pull request #736 from mariroz/dev 
fix of issue #718: Error parsing file imported from Pocket #718
 2014-06-25 18:54:39 +02:00
Maryana Rozhankivska
aa126ba458 fix of issue #718: Error parsing file imported from Pocket #718 2014-06-25 19:34:14 +03:00
tcitworld
c9563378ea Merge pull request #728 from Draky50110/dev 
typo FR après vérif.
 2014-06-12 23:30:53 +02:00
draky50110
ba22fb1cef typo mineure 2014-06-12 23:10:26 +02:00
draky50110
29cd317aff fin de correction typo FR 2014-06-12 22:21:44 +02:00
draky50110
0bf95d865a Revert "Typo FR (suite)" 
This reverts commit 7f186e21e0.

Conflicts:
	locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
	locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po
 2014-06-12 22:16:04 +02:00
draky50110
ae43ec99d9 typo FR 3 2014-06-12 20:32:02 +02:00
draky50110
7f186e21e0 Typo FR (suite) 2014-06-12 18:55:38 +02:00
tcitworld
bca2853ade Merge pull request #724 from Draky50110/dev 
typo FR
 2014-06-12 09:34:05 +02:00
draky50110
97d54f2ac8 typo FR 2014-06-12 01:00:49 +02:00
tcitworld
8142d4b1e6 Merge pull request #722 from tcitworld/dev 
do not output debug while generating epub
 2014-06-07 16:38:39 +02:00
tcit
35d4e27588 up to date 2014-06-07 16:36:57 +02:00
tcit
ec15d0a784 do not debug inside an epub 2014-06-07 15:53:39 +02:00
tcitworld
c93a5c137f Merge pull request #716 from mariroz/dev 
error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config
 2014-06-05 16:59:39 +02:00
Maryana Rozhankivska
752cd4a8ef error reporting level set in E_ALL & ~E_NOTICE by default, can be overriden in config 2014-06-02 18:00:09 +03:00
tcitworld
5d198e2b98 Merge pull request #715 from mariroz/dev 
fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14
 2014-06-01 19:06:45 +02:00
Maryana Rozhankivska
1d14e65315 fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue #14 2014-06-01 19:49:22 +03:00
Nicolas Lœuillet
67a8848aed Merge pull request #713 from mariroz/dev 
small xss vulnerability and translation ability fix
 2014-05-30 16:51:13 +02:00
Maryana Rozhankivska
30bd273580 small xss vulnerability and translation ability fix 2014-05-30 17:17:34 +03:00
Maryana Rozhankivska
cbc75befb5 small xss vulnerability and translation ability fix 2014-05-30 17:14:53 +03:00
Nicolas Lœuillet
8038b38802 1.7, premium version :) 2014-05-29 18:52:34 +02:00
Nicolas Lœuillet
79024eb004 fix #344 FQDN with non-standard ports broken 2014-05-29 18:32:55 +02:00
Nicolas Lœuillet
0c3db64585 Merge pull request #711 from mariroz/dev 
fix of uninitialized object warning, issue #710
 2014-05-29 16:04:26 +02:00
Maryana Rozhankivska
3dc8d84229 fix of uninitialized object warning, issue #710 2014-05-29 16:35:00 +03:00