715 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicolas Lœuillet	a7048bc45d	Merge pull request #567 from mariroz/fix-session-livetime ... fix of #115 - stay connected and session livetime	2014-03-17 21:49:42 +01:00
Maryana Rozhankivska	eb5b677250	fix of #115 - stay connected and session livetime	2014-03-17 22:22:05 +02:00
Nicolas Lœuillet	897b2b5302	Merge pull request #566 from camporez/dev ... Update brazilian traslation title to "Português (Brasil)"	2014-03-17 08:09:18 +01:00
camporez	5805ac4574	Update brazilian traslation title to "Português (Brasil)"	2014-03-16 16:43:46 -03:00
Nicolas Lœuillet	07e028fe5c	Merge pull request #563 from camporez/dev ... Update brazilian translation	2014-03-16 18:55:59 +01:00
camporez	08dde123b1	Correct README.md	2014-03-16 11:58:16 -03:00
camporez	82cff5af70	Update brazilian translation	2014-03-15 17:23:34 -03:00
camporez	8754bd88a5	Merge remote-tracking branches 'upstream/dev' and 'origin/master' into dev	2014-03-15 15:03:26 -03:00
camporez	6a915551ab	acc	2014-03-14 14:15:26 -03:00
Nicolas Lœuillet	ed02e38e1d	[fix] in RSS, link to original article	2014-03-14 09:35:48 +01:00
Nicolas Lœuillet	8d7cd2ccd5	[add] remove import file in CACHE when import is over	2014-03-14 08:54:44 +01:00
Nicolas Lœuillet	c0586a906c	[fix] new import section in old themes #559	2014-03-14 08:37:40 +01:00
Nicolas Lœuillet	181d16fe22	Merge pull request #557 from mariroz/feature-add-link-inside-article-issue-505 ... saving link form now sends ajax request, article view is now justified (issue #554)	2014-03-13 20:57:22 +01:00
Maryana Rozhankivska	3ee27ee6ba	saving link form now sends ajax request, article view is now justified	2014-03-13 18:37:08 +02:00
Maryana Rozhankivska	6775da70a8	feature #505 - it is now possible to add link from bagged article (TODO: redev it to ajax action). Some enhancements to "save a link" popup div	2014-03-12 17:36:04 +02:00
Nicolas Lœuillet	f7382cd8c3	Merge pull request #549 from mariroz/fix-tagform-and-shortcat-toggle-savelinkform-conflict ... fix of conflict of s shortcat and entering s in input fields	2014-03-12 12:55:48 +01:00
Maryana Rozhankivska	7339b0b08d	fix of conflict of s shortcat and entering s in input fields	2014-03-12 13:00:37 +02:00
Nicolas Lœuillet	1acd18510a	Merge pull request #544 from mariroz/feature-tags-autocomplete ... a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542	2014-03-10 18:14:43 +01:00
Maryana Rozhankivska	fb26cc9375	a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to #477, #542	2014-03-10 16:28:47 +02:00
Nicolas Lœuillet	d47a05a9a5	Merge pull request #535 from bobmaerten/clarify-import-process ... Changed config section to clarify import process.	2014-03-10 13:14:26 +01:00
Nicolas Lœuillet	17b2afefad	[fix] test if user_id doesn't exist in feeds generation	2014-03-10 08:10:03 +01:00
Thomas LEBEAU	4744cb0e1d	bagit link + overlay save link + listmode	2014-03-08 13:47:15 +01:00
Bob Maerten	7c6aa8d826	Changed text to clarify import process.	2014-03-07 16:46:46 +01:00
Nicolas Lœuillet	b3f7b7d200	Merge branch 'dev' of https://github.com/wallabag/wallabag into dev	2014-03-07 14:49:46 +01:00
Nicolas Lœuillet	1ab567f6e3	[add] clean content articles in cron	2014-03-07 14:49:36 +01:00
Nicolas Lœuillet	f0d584503f	Merge pull request #533 from mariroz/dev ... fix of #530 - import fail from Poche	2014-03-07 13:59:38 +01:00
Maryana Rozhankivska	042486c511	fix of #530 - import fail from Poche	2014-03-07 14:52:52 +02:00
Nicolas Lœuillet	ded2c63312	Merge pull request #532 from wallabag/upload-file ... New import system	2014-03-07 13:26:56 +01:00
Nicolas Lœuillet	bf79463070	Merge pull request #531 from mariroz/upload-file ... getPageContent moved to Tools, fix of #426	2014-03-07 11:57:11 +01:00
Maryana Rozhankivska	f98373cc34	getPageContent moved to Tools, fix of #426	2014-03-07 12:54:08 +02:00
Nicolas Lœuillet	25114854b3	[fix] remember scroll position for baggy theme #519	2014-03-06 18:57:04 +01:00
Nicolas Lœuillet	4ca17924a1	[fix] links for firefox / android / ios apps	2014-03-06 18:45:15 +01:00
Nicolas Lœuillet	9a010227d7	Merge pull request #524 from kevmeyer/dev ... updated german localization	2014-03-04 12:40:43 +01:00
Kevin Meyer	e1a625ad35	added missing german localization strings	2014-03-04 11:53:40 +01:00
Kevin Meyer	eace9f914d	updated german localization	2014-03-04 11:32:45 +01:00
Nicolas Lœuillet	d3b52886f5	[change] ignore tmp files in HTML purifier	2014-03-02 08:52:03 +01:00
Nicolas Lœuillet	71b0d53c5e	[fix] #115 cookie lifetime was empty	2014-03-02 08:38:26 +01:00
Nicolas Lœuillet	11c680f97a	[add] display last check of wallabag release	2014-03-01 19:10:17 +01:00
Nicolas Lœuillet	223268c2fa	[fix] RSS Feeds don't validate / W3C #384	2014-03-01 13:09:37 +01:00
Nicolas Lœuillet	53e3158dfe	[add] cron to fetch content on imported entries	2014-02-28 21:49:38 +01:00
Nicolas Lœuillet	31a10069a5	[add] upload form for import	2014-02-28 20:36:32 +01:00
Nicolas Lœuillet	4c14936353	road to 1.5.3	2014-02-28 14:57:04 +01:00
Nicolas Lœuillet	2bb207d005	[fix] #483 pdo_sqlite not required if we want mysql / pgsql	2014-02-28 14:54:50 +01:00
Nicolas Lœuillet	d429305836	[fix] #490 flattr icon in baggy theme	2014-02-28 14:27:10 +01:00
Nicolas Lœuillet	49c803425c	Merge branch 'dev' of https://github.com/wallabag/wallabag into dev	2014-02-28 14:06:59 +01:00
Nicolas Lœuillet	cf75bb31e9	Merge pull request #517 from mariroz/dev ... effect of block rebuilding on next page removed, issue #479	2014-02-28 12:17:18 +01:00
Maryana Rozhankivska	fc52df0677	effect of block rebuilding on next page removed, issue #479	2014-02-28 13:13:30 +02:00
Maryana Rozhankivska	6065553c13	effect of block rebuilding on next page removed, issue #479	2014-02-28 13:08:11 +02:00
Nicolas Lœuillet	346380e131	[add] label for brazilian language on config screen	2014-02-27 21:37:25 +01:00
Nicolas Lœuillet	affbd83b48	Merge pull request #515 from mariroz/dev ... fix of #509, related to php 5.3	2014-02-27 21:23:10 +01:00