Nicolas Lœuillet
505a74ad1d
Merge branch 'dev' into refactor
...
Conflicts:
check_setup.php
index.php
2014-07-23 13:42:30 +02:00
Nicolas Lœuillet
a818ff2000
removed permissions test on htmlpurifier
2014-07-23 13:35:19 +02:00
Nicolas Lœuillet
ebd6bf6007
Merge branch 'anno1337-dev' into dev
2014-07-22 21:45:21 +02:00
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
6a4bbf0fe5
Merge branch 'refactor' of github.com:wallabag/wallabag into refactor
2014-07-18 11:29:05 +02:00
Nicolas Lœuillet
8e68391a57
remove .idea in gitignore
2014-07-18 11:28:49 +02:00
Nicolas Lœuillet
93edcab52e
Merge pull request #764 from tcitworld/refactor
...
Refactor Flattr class.
2014-07-17 16:06:53 +02:00
tcitworld
ccd0b381b6
camelCase for FlattrItem class (following)
2014-07-17 15:42:59 +02:00
tcitworld
d259f73665
camelCase for FlattrItem class
2014-07-17 15:34:55 +02:00
Nicolas Lœuillet
4e067ceabd
updated specific configuration for parsing
2014-07-13 10:15:40 +02:00
Nicolas Lœuillet
58dbe10388
#584 check permissions for HTMLPurifier/DefinitionCache/Serializer folder
2014-07-12 22:08:48 +02:00
Nicolas Lœuillet
d423113b00
#683 Rename « home » into « unread »
2014-07-12 21:50:29 +02: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
2f26729c84
Refactor
2014-07-12 19:01:11 +02:00
Nicolas Lœuillet
b6a3c8866a
forgot run() call
2014-07-12 16:41:55 +02:00
Nicolas Lœuillet
d610968932
ignore my PHPStorm config
2014-07-12 16:40:00 +02:00
Nicolas Lœuillet
26b77483ee
remove PicoFarad
...
I’ll implement it an other day.
2014-07-12 16:39:31 +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
Nicolas Lœuillet
b3cda72e93
PicoFarad framework for routing
2014-07-11 17:06:51 +02:00
Nicolas Lœuillet
3602405ec0
WHAT. A. BIG. REFACTOR. + new license (we moved to MIT one)
2014-07-11 16:03:59 +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
2014-06-12 22:16:04 +02:00
draky50110
ae43ec99d9
typo FR 3
2014-06-12 20:32:02 +02:00
