mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-12 02:36:27 +00:00
Code Issues Projects Releases Wiki Activity
1284 commits 12 branches 100 tags 172 MiB
Commit graph

1284 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
a9f5e572dd Merge pull request #712 from wallabag/dev 
1.7, call me "Premium version"
 2014-05-29 18:54:06 +02: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
Nicolas Lœuillet
87f01ea2e9 Merge pull request #707 from mariroz/dev 
update to 3.2 version of full-text-rss, issue #694
 2014-05-29 12:50:28 +02:00
Maryana Rozhankivska
0b9bb8cb78 add dailymotion videos, issue #708 2014-05-26 14:29:18 +03:00
Maryana Rozhankivska
009669360d fix of onmouseover displaying of wallbabag a link in wallabag form in default theme 2014-05-24 11:21:43 +03:00
Maryana Rozhankivska
a342945b61 fix of rearch form popup in default theme 2014-05-24 11:08:39 +03:00
Maryana Rozhankivska
1fce49fac7 full-text rss config file for ted.com, issue #676 2014-05-23 19:29:01 +03:00
Maryana Rozhankivska
a50583fb97 last 3 important changes to 3.2 version of full-text-rss, issue #694 2014-05-23 19:27:17 +03:00
Maryana Rozhankivska
d18ff7d956 two small unimportant forgotten changes to 3.2 version of full-text-rss, issue #694 2014-05-23 19:25:48 +03:00
Maryana Rozhankivska
3ec62cf95a update to 3.2 version of full-text-rss, issue #694 2014-05-22 17:16:38 +03:00
tcitworld
ab157bbb75 Merge pull request #706 from gboudreau/dev 
Fixed Baggy theme CSS for Chrome Extension (and < 500px width layout)
 2014-05-21 22:13:31 +02:00
Guillaume Boudreau
f61ffec352 Fixed Baggy theme CSS for Chrome Extension (and < 500px width layout) 2014-05-21 15:54:54 -04:00
tcitworld
88f0e31622 Merge pull request #703 from tcitworld/images_security 
Security fixes for downloaded images (thanks @leblanc-simon)
 2014-05-20 11:55:20 +02:00
tcitworld
38eecef26b Added info for DOWNLOAD_PICTURES 
We regenerate pictures, it might take some time
 2014-05-20 11:46:05 +02:00
tcitworld
99408dfcf3 Merge pull request #1 from leblanc-simon/images_security 
Optimisation et gestion des erreurs
 2014-05-20 11:42:22 +02:00
Simon Leblanc
0bf0dfe10d Optimisation et gestion des erreurs 2014-05-20 00:42:51 +02:00
tcit
e3b00bcaf5 Fixed bug for png images 2014-05-19 15:59:18 +02:00
tcit
6caba976ec Bug with bracket 2014-05-19 15:34:49 +02:00
tcit
1d6a9ac25a Option for setting quality 2014-05-19 15:24:11 +02:00
tcit
03e501dedd Merge branch 'dev' into images_security 2014-05-19 15:04:09 +02:00
tcit
18209292a4 Fix bad character encoding when downloading images 2014-05-19 15:01:36 +02:00
tcit
007f26e582 Security fix for Download Images 2014-05-18 22:11:56 +02:00
tcitworld
04b43dc097 Merge pull request #697 from tcitworld/dev 
Up-to-date with me
 2014-05-18 19:00:51 +02:00
tcit
becc5bfbf2 Fix for #678 2014-05-18 18:56:20 +02:00
tcitworld
230fa05eb7 Better Grammar 2014-05-17 20:32:38 +02:00
tcitworld
96834a47b0 Added PHPePub 2014-05-16 17:38:19 +02:00
tcit
e212e6b12a Cleaned epub fonction 2014-05-16 16:49:09 +02:00
tcit
404adf970d Merge branch 'epub' into dev 
Conflicts:
	themes/baggy/home.twig
 2014-05-16 16:31:18 +02:00