Commit graph

1377 commits

Author SHA1 Message Date
Nicolas Lœuillet
87b723d762 Merge branch 'axelsimon-patch-1' into dev 2015-07-31 13:22:57 +02:00
Nicolas Lœuillet
8201108aa3 fix documentation url 2015-07-31 13:22:26 +02:00
Nicolas Lœuillet
4acde08e3c Merge branch 'patch-1' of https://github.com/axelsimon/wallabag into axelsimon-patch-1 2015-07-31 13:21:28 +02:00
Thomas Citharel
4e8f6a35db Merge pull request #1257 from freddyb/dev-autoclose
Dev autoclose
2015-07-30 13:51:55 +02:00
Frederik B
f104b384b9 Merge branch 'autoclose-postmessage' into dev 2015-07-30 13:50:33 +02:00
Frederik B
a7991b2d4c Send postMessage to opener before autoclose 2015-07-30 13:49:41 +02:00
Thomas Citharel
392a37e56a Merge pull request #1252 from wallabag/securityfix
fix security bug with PHP_AUTH_USER
2015-07-30 12:14:55 +02:00
Thomas Citharel
ef16095d62 Merge pull request #1226 from wallabag/MoriTanosuke-dev
Enable base_url for proxies
2015-07-29 11:43:22 +02:00
Thomas Citharel
a506f5b348 fix security bug with PHP_AUTH_USER 2015-07-28 15:41:21 +02:00
Thomas Citharel
0cb2c31437 remove call to google fonts because privacy ! 2015-07-27 23:57:47 +02:00
Thomas Citharel
2098509cb2 add mark as read and next to keyboard shortcuts 2015-07-27 22:01:19 +02:00
Thomas Citharel
6056aaf076 fix #1237, display a message instead of button when connections are not through https 2015-07-27 21:50:28 +02:00
Axel Simon
89516525ed fix link to documentation
fix link to Save your first article (no capital letters in documentation pages)
2015-07-24 11:33:39 +02:00
Thomas Citharel
66eab89252 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2015-07-19 11:35:17 +02:00
Thomas Citharel
6103f5ff15 fix #1238 (yes, again !) 2015-07-19 11:16:32 +02:00
Thomas Citharel
828d008bed fixed a postgresql-related bug, more database functions secured and add an exception for sqlite at installation 2015-07-18 12:01:26 +02:00
Thomas Citharel
c129374147 fixed bug for #1242 2015-07-17 23:13:56 +02:00
Thomas Citharel
4a746679c8 secure database functions 2015-07-17 22:54:57 +02:00
Thomas Citharel
7473f0cc4a fix #1238
thanks @qwertygc
2015-07-10 11:25:25 +02:00
Thomas Citharel
5a48040f23 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2015-07-08 10:15:00 +02:00
Thomas Citharel
39a9f6c520 new config files 2015-07-08 10:14:52 +02:00
Thomas Citharel
6b45046e3a another siteconfig file 2015-07-08 09:42:11 +02:00
Thomas Citharel
c87c1de262 Merge pull request #1234 from jmlrt/dev
add site config for des-livres-pour-changer-de-vie.fr
2015-07-08 08:25:58 +02:00
jmlrt
a8298d558b add site config for des-livres-pour-changer-de-vie.fr 2015-07-08 07:24:10 +02:00
Thomas Citharel
48a59f05a6 fix saving URL with enter key 2015-07-07 18:29:41 +02:00
Thomas Citharel
105ef359b7 Merge branch 'dev' of https://github.com/wallabag/wallabag into dev 2015-07-07 18:18:32 +02:00
Thomas Citharel
32b916ef84 Revert "[1005] fixing redirection when deleting archived article"
This reverts commit 63fc40ff84.
2015-07-07 18:17:22 +02:00
Thomas Citharel
d0742e803e Merge pull request #1228 from jmlrt/dev
add site_config for cloudacademy.com and cyrille-borne.com
2015-07-06 22:28:55 +02:00
jmlrt
811e18ab6d add site_config for cloudacademy.com and cyrille-borne.com 2015-07-06 22:24:44 +02:00
Thomas Citharel
9d516bc33d added a lot of siteconfig files 2015-07-06 20:08:29 +02:00
Thomas Citharel
fdffaca96a fix #1224 2015-07-06 18:18:11 +02:00
Thomas Citharel
a7be947095 fix #1209 2015-07-06 17:59:09 +02:00
Thomas Citharel
85fb64c207 delete the debug call 2015-06-29 15:57:19 +02:00
Thomas Citharel
984805649e fix BASE_URL 2015-06-29 15:52:55 +02:00
Thomas Citharel
a754e1c3f0 Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanosuke-dev 2015-06-29 15:29:18 +02:00
Thomas Citharel
9786dbf165 deleted the js console logs calls 2015-06-20 11:12:48 +02:00
Thomas Citharel
a85171062a new config file
Taken from https://github.com/ebal/confs/blob/master/wallabag/inc/3rdparty/site_config/standard/n0where.net.txt
2015-06-17 23:24:45 +02:00
Thomas Citharel
21353e4448 Merge branch 'dev' of http://github.com/wallabag/wallabag into dev 2015-06-13 10:34:34 +02:00
Nicolas Lœuillet
3d8d7da614 Merge pull request #1217 from wallabag/fix-#1215
Fix #1215
2015-06-12 06:38:45 +02:00
Thomas Citharel
c57e38595e bring back long lasting session...maybe 2015-06-11 22:58:01 +02:00
Thomas Citharel
98da2bc527 Fix #1215 2015-06-11 22:26:13 +02:00
Carsten Ringe
6e22fc17d2 Use config option BASE_URL in getPocheUrl() 2015-06-09 19:51:01 +02:00
Thomas Citharel
c0d4c895a4 Merge pull request #1211 from goofy-bz/patch-4
Update fr_FR.utf8.po
2015-06-07 01:31:53 +02:00
goofy-bz
4687c44602 Update fr_FR.utf8.po
minor typofix "utilisateur"
2015-06-07 01:22:42 +02:00
Thomas Citharel
c56d1f21e3 Merge pull request #1207 from vpmalley/dev
issue #1203: fixing tag export
2015-06-06 17:02:55 +02:00
Thomas Citharel
22a46267be implemented lots of keyboard shortcuts 2015-06-06 16:39:10 +02:00
Vincent Malley
63fc40ff84 [1005] fixing redirection when deleting archived article 2015-06-02 15:29:44 -04:00
Vincent Malley
900f2a9160 Merge remote-tracking branch 'upstream/dev' into dev 2015-06-02 11:09:37 -04:00
Vincent Malley
f9c8087f78 [1203] fixing tag export 2015-06-02 11:09:28 -04:00
Thomas Citharel
ddbb2308a3 check that URL are real ones before importing them (for instance, avoid bookmarklets) 2015-05-30 18:11:00 +02:00