10469 Commits (da8c81a12e65d8ba5386a9eb6e35b2ce04a84a35)
 

Author SHA1 Message Date
Tobias Diekershoff da8c81a12e cleanup forgotten lines 6 years ago
Tobias Diekershoff 3debdf0a91 attend functionality for quattro theme (part of #1953) 6 years ago
Tobias Diekershoff ce03ccc95c Merge pull request #1929 from rabuzarus/event-attendance 6 years ago
Tobias Diekershoff 456e078021 Merge pull request #1952 from annando/1510-ifttt 6 years ago
Michael Vogel a58be37930 Merge pull request #1943 from tobiasd/20151007-adminname 6 years ago
Michael Vogel adba75600a Vier: Support for the new IFTTT addon. 6 years ago
rabuzarus 5c2923869a this got lost by merge 6 years ago
rabuzarus 649578ae33 Merge develop-new into event-attendance-new 6 years ago
rabuzarus db7dca3d5f Merge event-attendance into develop 6 years ago
rabuzarus a539455d81 correct a little mistake (delivery.php was not commited) 6 years ago
rabuzarus 6f04c57ed3 correct a little mistake (ACTIVITY_LIKE is supported) 6 years ago
rabuzarus 0b36b09823 don't send attendance activities to diaspora (unsupported) 6 years ago
Michael Vogel 78b8a081f3 Merge pull request #1951 from tobiasd/20151011-messagespo 6 years ago
Tobias Diekershoff 199bcdb7a0 regenerated messages.po file 6 years ago
Tobias Diekershoff aded5e4127 Merge pull request #1950 from annando/1510-contact-menu 6 years ago
Michael Vogel 48309a25ec Merge remote-tracking branch 'upstream/develop' into 1510-contact-menu 6 years ago
Tobias Diekershoff 27fa20ab22 Merge pull request #1947 from annando/1510-diaspora-follower 6 years ago
Tobias Diekershoff 9e2b62b082 Merge pull request #1948 from annando/1510-more-escaping 6 years ago
Tobias Diekershoff 0104c33d98 Merge pull request #1949 from annando/1510-feed-duplicates 6 years ago
Michael Vogel bb0dff2c75 Improved contact menu 6 years ago
Michael Vogel ba06d659f1 Bugfix: Feeds weren't imported if a post with the same URI existed. 6 years ago
Michael Vogel efbdb57f92 Reworked contact relations between Friendica and Diaspora 6 years ago
Michael Vogel ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers 6 years ago
Michael Vogel 1c21401751 acl lookup now works fine as well. 6 years ago
rabuzarus 0eae67ea48 update attendance state on profile wall 6 years ago
rabuzarus d85d215bb8 attendance update in network stream 6 years ago
Michael Vogel 16da708e07 Contact names with ">" and "<" are a problem ... 6 years ago
rabuzarus ba1207e6e1 translate attendance with localize_item() 6 years ago
rabuzarus 6a9ec14878 small bugfix in like.php 6 years ago
rabuzarus d2d084b814 treat attendance as like activity 6 years ago
Tobias Diekershoff 26983bafff Merge pull request #1944 from annando/1510-proxy-picture-size 6 years ago
Michael Vogel 61c3ce7a21 Bugfix: The contact names had to be escaped 6 years ago
Tobias Diekershoff d808888429 added some lines to the htconfig config variables 6 years ago
fabrixxm a76aca2c90 Merge pull request #1942 from tobiasd/20151007-IT 6 years ago
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 6 years ago
Tobias Diekershoff dd9f475ff6 personalise emails send from the server 6 years ago
Tobias Diekershoff b4ec07ab27 IT: update to the strings 6 years ago
Tobias Diekershoff d7d1a09558 Merge pull request #1941 from annando/1510-diaspora-privacy 6 years ago
Michael Vogel 14e17b944f Reworked fetching of contact data on "display" page 6 years ago
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 6 years ago
Michael Vogel 901b95e935 Hide some profile data if not connected. 6 years ago
Tobias Diekershoff b60cf21f8a Merge pull request #1940 from annando/1510-proxy-problems 6 years ago
Michael Vogel 7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. 6 years ago
Michael Vogel 2676a0f0e5 The proxy function sometimes kills embedded pictures ... 6 years ago
Tobias Diekershoff e1aa649703 Merge pull request #1939 from annando/issue-1938 6 years ago
Michael Vogel 607817d1b3 Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated. 6 years ago
Tobias Diekershoff 5545008768 Merge pull request #1937 from annando/1510-follow-notifications 6 years ago
Michael Vogel d3ac3f8490 Added the contact menu to the search as well. 6 years ago
Michael Vogel 133d38be20 Rearranged the contact menu so that it fits the menu at the conversations. 6 years ago
Michael Vogel caa9073a8f Remove all menu entries on the contact list that are empty 6 years ago