10216 Commits (cbabac298d1f7efdf680594166db7a4b72a1aa81)
 

Author SHA1 Message Date
Tobias Diekershoff ba790def22 NL update to the strings 7 years ago
Tobias Diekershoff 9e138a42f2 Merge pull request #1758 from annando/1507-salmon 7 years ago
Michael Vogel 0de1926113 removed logger entry 7 years ago
Michael Vogel ca9e50764b Merge pull request #1757 from tobiasd/20150713-de 7 years ago
Michael Vogel 9ebaa45670 Removed unused template 7 years ago
Michael Vogel 2b3ebb9c3e Follow/Unfollow now works from OStatus. 7 years ago
Michael Vogel 3457f85833 Salmon: Don't store contact data before the message was authenticated. 7 years ago
Tobias Diekershoff a54dd8a9db DE: update to the strings 7 years ago
Michael Vogel 0398bb67be Reworked salmon import 7 years ago
Tobias Diekershoff 2c488863b8 Merge pull request #1756 from annando/1507-autofollow 7 years ago
Michael Vogel 5f89cb0923 The autofollow option is moved from the addons to the core. 7 years ago
Tobias Diekershoff 1efda90498 Merge pull request #1755 from annando/1507-template-update 7 years ago
Michael Vogel 5f86d3d325 removed the picture width, since it is already in the style sheet. 7 years ago
Michael Vogel 6a646d68c5 Updated templates for "vier" (See issue 1733) 7 years ago
Michael Vogel e22ce8403e Merge pull request #1752 from tobiasd/20150712-issue1747 7 years ago
Tobias Diekershoff f7597d42ad Merge pull request #1754 from rabuzarus/share-jotnets 7 years ago
Tobias Diekershoff 17793453a0 Merge pull request #1753 from rabuzarus/savedsearch-fix 7 years ago
rabuzarus e5809dce79 add jotnets for sharing posts 7 years ago
rabuzarus 2c39387e44 fix for saving searches 7 years ago
Tobias Diekershoff d920cf25b0 dont use an empty li, but make a new list for visual separation 7 years ago
Tobias Diekershoff 179201d2bf Merge pull request #1750 from annando/1507-contact-update 7 years ago
Michael Vogel c8fdff32b3 Likes do federate ... 7 years ago
Tobias Diekershoff 7134c01cb2 Merge pull request #1751 from annando/1507-diaspora-contact-links 7 years ago
Michael Vogel f6352aa9c6 Remove a useless comment 7 years ago
Michael Vogel 65468bf202 Moved the needed include to a better place. 7 years ago
Michael Vogel f48f7394e9 Only update communication relevant data. And only update if needed. 7 years ago
Michael Vogel 9106baf10f Some more test code removed 7 years ago
Michael Vogel cf663df69f Testing code removed 7 years ago
Michael Vogel 0ac75deee1 Some precaution to avoid overwriting of existing data with blanks 7 years ago
Michael Vogel d55275f211 GUID should be urlencoded in template since it is urlencoded in uri as well. 7 years ago
Michael Vogel fe137a92ef Automatically update contact data. 7 years ago
Tobias Diekershoff 3c4ac0d616 Merge pull request #1742 from tobiasd/20150708-typo 7 years ago
Tobias Diekershoff eb79f109d4 update to the master strings 7 years ago
Tobias Diekershoff a22581e86c typo 7 years ago
Michael Vogel bc6e5a4f2d Merge remote-tracking branch 'upstream/develop' into 1507-diaspora-contact-links 7 years ago
Fabrixxm 95945ecae6 Merge branch 'master' into develop 7 years ago
fabrixxm 5a1bb9866d Merge branch '3.4.1' 7 years ago
Tobias Diekershoff 13bbfd188f Merge pull request #1737 from fabrixxm/changelog 7 years ago
fabrixxm fb966a7d1a small updates to CHANGELOG 7 years ago
Michael Vogel bd3f877721 Merge pull request #1736 from fabrixxm/changelog 7 years ago
fabrixxm bc4b374f04 fix typos in changelog 7 years ago
Fabrixxm c03c06cf30 Update version 7 years ago
Fabrixxm e54414692e Update CHANGELOG 7 years ago
Michael Vogel d6d51e0259 Don't deliver answers to OStatus messages to Diaspora 7 years ago
Michael Vogel c356da2cad Diaspora: Improved parsing of linefeeds 7 years ago
Michael Vogel 43f98bc854 When posting to Diaspora, now the contact names are containing the link to the user profile. 7 years ago
Tobias Diekershoff 08f276f87b Merge pull request #1724 from rabuzarus/theme_uid 7 years ago
fabrixxm 75998b62de Merge pull request #1726 from rabuzarus/acl-var 7 years ago
rabuzarus b827c2e805 inlude jotnets for bookmark acl 7 years ago
rabuzarus a0b522c3be fix toggle mobile/desktop view 7 years ago