9698 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	ac3a4824df	Check for hashtags when storing them and eventually adding hashtag links	2015-03-01 17:33:55 +01:00
Michael Vogel	5cb6d6e537	We have to disable the SSL checks, otherwise the communication will fail for servers with self-signed certificates	2015-03-01 10:53:49 +01:00
Tobias Diekershoff	20208acb23	Merge pull request #1417 from annando/1502-improved-markdown ... Updated libraries for Markdown and mobile detection	2015-02-28 08:17:22 +01:00
Tobias Diekershoff	f1b0258fdd	Merge pull request #1415 from annando/1502-like-no-update-commented ... New Global setting: like shouldn't set "commented"	2015-02-28 08:15:12 +01:00
Michael Vogel	b827824faf	Trying to avoid parser problems.	2015-02-24 20:39:02 +01:00
Michael Vogel	59fa1c9453	New version of the library for the detection of mobiles.	2015-02-24 11:26:52 +01:00
Michael Vogel	5c94a2420a	Removed old library	2015-02-24 11:08:23 +01:00
Michael Vogel	671a36682a	Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown	2015-02-24 10:24:07 +01:00
Michael Vogel	d4b0a9ea2a	Solving parsing problems with the markdown library and html elements.	2015-02-24 10:21:09 +01:00
Fabrixxm	caa21e6021	Merge branch 'master' into develop	2015-02-24 09:09:02 +01:00
Fabrixxm	86b41eec77	Merge branch 'release-3.3.3'	2015-02-24 09:03:21 +01:00
Fabrixxm	6a5bb80c82	Friendica 3.3.3 ... See CHANGELOG	2015-02-24 09:00:37 +01:00
Michael Vogel	fcaf71691f	Diaspora: Bugfix for the hashtag detection of incoming posts	2015-02-24 00:12:30 +01:00
Michael Vogel	e0d3594933	Added the markdown parser to the time measurement system	2015-02-24 00:08:17 +01:00
Michael Vogel	17bd46793e	Some fixes for the Markdown converter especially for Libertree.	2015-02-24 00:05:50 +01:00
Michael Vogel	25eb323d69	Removed the last traces of the old Markdown library	2015-02-23 23:56:44 +01:00
Michael Vogel	9812a41bbf	Merge pull request #1414 from ddorian1/release-3.3.3 ... fix validate_email()	2015-02-23 21:09:44 +01:00
Michael Vogel	884b8b03db	Cleaned up the Markdown files.	2015-02-23 12:47:57 +01:00
Michael Vogel	440e2d82b1	Global setting for the behaviour of likes.	2015-02-23 12:44:50 +01:00
Michael Vogel	6504568f2e	Merge remote-tracking branch 'upstream/develop' into 1502-like-no-update-commented	2015-02-23 12:35:22 +01:00
Michael Vogel	72cfb86773	Merge remote-tracking branch 'upstream/develop' into 1502-improved-markdown	2015-02-23 12:34:32 +01:00
Johannes Schwab	1cd1f7587c	fix validate_email	2015-02-23 12:20:05 +01:00
fabrixxm	eb1f21d1e5	Merge pull request #1412 from annando/1502-vier-plus-default ... "plus" is now the default style at "vier" for new installations	2015-02-23 08:51:31 +01:00
fabrixxm	d4b092cec6	Merge pull request #1356 from silke/develop ... Added help text as requested in #1349.	2015-02-23 08:51:02 +01:00
fabrixxm	d610445563	Merge pull request #1413 from annando/1502-more-contact-options ... Show the profile visibility only for Friendica contacts	2015-02-23 08:49:34 +01:00
Michael Vogel	b710c8bbfd	Tests with new markdown library	2015-02-23 08:27:35 +01:00
Michael Vogel	70615d7f78	New versions.	2015-02-22 20:26:56 +01:00
Michael Vogel	4a6a6ca937	Bugfix for spaces in links	2015-02-22 20:06:13 +01:00
Michael Vogel	2f46675a89	New routines for markdown to html and html to markdown.	2015-02-22 17:38:28 +01:00
Michael Vogel	9eeff0d891	Received "likes" and "dislikes" don't update the "commented" value anymore.	2015-02-22 17:34:04 +01:00
Michael Vogel	f3cc065e66	Show the profile visibility only for Friendica contacts.	2015-02-21 20:03:02 +01:00
Michael Vogel	19af382ffb	"plus" is now the default style at "vier" for new installations	2015-02-21 09:44:13 +01:00
Tobias Diekershoff	c8a1057300	Merge pull request #1411 from annando/1502-contact-management ... Only show the options that fit to the current network	2015-02-21 08:21:40 +01:00
Michael Vogel	8179f2f65e	Only show the relation on native networks.	2015-02-20 23:56:41 +01:00
Michael Vogel	1dc961713d	Bugfix: If "all" is selected then no contacts were shown.	2015-02-20 23:33:21 +01:00
Michael Vogel	a8a37a35db	Only show the options that fit to the current network.	2015-02-20 23:12:04 +01:00
Tobias Diekershoff	d026df3240	Merge pull request #1410 from annando/1502-poller-issues ... Solving poller issues	2015-02-20 07:49:58 +01:00
Michael Vogel	7e42315d9c	Merge pull request #1408 from tobiasd/issue885 ... decreasing bubble display time in themes from 10s to 5s	2015-02-19 23:02:55 +01:00
Michael Vogel	dfdb804323	Beautified the poller logging	2015-02-19 22:38:02 +01:00
Michael Vogel	ab5bf06873	Restructured and simplified the poller check	2015-02-19 22:30:16 +01:00
Michael Vogel	68c9707221	The poller now always respects the priority setting for feeds.	2015-02-19 22:04:05 +01:00
Michael Vogel	4c901e60cc	More logging for the poller. Changed the query for the contacts to reduce the amount of contacts	2015-02-19 21:36:29 +01:00
Tobias Diekershoff	985d771b13	decreasing bubble display time in themes from 10s to 5s	2015-02-19 21:24:09 +01:00
Tobias Diekershoff	1a52a238a0	Merge pull request #1407 from annando/1502-poller ... The poller can now be called even inside the "include" directory	2015-02-19 10:54:33 +01:00
Michael Vogel	6d8c126179	Do the directory change only when it is needed.	2015-02-19 10:45:46 +01:00
Michael Vogel	96c642661e	The poller can now be called even inside the "include" directory.	2015-02-19 10:26:49 +01:00
Tobias Diekershoff	3ae4fcc71a	Merge pull request #1406 from annando/1502-scrape-last-item ... scrape/noscrape now contains the date the profile was last updated	2015-02-19 09:27:12 +01:00
Tobias Diekershoff	29bd6c9853	Merge pull request #1403 from annando/issue-1228 ... Issue 1228: Pictures aren't sent via API in comments.	2015-02-19 09:25:41 +01:00
Michael Vogel	4a1105ede6	scrape/noscrape now contains the date the profile was last updated or the last message was sent.	2015-02-18 23:40:46 +01:00
Fabrixxm	b7a50a24c7	Merge branch 'release-3.3.3' into develop	2015-02-18 08:38:06 +01:00