clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,492 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

10492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel 0bede65a6b Use local search 2015-07-19 13:23:01 +02:00
Tobias Diekershoff 8bfbb935c7 add missing icons to quattros event view 2015-07-19 10:56:40 +02:00
Michael Vogel 93e93f58bd Query Redmatrix contacts for their contacts as well. 2015-07-19 10:40:33 +02:00
Michael Vogel 2a5fb7b175 Option to discover contacts from remote users (fallback option) 2015-07-19 09:41:36 +02:00
Michael Vogel e47c65eb13 Query the other servers for their users. 2015-07-18 23:33:54 +02:00
Michael Vogel a0734ceede Merge remote-tracking branch 'upstream/develop' into 1507-new-poco 2015-07-18 22:37:39 +02:00
Michael Vogel cf3214c904 Query other servers periodically for their known contacts 2015-07-18 22:26:06 +02:00
Michael Vogel 38d7b5e326 New table "gserver" for server data of the global contacts 2015-07-18 20:15:21 +02:00
Michael Vogel 40d3a2f0ef Merge pull request #1768 from tobiasd/20150718-issue1745 
show profile url in contact-edit overview listing
 2015-07-18 15:49:35 +02:00
Tobias Diekershoff 9bb805f3dc show profile url in contact-edit overview listing 2015-07-18 10:57:31 +02:00
Michael Vogel f1e7369283 Poco: Option to activate and deactivate detection of last activity. 2015-07-18 00:48:42 +02:00
Michael Vogel 639f94f8b9 Onepoll: mark the last request failure for this contact 2015-07-17 23:05:50 +02:00
fabrixxm cf15a505bc Merge pull request #1767 from tobiasd/20150717-photonoshare 
make the 'noshare' checkbox checked by default for photo upload
 2015-07-17 17:28:25 +02:00
Tobias Diekershoff bbd2e4abc1 make the 'noshare' checkbox checked by default for photo upload 2015-07-17 17:05:55 +02:00
Michael Vogel 09d71abbfc poco: Only fetch last update manually if it wasn't provided 2015-07-17 08:58:42 +02:00
Michael Vogel fdfd524e74 Only suggest contacts that haven't failed recently 2015-07-17 08:38:20 +02:00
root 54a5a80b24 Poco: New fields for last contact and last failure of a contact. 2015-07-17 01:08:28 +02:00
Tobias Diekershoff 5b96c7b3e3 Merge pull request #1765 from annando/1507-redmatrix-network-name 
Show "Redmatrix" as contact network
 2015-07-16 14:34:54 +02:00
Michael Vogel 8b276e53c3 Merge remote-tracking branch 'upstream/develop' into 1507-redmatrix-network-name 2015-07-16 10:18:07 +02:00
Michael Vogel fca8aecc9b Show "Redmatrix" as network name. 2015-07-16 10:09:59 +02:00
Tobias Diekershoff 207b6f36bb Merge pull request #1764 from annando/1507-ostatus-verb 
OStatus: Incoming favorites
 2015-07-15 19:06:19 +02:00
Michael Vogel 05f8abcfa6 OStatus: Handling of unsupported verbs 2015-07-15 18:27:44 +02:00
Michael Vogel 52c4b8684b OStatus: Support for "Favorite" (like) 2015-07-15 08:16:41 +02:00
Tobias Diekershoff 74a2f58efb Merge pull request #1761 from annando/1507-update-name 
Update the name in the "self" contact when it is changed.
 2015-07-15 07:53:36 +02:00
Michael Vogel 6800b07fc5 Update the name in the "self" contact when it is changed. 2015-07-14 22:24:43 +02:00
Tobias Diekershoff 4689f44819 Merge pull request #1760 from tobiasd/20150714-nl 
NL update to the strings
 2015-07-14 16:33:05 +02:00
Tobias Diekershoff ba790def22 NL update to the strings 2015-07-14 16:31:45 +02:00
Tobias Diekershoff 9e138a42f2 Merge pull request #1758 from annando/1507-salmon 
OStatus Salmon improvements (Follow, Unfollow works)
 2015-07-14 16:24:54 +02:00
Michael Vogel 0de1926113 removed logger entry 2015-07-14 08:52:54 +02:00
Michael Vogel ca9e50764b Merge pull request #1757 from tobiasd/20150713-de 
DE: update to the strings
 2015-07-14 00:01:23 +02:00
Michael Vogel 9ebaa45670 Removed unused template 2015-07-13 23:56:45 +02:00
Michael Vogel 2b3ebb9c3e Follow/Unfollow now works from OStatus. 2015-07-13 23:50:33 +02:00
Michael Vogel 3457f85833 Salmon: Don't store contact data before the message was authenticated. 2015-07-13 14:34:28 +02:00
Tobias Diekershoff a54dd8a9db DE: update to the strings 2015-07-13 08:14:00 +02:00
Michael Vogel 0398bb67be Reworked salmon import 2015-07-13 08:06:51 +02:00
Tobias Diekershoff 2c488863b8 Merge pull request #1756 from annando/1507-autofollow 
The autofollow option is moved from the addons to the core
 2015-07-12 22:02:24 +02:00
Michael Vogel 5f89cb0923 The autofollow option is moved from the addons to the core. 2015-07-12 21:37:49 +02:00
Tobias Diekershoff 1efda90498 Merge pull request #1755 from annando/1507-template-update 
Vier: Some template updates
 2015-07-12 21:08:11 +02:00
Michael Vogel 5f86d3d325 removed the picture width, since it is already in the style sheet. 2015-07-12 20:31:49 +02:00
Michael Vogel 6a646d68c5 Updated templates for "vier" (See issue 1733) 2015-07-12 20:27:54 +02:00
Michael Vogel e22ce8403e Merge pull request #1752 from tobiasd/20150712-issue1747 
issue 1747
 2015-07-12 18:12:19 +02:00
Tobias Diekershoff f7597d42ad Merge pull request #1754 from rabuzarus/share-jotnets 
add jotnets for sharing posts
 2015-07-12 18:06:11 +02:00
Tobias Diekershoff 17793453a0 Merge pull request #1753 from rabuzarus/savedsearch-fix 
fix for saving searches
 2015-07-12 18:05:41 +02:00
rabuzarus e5809dce79 add jotnets for sharing posts 2015-07-12 17:52:25 +02:00
rabuzarus 2c39387e44 fix for saving searches 2015-07-12 17:43:50 +02:00
Tobias Diekershoff d920cf25b0 dont use an empty li, but make a new list for visual separation 2015-07-12 16:16:54 +02:00
Tobias Diekershoff 179201d2bf Merge pull request #1750 from annando/1507-contact-update 
Automatic contact update
 2015-07-12 15:32:29 +02:00
Michael Vogel c8fdff32b3 Likes do federate ... 2015-07-12 14:57:09 +02:00
Tobias Diekershoff 7134c01cb2 Merge pull request #1751 from annando/1507-diaspora-contact-links 
Diaspora: Shared posts looking better, mentions are now links
 2015-07-12 13:54:41 +02:00
Michael Vogel f6352aa9c6 Remove a useless comment 2015-07-12 12:17:12 +02:00