MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
10618 commits 3 branches 0 tags 96 MiB
Commit graph

10618 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Diekershoff 32a21bb02b regeneration of the messages.po file for attendance translation 2015-10-12 15:15:39 +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
Tobias Diekershoff 456e078021 Merge pull request #1952 from annando/1510-ifttt 
Vier: Support for the new IFTTT addon
 2015-10-12 08:18:11 +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
Michael Vogel adba75600a Vier: Support for the new IFTTT addon. 2015-10-11 23:36:23 +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 db7dca3d5f Merge event-attendance into develop 
Conflicts:
	include/conversation.php
 2015-10-11 19:28:54 +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 78b8a081f3 Merge pull request #1951 from tobiasd/20151011-messagespo 
regenerated messages.po file
 2015-10-11 12:01:46 +02:00
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
rabuzarus 0eae67ea48 update attendance state on profile wall 2015-10-09 14:20:01 +02:00
rabuzarus d85d215bb8 attendance update in network stream 2015-10-09 13:46:08 +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 6a9ec14878 small bugfix in like.php 2015-10-08 20:26:11 +02:00
rabuzarus d2d084b814 treat attendance as like activity 2015-10-08 18:35:33 +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
Tobias Diekershoff d808888429 added some lines to the htconfig config variables 2015-10-07 09:38:47 +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 dd9f475ff6 personalise emails send from the server 2015-10-07 06:22:15 +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