3476 commits

Author	SHA1	Message	Date
rabuzarus	9189971cb8	display contact information in contact and directory according to the other contact related pages	2015-11-28 02:56:36 +01:00
Michael Vogel	79092f149c	Requests for soapbox and freelove accounts are automatically accepted	2015-11-28 01:03:26 +01:00
Michael Vogel	a9b2b48d08	Some small improvements to the OStatus export	2015-11-27 23:16:54 +01:00
Tobias Diekershoff	5fe8ae514b	Merge pull request #2102 from annando/1511-unseen-forums ... Bugfix: Now the unseen counter for forums work	2015-11-27 22:17:17 +01:00
Michael Vogel	3b6d3d1ade	Merge pull request #2099 from rabuzarus/2611_new_user_addr ... generate addr for new registered users	2015-11-27 21:35:46 +01:00
Michael Vogel	75710df61a	Bugfix: Now the unseen counter works.	2015-11-27 21:18:54 +01:00
Michael Vogel	9c37fc320e	Merge pull request #2095 from rabuzarus/unread_forums ... count unread forum items for forumlist widget (ping.php)	2015-11-27 16:28:21 +01:00
Michael Vogel	b1a9e9b6d4	OStatus: Commented out some "to-do" stuff	2015-11-27 08:09:19 +01:00
Michael Vogel	b45ca80656	Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery	2015-11-27 07:30:03 +01:00
Michael Vogel	fa8b4738ee	Bugfix: There was an endless loop in the probe_url function ...	2015-11-26 21:58:01 +01:00
rabuzarus	620299dc25	include friendica address in hcard	2015-11-26 17:46:38 +01:00
rabuzarus	84ec36d52c	generate addr for new registered users	2015-11-26 14:08:32 +01:00
Michael Vogel	fc250bbc20	Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery	2015-11-26 11:46:58 +01:00
Tobias Diekershoff	e146b42d15	Merge pull request #2098 from annando/1511-self-contact ... Only update contact data for OStatus contacts	2015-11-26 09:59:19 +01:00
Michael Vogel	1203088c3e	Only update contact data for OStatus contacts	2015-11-26 08:26:29 +01:00
Michael Vogel	602821279a	scrape_dfrn now scrapes the address as well.	2015-11-25 18:46:02 +01:00
Michael Vogel	6b5ea74bbd	Deactivated some attachment part in the old functions	2015-11-25 08:28:17 +01:00
rabuzarus	bc61d76b56	forumlist: little doxygen polishing	2015-11-24 22:34:23 +01:00
rabuzarus	ddf3589fc5	count unread forum items for forumlist widget (ping.php)	2015-11-24 22:14:26 +01:00
Michael Vogel	034f573374	Bugfix: Bookmarks doesn't federate well.	2015-11-24 21:03:06 +01:00
Michael Vogel	3b101c9d98	Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery	2015-11-24 09:38:46 +01:00
root	c73d961198	Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop	2015-11-24 02:56:35 +01:00
root	2c89a43286	Test	2015-11-24 02:49:29 +01:00
Michael Vogel	7d7e2e74f4	The generated XML is now valid and it seems to work.	2015-11-23 23:49:14 +01:00
Michael Vogel	64b3881e73	API: Show the remote profile so that AndStatus uses the correct webfinger address	2015-11-23 19:16:27 +01:00
Michael Vogel	75f1a17f7e	New function for creating the OStatus messages	2015-11-23 18:44:47 +01:00
Michael Vogel	6d2a9e44a7	API: Improvements for fetching the nick name	2015-11-23 18:42:45 +01:00
Michael Vogel	37f466d16e	Prevention of endless loops in the conversation	2015-11-18 23:57:53 +01:00
Michael Vogel	41fe07e128	Merge remote-tracking branch 'upstream/develop' into 1511-forumlist-fix	2015-11-17 21:34:01 +01:00
Michael Vogel	cd059aa68f	Some SQL fixes	2015-11-17 20:31:40 +01:00
fabrixxm	d1319d97a2	Merge pull request #2081 from annando/1511-avatar-fix ... The own avatar was (sometimes?) changed back when it was changed	2015-11-17 09:13:08 +01:00
Michael Vogel	e43c7a4447	Merge pull request #2061 from rabuzarus/0711_forumlist ... move forumlist addon to core	2015-11-17 08:46:15 +01:00
Michael Vogel	b53ae0d42a	Bugfix: The own avatar was (sometimes?) changed back when it was changed.	2015-11-17 08:39:09 +01:00
Michael Vogel	e1774acbde	Bugfix: Avoid error messages because of an already used function	2015-11-13 23:55:01 +01:00
rabuzarus	cec5afe2c9	forumlist: don't raise db version in dbstructure.php	2015-11-13 23:49:37 +01:00
Tobias Diekershoff	a552845d8f	Merge pull request #2072 from fabrixxm/issue_2066 ... Remove anonymous function, 5.2 is still minimal requirement	2015-11-13 12:51:17 +01:00
Tobias Diekershoff	009b3364e5	Merge pull request #2074 from fabrixxm/issue_2071 ... Use static css in install procedure	2015-11-13 12:50:41 +01:00
Fabrixxm	6605e30cf2	pass to all templates by default	2015-11-13 10:56:37 +01:00
Michael Vogel	6ddf62bdf7	Merge remote-tracking branch 'upstream/develop' into 1511-avatar	2015-11-13 09:48:34 +01:00
Michael Vogel	c951123b76	Cleaned code	2015-11-13 09:45:15 +01:00
Fabrixxm	fa4ee05312	Remove anonymous function, 5.2 is still minimal requirement	2015-11-13 09:36:22 +01:00
fabrixxm	98f524db67	Merge pull request #2067 from annando/1511-optimize-sql ... Optimized SQL queries to reduce the amount of write operations	2015-11-13 09:16:52 +01:00
Michael Vogel	11905c0bec	The avatar picture wasn't updated at the contact table	2015-11-13 08:45:14 +01:00
rabuzarus	86e720c99d	forumlist: some more doxygen for plugin.php	2015-11-13 00:33:32 +01:00
Michael Vogel	1ea82ea355	Only allow non top level posts to soap boxes	2015-11-12 21:55:33 +01:00
Michael Vogel	3648094927	Local delivery of comments to soap boxes are working now	2015-11-12 21:43:42 +01:00
Michael Vogel	c95afa525e	Some SQL queries were optimized to reduce the amount of write operations.	2015-11-12 08:59:29 +01:00
rabuzarus	902735f6d4	forumlist: dbupdate	2015-11-11 23:39:14 +01:00
rabuzarus	862ccb95d2	forumlist: doxygen corrections	2015-11-11 22:41:44 +01:00
rabuzarus	7bba9c783f	forumlist: function get_feature_default()	2015-11-11 22:36:14 +01:00
rabuzarus	215205d376	forumlist: nodeinfo_plugin_enabled() is now plugin_enabled()	2015-11-11 21:31:26 +01:00
rabuzarus	dac6f39f41	forumlist: use a more unique identifier	2015-11-11 01:29:31 +01:00
rabuzarus	a67710bc7c	forumlist: some little code unification	2015-11-10 20:31:13 +01:00
rabuzarus	dd58a713d8	forumlist: move include to header	2015-11-10 19:23:45 +01:00
rabuzarus	96b764425e	move forumlist addon to core	2015-11-09 15:56:20 +01:00
Michael Vogel	1c5eaa646c	Only show valid contacts on the group side	2015-11-08 16:41:00 +01:00
Tobias Diekershoff	d9e56e0450	Merge pull request #2047 from annando/1511-ostatus-warning ... This is a bugfix for pull request 2040	2015-11-08 15:43:53 +01:00
Michael Vogel	ea0397b676	This is a bugfix for pull request 2040	2015-11-08 15:32:16 +01:00
Tobias Diekershoff	c0e87b2bea	Merge pull request #2045 from annando/1511-dirfind-addr ... You can now discover previously unknown users via the dirsearch	2015-11-08 15:19:11 +01:00
Michael Vogel	e12b0d27bb	You can now search for @username@domain.tld in dirfind and the search will resolve that.	2015-11-08 14:48:47 +01:00
fabrixxm	ae9c9829fa	Remove language selectors from themes ... This is now a user setting	2015-11-08 14:42:54 +01:00
fabrixxm	fb3ac68cc0	Add user language in settings, use that field as language for UI	2015-11-08 14:23:49 +01:00
Michael Vogel	27b166caf6	Bugfix for not working pagination in GNU Social	2015-11-08 11:10:20 +01:00
Tobias Diekershoff	294b4ecf5e	Merge pull request #2034 from fabrixxm/issue_1986 ... fix the contact photo menu	2015-11-07 20:29:20 +01:00
fabrixxm	35302d4274	fix the contact photo menu ... fix "should open a new tab" attribute fix javascript deletion dialog (fix #1986)	2015-11-07 18:25:35 +01:00
fabrixxm	d5a32ef214	cron: move update_suggestions in separated thread ... Move the call in discover_poco.php. This should fix expiration and other cron related issues	2015-11-07 17:52:52 +01:00
Michael Vogel	88e1ac9654	API Bugfix: This fixes the problem that posts to AndStatus appeared as empty posts	2015-11-07 14:36:00 +01:00
fabrixxm	80b62071e1	Use old style array declaration	2015-11-07 12:21:54 +01:00
fabrixxm	0aa69f134f	Fix template_var hook ... move it to smarty3 replate_macro, pass the theme name in $b	2015-11-06 19:52:00 +01:00
fabrixxm	545a7a80e4	Add 'template_vars' hook	2015-11-06 19:33:14 +01:00
Michael Vogel	0f563525bd	Optical adjustments for contacts/set "last_failure" when inaccessible	2015-11-06 09:15:20 +01:00
Michael Vogel	f42a3c9bc6	Update the contact table as well.	2015-11-06 01:19:37 +01:00
Michael Vogel	0f41f35041	The contact template now displays the address if available	2015-11-06 00:47:54 +01:00
Michael Vogel	2e81d0a2b3	Fetch the "addr" value whenever it is empty	2015-11-05 10:55:00 +01:00
Michael Vogel	d6080f4c76	The "addr" field is now in the global contacts as well.	2015-11-05 08:37:00 +01:00
Michael Vogel	a193a482cd	Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts	2015-11-05 00:42:38 +01:00
Michael Vogel	3b11436b02	Merge pull request #1989 from rabuzarus/allfriends ... template-rework: let common friends and allfriends use viewcontact_te…	2015-11-03 23:27:24 +01:00
rabuzarus	e785759a8b	template-rework:make use of get_contact_details_by_url()	2015-11-03 14:31:15 +01:00
Michael Vogel	6a15dded0e	Bugfix: The timeout value of z_fetch_url couldn't be set manually	2015-11-03 00:48:49 +01:00
Michael Vogel	b87d7ef1af	Return the contact id at "all_friends" and "common_contacts"	2015-11-01 08:54:44 +01:00
Michael Vogel	09ff2f0dd5	Renamed the function	2015-10-31 00:01:33 +01:00
Michael Vogel	f3ce812a9e	New function for fetching contact data	2015-10-30 01:30:42 +01:00
Tobias Diekershoff	bb4efb01a7	Merge pull request #1980 from annando/1510-coord-ostatus ... OStatus: send the coordinates in an additional field	2015-10-25 16:53:17 +01:00
Tobias Diekershoff	12d9c46ec5	Merge pull request #1979 from annando/1510-gnusocial ... Statusnet is now GNU Social	2015-10-25 16:52:38 +01:00
Tobias Diekershoff	4e78d439e2	Merge pull request #1978 from annando/1510-bad-servers ... Workaround for bad configured servers	2015-10-25 16:52:10 +01:00
Michael Vogel	c7205ea705	Bugfix: Authorization at ejabberd only worked for uid=1	2015-10-25 10:17:23 +01:00
Michael Vogel	a11833e248	Statusnet is now GNU Social	2015-10-24 20:44:18 +02:00
Michael Vogel	ecf65e52ee	OStatus: send the coordinates in an additional field	2015-10-24 20:42:47 +02:00
Michael Vogel	ddc8f069f2	Workaround for bad configured servers	2015-10-24 20:41:21 +02:00
Michael Vogel	891ad5b39d	Support for additional passwords for ejabberd	2015-10-19 19:03:11 +02:00
Tobias Diekershoff	ddaacc1e53	Merge pull request #1965 from rabuzarus/event-attendance ... fix translation bug for likers	2015-10-17 12:51:19 +02:00
Michael Vogel	8a79e1afb3	The datepicker is now localised	2015-10-17 10:48:13 +02:00
Michael Vogel	8395f67351	Events on Diaspora now looking okay.	2015-10-17 09:41:58 +02:00
Michael Vogel	485e65871e	Avoid wrong birthdays	2015-10-17 02:36:16 +02:00
Michael Vogel	7f9711ffe6	Delete event when the item is deleted	2015-10-17 01:25:25 +02:00
Michael Vogel	dd46a6ff68	Store the event when a summary or a description is set	2015-10-17 00:58:22 +02:00
Michael Vogel	fcc185a182	Unsure to store the guid with new events	2015-10-16 23:50:34 +02:00
rabuzarus	642f3fca1a	fix translation bug for likers	2015-10-14 19:48:57 +02:00
Michael Vogel	65228e37bb	Avoid a warning when a feed contains no items.	2015-10-14 08:10:06 +02:00
Tobias Diekershoff	ce03ccc95c	Merge pull request #1929 from rabuzarus/event-attendance ... port of reds event attendance feature	2015-10-12 15:10:03 +02:00
Michael Vogel	a58be37930	Merge pull request #1943 from tobiasd/20151007-adminname ... personalise emails send from the server	2015-10-12 07:50:40 +02:00
rabuzarus	5c2923869a	this got lost by merge	2015-10-11 20:00:54 +02:00
rabuzarus	649578ae33	Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php	2015-10-11 19:39:55 +02:00
rabuzarus	a539455d81	correct a little mistake (delivery.php was not commited)	2015-10-11 18:20:06 +02:00
rabuzarus	6f04c57ed3	correct a little mistake (ACTIVITY_LIKE is supported)	2015-10-11 15:34:56 +02:00
rabuzarus	0b36b09823	don't send attendance activities to diaspora (unsupported)	2015-10-11 13:07:19 +02:00
Michael Vogel	48309a25ec	Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu ... Conflicts: include/conversation.php	2015-10-11 05:11:46 +02:00
Tobias Diekershoff	27fa20ab22	Merge pull request #1947 from annando/1510-diaspora-follower ... Reworked contact relations between Diaspora and Friendica	2015-10-10 18:50:20 +02:00
Tobias Diekershoff	9e2b62b082	Merge pull request #1948 from annando/1510-more-escaping ... Handling contact names with > and <	2015-10-10 18:48:20 +02:00
Michael Vogel	bb0dff2c75	Improved contact menu	2015-10-10 16:23:20 +02:00
Michael Vogel	ba06d659f1	Bugfix: Feeds weren't imported if a post with the same URI existed.	2015-10-10 14:26:07 +02:00
Michael Vogel	efbdb57f92	Reworked contact relations between Friendica and Diaspora	2015-10-10 11:06:18 +02:00
Michael Vogel	1c21401751	acl lookup now works fine as well.	2015-10-09 23:27:00 +02:00
rabuzarus	0eae67ea48	update attendance state on profile wall	2015-10-09 14:20:01 +02:00
Michael Vogel	16da708e07	Contact names with ">" and "<" are a problem ...	2015-10-09 07:39:38 +02:00
rabuzarus	ba1207e6e1	translate attendance with localize_item()	2015-10-08 22:23:09 +02:00
rabuzarus	d2d084b814	treat attendance as like activity	2015-10-08 18:35:33 +02:00
Michael Vogel	61c3ce7a21	Bugfix: The contact names had to be escaped	2015-10-08 00:25:55 +02:00
Michael Vogel	1f0b759e2f	Added resize possibility to proxy function	2015-10-07 08:25:10 +02:00
Tobias Diekershoff	dd9f475ff6	personalise emails send from the server	2015-10-07 06:22:15 +02:00
Michael Vogel	7ed61b2edc	Removed "proxy_parse_html" since it is now done in the bbcode function.	2015-10-05 22:25:14 +02:00
Michael Vogel	2676a0f0e5	The proxy function sometimes kills embedded pictures ...	2015-10-05 22:19:34 +02:00
Michael Vogel	133d38be20	Rearranged the contact menu so that it fits the menu at the conversations.	2015-10-05 00:19:58 +02:00
Michael Vogel	caa9073a8f	Remove all menu entries on the contact list that are empty	2015-10-05 00:14:39 +02:00
Michael Vogel	a663e4693f	Further improvement of the contact menu	2015-10-04 23:41:13 +02:00
Michael Vogel	b037f977fa	The contact menu is now improved (for example a "Follow" link)	2015-10-04 21:17:28 +02:00
Tobias Diekershoff	be70dde61f	Merge pull request #1928 from annando/issue-1913 ... Issue 1913: Report invalid feed	2015-10-04 08:54:59 +02:00
Tobias Diekershoff	5d6f02da41	Merge pull request #1927 from annando/issue-1914 ... Issue 1914: A feed was falsely detected as OStatus	2015-10-04 08:54:01 +02:00
Tobias Diekershoff	05b2836d66	Merge pull request #1926 from annando/1510-permit-crawler ... New option to permit crawlers	2015-10-04 08:53:32 +02:00
Tobias Diekershoff	a3221945d0	Merge pull request #1923 from annando/1510-feed-remote-self ... Bugfix: Remote self hadn't worked anymore since the new feed import	2015-10-04 08:51:58 +02:00
Michael Vogel	c0e277cec8	Issue 1913: Report invalid feed	2015-10-04 00:28:15 +02:00
Michael Vogel	4e1bffd0a9	Issue 1914: A feed was falsely detected as OStatus	2015-10-03 23:57:00 +02:00
Michael Vogel	2840bf2293	New option to permit crawlers	2015-10-03 23:16:40 +02:00
rabuzarus	c775d6885b	port of reds geotag feature	2015-10-03 20:24:35 +02:00
Michael Vogel	f92a253946	Bugfix: Remote self worked anymore	2015-10-03 13:58:10 +02:00
Michael Vogel	68a6f0298e	The events moved from the profile to the navigation bar - for supported themes	2015-09-30 18:50:44 +02:00
rabuzarus	7cb4ea52fd	port of the event attendance feature of red matrix with example implementation for vier theme.	2015-09-30 16:58:02 +02:00
rabuzarus	2ff67ef5ed	fixes like/dislike for photos	2015-09-30 14:39:00 +02:00
rabuzarus	f5c7006f30	rest of the consensus porting work and integration into friendica ... Credits to Mike Macgirvin for the code	2015-09-30 14:38:13 +02:00
rabuzarus	0077494396	make event confirmation work	2015-09-30 14:35:17 +02:00
rabuzarus	37fccee503	first work for consensus	2015-09-30 14:34:10 +02:00
fabrixxm	67638118e7	Merge pull request #1912 from annando/1509-worker ... New way of background processing	2015-09-30 08:56:54 +02:00
fabrixxm	2e9e17baad	Merge pull request #1911 from annando/1509-i18n-events ... Localisation of the event page	2015-09-30 08:46:57 +02:00
Michael Vogel	6e981ed798	Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events	2015-09-29 10:35:50 +02:00
Michael Vogel	abe31d7e60	Merge remote-tracking branch 'upstream/develop' into 1509-new-feed-import	2015-09-29 10:27:04 +02:00
Michael Vogel	5d5d85eb4a	Merge remote-tracking branch 'upstream/develop' into 1509-worker	2015-09-29 10:25:59 +02:00
Fabrixxm	880dda4257	Merge branch 'master' back into develop	2015-09-29 10:00:13 +02:00
Michael Vogel	c3ee255b0c	Reduction of double executions - hopefully	2015-09-29 06:15:26 +02:00
Michael Vogel	ed8cdc7d85	Logging message added	2015-09-28 22:32:56 +02:00
Michael Vogel	f0cf9ce519	Prevent double execution	2015-09-28 21:58:58 +02:00