Commit graph

10442 commits

Author SHA1 Message Date
Tobias Diekershoff 199bcdb7a0 regenerated messages.po file 2015-10-11 10:38:05 +02:00
Tobias Diekershoff aded5e4127 Merge pull request #1950 from annando/1510-contact-menu
Some improvements to the contact menus
2015-10-11 08:53:15 +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
Tobias Diekershoff 0104c33d98 Merge pull request #1949 from annando/1510-feed-duplicates
Bugfix: Feeds weren't imported if a post with the same URI existed.
2015-10-10 18:47:02 +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 ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers 2015-10-10 04:56:40 +02:00
Michael Vogel 1c21401751 acl lookup now works fine as well. 2015-10-09 23:27:00 +02:00
Michael Vogel 16da708e07 Contact names with ">" and "<" are a problem ... 2015-10-09 07:39:38 +02:00
Tobias Diekershoff 26983bafff Merge pull request #1944 from annando/1510-proxy-picture-size
Picture size and bugfix for contact names with "<" and ">"
2015-10-08 08:03:42 +02:00
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 2015-10-08 00:25:55 +02:00
fabrixxm a76aca2c90 Merge pull request #1942 from tobiasd/20151007-IT
IT: update to the strings
2015-10-07 08:37:50 +02:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Tobias Diekershoff b4ec07ab27 IT: update to the strings 2015-10-07 06:20:54 +02:00
Tobias Diekershoff d7d1a09558 Merge pull request #1941 from annando/1510-diaspora-privacy
Reworked contact data fetching on "display" page, bugfix in notifications
2015-10-06 19:02:41 +02:00
Michael Vogel 14e17b944f Reworked fetching of contact data on "display" page 2015-10-06 18:31:08 +02:00
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 2015-10-06 07:41:09 +02:00
Michael Vogel 901b95e935 Hide some profile data if not connected. 2015-10-06 06:56:31 +02:00
Tobias Diekershoff b60cf21f8a Merge pull request #1940 from annando/1510-proxy-problems
Bugfix: The proxy function had problems with embedded pictures
2015-10-06 06:43:20 +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
Tobias Diekershoff e1aa649703 Merge pull request #1939 from annando/issue-1938
Vier: Error when calling the admin settings of "vier" when "vier" is not activated
2015-10-05 19:14:42 +02:00
Michael Vogel 607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. 2015-10-05 17:38:57 +02:00
Tobias Diekershoff 5545008768 Merge pull request #1937 from annando/1510-follow-notifications
Show RedMatrix and use the proxy for the profile pictures
2015-10-05 15:15:52 +02:00
Michael Vogel d3ac3f8490 Added the contact menu to the search as well. 2015-10-05 08:08:59 +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 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Tobias Diekershoff 79391bbb62 Merge pull request #1936 from annando/1510-contact-menu
The contact menu is now improved (for example a "Follow" link)
2015-10-04 21:30:35 +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 e10dc09bbc Merge pull request #1935 from annando/1510-bugfix-repair
Bugfix: Repairing a contact was more like killing the contact ...
2015-10-04 20:10:38 +02:00
Michael Vogel 05ae3d528e A contact that couldn't be resolved is know known as "UNKNOWN" 2015-10-04 19:48:29 +02:00
Michael Vogel 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Tobias Diekershoff 9f68676db6 Merge pull request #1934 from annando/1510-better-notification
Let the notification look more like the follow dialog
2015-10-04 17:49:02 +02:00
Tobias Diekershoff d96a55e803 Merge pull request #1931 from annando/1510-documentation-htconfig
Documentation of .htconfig.php values
2015-10-04 17:46:50 +02:00
Michael Vogel c49a1b1f8d Added explanation how to add a parameter to the .htconfig.pgp 2015-10-04 17:37:08 +02:00
Michael Vogel 8c514307cf For safety reasons include the include 2015-10-04 17:20:47 +02:00
Michael Vogel 4003b9cc5d Let the notification look more like the follow dialog 2015-10-04 17:18:58 +02:00
Tobias Diekershoff e1f3f2bc6c Merge pull request #1933 from annando/1510-follow-more-data
Show more information when following a new contact
2015-10-04 17:02:27 +02:00
Tobias Diekershoff 18e8d0de59 Merge pull request #1932 from annando/1510-vier-2
Small optical changes in "vier"
2015-10-04 17:01:25 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel ba41336099 Preparation for a not found contact. 2015-10-04 14:49:12 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel 1d71dde7ef Beautyfied code. Link to "follow" on community profiles 2015-10-04 14:40:02 +02:00
Michael Vogel 3b18c6cb0c Small optical changes in "vier" 2015-10-04 12:24:00 +02:00
Michael Vogel fd80e75693 Documentation of .htconfig.php values 2015-10-04 12:02:44 +02:00