10037 Commits (70b7de39a751934056ca5744ae4327d94b4a80f9)
 

Author SHA1 Message Date
Fabrixxm 70b7de39a7 Upload/Browse popup for files and images 6 years ago
Tobias Diekershoff c8c0c4d791 Merge pull request #1789 from silke/vagrant-fix-admin 6 years ago
Silke Meyer ef9ceec12c Updated vagrant docs. 6 years ago
Silke Meyer c56ccd225c Vagrant user doesn't have to tun the actual installation anymore. Test database is imported, htconfig is set, not generated to prevent installation routine. 6 years ago
Michael Vogel d66148fb17 Merge pull request #1787 from tobiasd/20150722-faq 6 years ago
Tobias Diekershoff 8dcebf0059 email settings for the FAQ 6 years ago
fabrixxm 29d6f96e12 Merge pull request #1776 from tobiasd/20150719-issue1771 6 years ago
Tobias Diekershoff 8bfbb935c7 add missing icons to quattros event view 6 years ago
Michael Vogel 40d3a2f0ef Merge pull request #1768 from tobiasd/20150718-issue1745 6 years ago
Tobias Diekershoff 9bb805f3dc show profile url in contact-edit overview listing 6 years ago
fabrixxm cf15a505bc Merge pull request #1767 from tobiasd/20150717-photonoshare 6 years ago
Tobias Diekershoff bbd2e4abc1 make the 'noshare' checkbox checked by default for photo upload 6 years ago
Tobias Diekershoff 5b96c7b3e3 Merge pull request #1765 from annando/1507-redmatrix-network-name 6 years ago
Michael Vogel 8b276e53c3 Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name 6 years ago
Michael Vogel fca8aecc9b Show "Redmatrix" as network name. 6 years ago
Tobias Diekershoff 207b6f36bb Merge pull request #1764 from annando/1507-ostatus-verb 6 years ago
Michael Vogel 05f8abcfa6 OStatus: Handling of unsupported verbs 6 years ago
Michael Vogel 52c4b8684b OStatus: Support for "Favorite" (like) 6 years ago
Tobias Diekershoff 74a2f58efb Merge pull request #1761 from annando/1507-update-name 6 years ago
Michael Vogel 6800b07fc5 Update the name in the "self" contact when it is changed. 6 years ago
Tobias Diekershoff 4689f44819 Merge pull request #1760 from tobiasd/20150714-nl 6 years ago
Tobias Diekershoff ba790def22 NL update to the strings 6 years ago
Tobias Diekershoff 9e138a42f2 Merge pull request #1758 from annando/1507-salmon 6 years ago
Michael Vogel 0de1926113 removed logger entry 6 years ago
Michael Vogel ca9e50764b Merge pull request #1757 from tobiasd/20150713-de 6 years ago
Michael Vogel 9ebaa45670 Removed unused template 6 years ago
Michael Vogel 2b3ebb9c3e Follow/Unfollow now works from OStatus. 6 years ago
Michael Vogel 3457f85833 Salmon: Don't store contact data before the message was authenticated. 6 years ago
Tobias Diekershoff a54dd8a9db DE: update to the strings 6 years ago
Michael Vogel 0398bb67be Reworked salmon import 6 years ago
Tobias Diekershoff 2c488863b8 Merge pull request #1756 from annando/1507-autofollow 6 years ago
Michael Vogel 5f89cb0923 The autofollow option is moved from the addons to the core. 6 years ago
Tobias Diekershoff 1efda90498 Merge pull request #1755 from annando/1507-template-update 6 years ago
Michael Vogel 5f86d3d325 removed the picture width, since it is already in the style sheet. 6 years ago
Michael Vogel 6a646d68c5 Updated templates for "vier" (See issue 1733) 6 years ago
Michael Vogel e22ce8403e Merge pull request #1752 from tobiasd/20150712-issue1747 6 years ago
Tobias Diekershoff f7597d42ad Merge pull request #1754 from rabuzarus/share-jotnets 6 years ago
Tobias Diekershoff 17793453a0 Merge pull request #1753 from rabuzarus/savedsearch-fix 6 years ago
rabuzarus e5809dce79 add jotnets for sharing posts 6 years ago
rabuzarus 2c39387e44 fix for saving searches 6 years ago
Tobias Diekershoff d920cf25b0 dont use an empty li, but make a new list for visual separation 6 years ago
Tobias Diekershoff 179201d2bf Merge pull request #1750 from annando/1507-contact-update 6 years ago
Michael Vogel c8fdff32b3 Likes do federate ... 6 years ago
Tobias Diekershoff 7134c01cb2 Merge pull request #1751 from annando/1507-diaspora-contact-links 6 years ago
Michael Vogel f6352aa9c6 Remove a useless comment 6 years ago
Michael Vogel 65468bf202 Moved the needed include to a better place. 6 years ago
Michael Vogel f48f7394e9 Only update communication relevant data. And only update if needed. 6 years ago
Michael Vogel 9106baf10f Some more test code removed 6 years ago
Michael Vogel cf663df69f Testing code removed 6 years ago
Michael Vogel 0ac75deee1 Some precaution to avoid overwriting of existing data with blanks 6 years ago