556 commits

Author	SHA1	Message	Date
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	6056aaf076	fix #1237, display a message instead of button when connections are not through https	2015-07-27 21:50:28 +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	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
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	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
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
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
Thomas Citharel	3a690fad55	declare function correctly	2015-05-25 20:44:22 +02:00
Thomas Citharel	f0a819a968	added commentsand fixed something forgotten	2015-05-22 20:09:23 +02:00
Thomas Citharel	d31766300a	added Firefox-bookmarks format import mode	2015-05-22 19:29:12 +02:00
Nicolas Lœuillet	2c83940270	fix restart of import	2015-05-19 21:11:19 +02:00
Thomas Citharel	7f8f8271e4	redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring	2015-03-14 00:22:11 +01:00
Thomas Citharel	f5618feb73	fix #1154	2015-03-13 23:33:49 +01:00
Thomas Citharel	ae27d0ffca	fix little problems and bring previous features to all themes	2015-03-13 17:08:14 +01:00
Thomas Citharel	f76dab12c9	fix for #1153, a couple of improvements and fixed bugs	2015-03-13 16:49:20 +01:00
Thomas Citharel	ab87a7fe69	tag cloud is present, #1122 is implemented	2015-03-08 14:47:22 +01:00
Thomas Citharel	512ff18015	implement #1122	2015-03-08 02:36:37 +01:00
Thomas Citharel	5e10eee8fc	Merge branch 'dev' of github.com:wallabag/wallabag into dev	2015-03-08 00:23:10 +01:00
Thomas Citharel	8a66458ba2	mark read and go to next now in the right direction	2015-03-08 00:22:47 +01:00
Thomas Citharel	3b21caa261	remove unnecessary lines (again)	2015-03-07 13:48:40 +01:00
Thomas Citharel	00483a1e0e	remove unnecessary line	2015-03-07 13:44:47 +01:00
Thomas Citharel	e9540cad02	autoclose was not declared	2015-03-07 13:39:16 +01:00
Thomas Citharel	059a338034	implement #1123	2015-03-02 00:15:49 +01:00
Thomas Citharel	6269df8df9	fix pdf being saved at root, now in cache/ folder	2015-03-01 20:36:10 +01:00