2348 commits

Author	SHA1	Message	Date
Michael Vogel	58d814b793	issue 1283 - Share-it button support for friendica	2015-01-25 00:10:58 +01:00
Michael Vogel	1f23d691f3	Merge remote-tracking branch 'upstream/develop' into 1501-better-ostatus	2015-01-21 01:30:09 +01:00
Michael Vogel	ed037124b3	Merge pull request #1299 from fabrixxm/optional-text-only-email ... Optional text only email	2015-01-20 23:26:44 +01:00
Michael Vogel	184dcf75a7	Caching for scrape, keywords for remote_self, notifications for addresses that aren't in your contact list.	2015-01-20 22:54:25 +01:00
fabrixxm	816d3f86e7	reword checkbox help text	2015-01-20 22:17:03 +01:00
fabrixxm	b2527039b7	add text-only email option ... add a checkbok to notification settings. if checked, html body is not added to email.	2015-01-20 19:19:58 +01:00
Tobias Diekershoff	3483cd35f8	use HTML5 attributes in the installer wizard	2015-01-16 19:32:31 +01:00
Johannes Schwab	9cb3a4188e	fix network tab urls	2015-01-16 02:25:17 +01:00
Michael Vogel	beaca70126	OStatus: Replies now arrive their target.	2015-01-12 00:14:51 +01:00
Michael Vogel	94fb0305f7	Poco now shows "about" and the location as well.	2015-01-10 00:34:08 +01:00
Michael Vogel	8f1cfac20a	The global contacts now contain the network name so that the suggestions can select between this.	2015-01-08 07:59:20 +01:00
Michael Vogel	46db8575a0	The table "unique_contacts" now has an "about" and "location" field as well.	2015-01-08 01:32:19 +01:00
Michael Vogel	044eaa778f	Markdown is now supported in the location field as well.	2015-01-08 00:13:43 +01:00
Michael Vogel	e7e3857f5c	The "about" section is now run through bbcode.	2015-01-07 18:06:32 +01:00
Michael Vogel	b36d799044	Fetching "location" and "about" from diaspora. Displaying them on the "display" page.	2015-01-07 01:46:13 +01:00
Michael Vogel	16e4e61cc5	Only show contacts from open networks	2015-01-05 22:44:55 +01:00
Michael Vogel	011f5b9cae	Bugfix: Postings disappeared due to a small variable ...	2015-01-05 14:28:17 +01:00
Michael Vogel	47560fc6c7	Merge remote-tracking branch 'upstream/develop' into 1501-enhanced-poco	2015-01-04 21:07:45 +01:00
Michael Vogel	47129c01f8	Check for filesize before trying to fetch site infos.	2015-01-04 20:04:59 +01:00
Michael Vogel	11c82816b3	Poco now returns the last update date as well. This date will be stored in the gcontact table.	2015-01-04 19:19:47 +01:00
fabrixxm	ecc76c6090	Merge pull request #1254 from annando/1409-shadow-items ... Global Community	2014-12-31 18:13:58 +01:00
Rabuzarus	5939a8cea5	revert last commit f59e574, remove some html code	2014-12-26 14:44:48 +01:00
Rabuzarus	f59e574068	removed Pagination	2014-12-26 12:54:23 +01:00
Rabuzarus	cb47fdfcb9	minor change: rel should not be part of the PHP	2014-12-26 03:32:21 +01:00
Rabuzarus	73f9d06e3e	move some html code from photos.php to photo_album.tpl	2014-12-25 16:20:55 +01:00
Michael Vogel	043c406091	Update function for creating the shadow entries.	2014-12-21 21:19:37 +01:00
Michael Vogel	d054ac8d9c	redone the changes I accidentally overwrote ... Me and GIT will never be in love ...	2014-12-21 11:02:31 +01:00
Michael Vogel	bc5c470cac	Fix for issue 1191 - Embedded Youtube video isn't playing when SSL is active	2014-12-14 12:47:16 +01:00
Michael Vogel	086b3e30c6	Clarification for the hidewall property.	2014-12-12 23:03:23 +01:00
Michael Vogel	9124d922e9	In "parse_url" now links with [ or ] are replaced with shortened versions to avoid parsing problems.	2014-12-01 22:54:01 +01:00
Michael Vogel	9a414cc4a0	Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch	2014-11-15 19:21:54 +01:00
Fabrixxm	2fee5966f1	fix #1222	2014-11-10 15:37:52 +01:00
Fabrixxm	84e93602de	small indentation fix	2014-11-10 15:07:35 +01:00
fabrixxm	fd61391e3e	Merge pull request #1221 from annando/1411-default-value-type ... Fix: "not null" fields were not set	2014-11-10 09:57:42 +01:00
Michael Vogel	030784ad35	Fix for issue "Field 'type' doesn't have a default value" in the challenge table.	2014-11-08 20:52:15 +01:00
Michael Vogel	70ba1667e1	It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions.	2014-11-08 00:07:21 +01:00
Michael Vogel	691aa17025	fetch further information: it is now possible to define a blacklist for keywords for "fetch further information"	2014-10-30 00:24:23 +01:00
tobiasd	ec4e3d76bc	Merge pull request #1212 from annando/1410-remote-self ... Remote-Self is now working for Friendica and Diaspora contacts as well	2014-10-29 15:06:21 +01:00
Michael Vogel	59517f6e58	Remote self is now working for diaspora contacts as well.	2014-10-29 01:42:43 +01:00
Michael Vogel	3e57954807	remote-self: Moved the code in a single function and cleaned it up.	2014-10-29 01:05:09 +01:00
Michael Vogel	b1cdaefcb2	Merge branch 'develop' of github.com:annando/friendica into 1410-remote-self	2014-10-27 11:45:39 +01:00
Michael Vogel	2b5372aebe	Forcing all non-SSL requests to SSL requests is now an option.	2014-10-26 22:15:12 +01:00
fabrixxm	4c66a3486a	Merge pull request #1207 from annando/1410-remote-self-with-keywords ... remote self: There is now an option if the keyswords should be used as tags or not	2014-10-24 10:55:22 +02:00
Michael Vogel	c77a63fb27	remote self: There is now an option if the keyswords should be used as tags or not.	2014-10-24 01:37:33 +02:00
Michael Vogel	26c82f210e	Merge pull request #1198 from fabrixxm/issues/1190 ... Issues/1190	2014-10-23 22:29:50 +02:00
Fabrixxm	f7cf72e450	fix use of $->query_string	2014-10-22 09:32:24 +02:00
Fabrixxm	63168905ec	Fix #1190	2014-10-22 09:04:32 +02:00
Michael Vogel	f6522658f6	Using "remote self" to synchronize Frandiaca accounts	2014-10-22 08:30:16 +02:00
fabrixxm	9d6bcd2572	Merge pull request #1195 from annando/1410-new-hook-getsiteinfo ... New hook "getsiteinfo" and "page_info_data"	2014-10-22 08:18:42 +02:00
Michael Vogel	97ec2787c6	New feature: Storing the field "extid" is now possible	2014-10-20 08:21:23 +02:00