keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12528 commits 4 branches 0 tags 179 MiB
Commit graph

4078 commits

Author SHA1 Message Date
Michael Vogel
eca1b1ff58 Bugfix: Some more encoding problems with attachments fixed 2016-05-26 23:22:30 +02:00
Tobias Diekershoff
c013ca9d36 Merge pull request #2529 from annando/1605-events 
Issue 2277: Events can now be edited and deleted
 2016-05-23 18:06:09 +02:00
Michael Vogel
39ce023158 Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon 2016-05-23 06:49:31 +02:00
Michael Vogel
b9e702742c Remove some test logging 2016-05-22 18:22:05 +02:00
Michael Vogel
b7f2858486 Issue 2277: changes to events are now distributed. 2016-05-22 18:16:47 +02:00
Michael Vogel
06998f13b6 Events: Now with guid. 2016-05-22 18:05:01 +02:00
Michael Vogel
36063b47ab Bugfix: The url in attachments had problems with entities 2016-05-22 13:46:05 +02:00
Michael Vogel
a1691664f3 Bugfix: Under certain circumstances notifications were send 2016-05-21 13:19:30 +02:00
Michael Vogel
8daa49b233 Bugfix: Feeds weren't detected correctly 2016-05-18 22:50:15 +02:00
Tobias Diekershoff
01a491c783 Merge pull request #2513 from annando/1605-diaspora-relay 
Support for comments for the Diaspora relay system
 2016-05-16 07:57:16 +02:00
Tobias Diekershoff
12e3c9ca59 Merge pull request #2514 from annando/1605-plaintext 
Bugfix for shares in the plaintext function
 2016-05-16 07:56:42 +02:00
Michael Vogel
247f866655 There were undecoded entities in the title 2016-05-15 10:36:56 +02:00
rabuzarus
7be1c83b0c photo.php: correct misspelling of an array key 2016-05-15 02:37:18 +02:00
Michael Vogel
1b2f67906b Bugfix for shares in the plaintext function 2016-05-13 22:23:46 +02:00
Michael Vogel
6434b5d8ce Support for comments for the Diaspora relay system 2016-05-13 22:19:31 +02:00
Michael Vogel
4d105111a7 Added documentation 2016-05-06 18:30:34 +02:00
Michael Vogel
b7c14803b2 The feed header is now displayed even with "hidewall" activated 2016-05-06 18:27:19 +02:00
Michael Vogel
6f72bc8d3a Better implementation of "hidewall" 2016-05-06 11:04:21 +02:00
Michael Vogel
ea78f63eac Diaspora: Reshares of non native reshares now look better 2016-05-06 08:22:27 +02:00
Tobias Diekershoff
480c35fb86 Merge pull request #2503 from annando/1605-hide-profile 
Better handling of hidden profiles
 2016-05-06 07:45:44 +02:00
Michael Vogel
1aa3aa21b3 Avoid warning messages at "strstr" 2016-05-05 20:36:23 +02:00
Michael Vogel
bd1030b246 Update the global contact entries for local users on a regular base 2016-05-05 15:38:28 +02:00
Michael Vogel
de431e185e New function to update the global contact for the user id. 2016-05-05 15:08:05 +02:00
Michael Vogel
3df235e5bd The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
Michael Vogel
90155da59a The "hide" element is included in the feed as well. 2016-05-05 06:46:23 +02:00
Michael Vogel
683cdcc19e Changed check for searchability 2016-05-05 00:29:54 +02:00
Michael Vogel
ed485b9d61 Set "hide" in noscrape 2016-05-04 23:50:31 +02:00
Michael Vogel
fbc5404522 DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus. 2016-05-04 23:21:30 +02:00
Michael Vogel
8992577bb6 Better handling of hidden profiles 2016-05-04 09:30:55 +02:00
Tobias Diekershoff
167a8998d6 Merge pull request #2502 from annando/1605-diaspora-share 
Shared links to Diaspora should look better now
 2016-05-04 07:20:22 +02:00
Michael Vogel
bed4799728 Some more beautification. 2016-05-03 21:57:08 +02:00
Michael Vogel
a7aaf7cc98 Shared links to Diaspora should look better now 2016-05-03 20:12:13 +02:00
Michael Vogel
26e1c4d458 Avoid SQL errors because of existing entries 2016-05-03 19:20:58 +02:00
rabuzarus
3dad86f0e0 add a hook call to acl_lookup() 2016-04-28 22:15:55 +02:00
Michael Vogel
af22007481 Bugfix for XML function 2016-04-28 08:30:15 +02:00
Tobias Diekershoff
1644919880 Merge pull request #2489 from annando/1604-unseen 
Check before doing the database update
 2016-04-28 07:18:35 +02:00
Michael Vogel
5e4a2badb2 Check before doing the database update 2016-04-28 06:56:55 +02:00
rabuzarus
9b3931e48a xml: rename convert_element_to_array to element_to_array 2016-04-27 17:04:46 +02:00
rabuzarus
dbc39bea74 move xml related function to the xml class + some doxygen docu 2016-04-27 16:31:03 +02:00
Michael Vogel
ca72c5f256 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 22:25:13 +02:00
Michael Vogel
18aa43e6f6 Code redesign and comments 2016-04-25 22:10:45 +02:00
Michael Vogel
2c75a0fefc Minor session stuff 2016-04-25 20:43:40 +02:00
Tobias Diekershoff
714eb1a296 Merge pull request #2479 from annando/1604-vier-login 
Vier: No visible login border/no search and events without login
 2016-04-25 20:24:10 +02:00
Michael Vogel
f0d5c97c08 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 16:44:06 +02:00
Michael Vogel
75fefeba95 Only hide the search if "local_search" was activated. 2016-04-25 16:42:16 +02:00
Michael Vogel
8c2a4fe02a We now work with a hash to avoid cookie manipulation 2016-04-25 11:19:42 +02:00
Michael Vogel
a214fc798a "Remember Me" should work now but needs more fine tuning 2016-04-25 07:10:40 +02:00
Michael Vogel
b4369d51f5 Improved "remember me" functionality 2016-04-25 00:02:43 +02:00
Michael Vogel
0c5f315294 Vier: No visible login border/no search and events without login 2016-04-24 21:45:06 +02:00
Michael Vogel
93347d3279 Bugfix DFRN and bookmark detection 2016-04-24 17:00:19 +02:00
Tobias Diekershoff
1756ecaba3 Merge pull request #2476 from annando/1604-poller-maxlevel 
Value to define the maximum level of database connections for the worker
 2016-04-23 11:35:43 +02:00
Michael Vogel
5711e561fc Check the global contacts every 90 days/Better handling in item creation 2016-04-23 10:46:16 +02:00
Michael Vogel
76b24f61a9 New (experimental) value to define the maximum level of database connections for the worker 2016-04-23 10:11:09 +02:00
Michael Vogel
e76475d81f Quickfix for Hubzilla systems with enabled OStatus addon 2016-04-22 23:58:06 +02:00
Tobias Diekershoff
19a24d6ada Merge pull request #2470 from annando/1604-gprobe 
Some gcontact stuff and DDoS/Spam prevention
 2016-04-21 08:40:52 +02:00
Michael Vogel
5eb6b75645 Clean the url at "poco" 2016-04-21 07:24:00 +02:00
Michael Vogel
e333efc9aa Diaspora: Comments and Likes are now signed at any time 2016-04-20 23:27:33 +02:00
Michael Vogel
0434b0485a Start a gcontact probing for new gcontacts 2016-04-20 21:47:57 +02:00
Michael Vogel
378d444fc3 Only do the cleaning on specific networks 2016-04-20 09:38:06 +02:00
Michael Vogel
7f8aee2baa Don't clean the contact url of feeds 2016-04-20 09:31:36 +02:00
Michael Vogel
ea3ecd83ea We have to store feeds in the gcontact table ... 2016-04-20 08:27:11 +02:00
Michael Vogel
919728126a Bugfix: We checked in the wrong array ... 2016-04-20 07:58:52 +02:00
Michael Vogel
c6fb6c559a Improved logging 2016-04-20 07:48:21 +02:00
Michael Vogel
bc0ba8a0d7 Added description 2016-04-20 07:26:18 +02:00
Michael Vogel
28f97845ca Some more checks that the gcontact table contains valid data 2016-04-20 07:00:55 +02:00
Michael Vogel
bb5421d925 Bugfix: The function to remove parts of attachments forgot about the rest 2016-04-20 00:12:27 +02:00
Tobias Diekershoff
f7548b87c6 Merge pull request #2463 from annando/1604-diaspora-again 
Some small Diaspora changes
 2016-04-19 21:35:33 +02:00
Michael Vogel
53d8c21d3c Don't store unknown networks 2016-04-19 20:39:12 +02:00
Michael Vogel
cb12e145a7 Don't cache account probing for empty networks 2016-04-19 16:19:23 +02:00
Michael Vogel
ea8cfed6a9 Some small Diaspora changes 2016-04-19 07:39:17 +02:00
Michael Vogel
432c1ec5e4 Now we are having "after" at the old attach mechanism as well 2016-04-18 21:28:09 +02:00
Michael Vogel
999ef7f679 Attachments: Better handling of preview pictures 2016-04-18 12:13:54 +02:00
Michael Vogel
26f62a97fd Bugfix: Missing include added 2016-04-18 06:11:29 +02:00
Michael Vogel
81bcafe28f Improved handling of photos 2016-04-17 23:38:29 +02:00
Michael Vogel
502b660ca9 Added documentation 2016-04-17 20:55:19 +02:00
Michael Vogel
49d52faab5 Use the "attachment" element instead of a mixture of several elements 2016-04-17 20:43:41 +02:00
Tobias Diekershoff
e44bec3c37 Merge pull request #2452 from annando/1604-clean-contact-url 
Clean gcontact url before saving in gcontact table
 2016-04-17 16:51:06 +02:00
Michael Vogel
ae75a46529 the "nurl" index was accidentally dropped 2016-04-17 16:41:28 +02:00
Michael Vogel
017bfe17f8 Speeding up the gcontact search 2016-04-17 13:46:49 +02:00
Michael Vogel
2d4fd30cc3 Merge remote-tracking branch 'upstream/develop' into 1604-clean-contact-url 2016-04-17 11:55:51 +02:00
Michael Vogel
146dc5c8cd Added comment 2016-04-16 17:01:32 +02:00
Michael Vogel
57cadf5b8f Clean gcontact url before saving in gcontact table 2016-04-16 15:22:54 +02:00
Michael Vogel
f8c96d24b4 Speed up the contact search, proxy the images, search for addresses 2016-04-16 15:01:03 +02:00
Tobias Diekershoff
bbd5878734 Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete 
new autocompletion
 2016-04-16 08:16:21 +02:00
rabuzarus
ce1faf17d1 rework autocomplete: some polishing 2016-04-14 17:05:19 +02:00
rabuzarus
01b02dbcaa Merge develop into 1404_reworked_autocomplete 
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
 2016-04-14 16:23:51 +02:00
Michael Vogel
d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel
018b3ed25f API: Just some more elements where Twidere has problems ... 2016-04-12 22:53:54 +02:00
Michael Vogel
34dc23b871 API: Improvement for Twidere/Conversation call improved 2016-04-09 22:44:32 +02:00
Tobias Diekershoff
dfa5183774 Merge pull request #2441 from rabuzarus/0704_doxygen_forum 
Update ForumManager.php
 2016-04-07 21:06:32 +02:00
rabuzarus
d5bf386cf7 Update ForumManager.php - small correction 2016-04-07 16:58:26 +02:00
rabuzarus
a3c79d2007 Update ForumManager.php 
fix some doxygen description
 2016-04-07 14:43:56 +02:00
Michael Vogel
952f8514a5 "remember me" in session does work now 2016-04-05 23:28:33 +02:00
Tobias Diekershoff
b9d9ffbd01 Merge pull request #2429 from annando/1604-item-shadow 
New post update function, search is now using the "global" field
 2016-04-03 19:55:34 +02:00
Michael Vogel
1f61efc7fe Scrape: Changed detection for the profile link 2016-04-03 19:29:35 +02:00
Michael Vogel
3fdaafd54a Some more documentation 2016-04-03 18:49:41 +02:00
Michael Vogel
f192767d7a Some reverted stuff 2016-04-03 16:38:32 +02:00
Michael Vogel
9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
Michael Vogel
beb1e04069 New field in item table ("shadow") that indicates if there is a shadow entry 2016-04-03 13:48:31 +02:00
Michael Vogel
ce2c1b4fc1 Small bugfix: We always liked the parent 2016-04-02 17:43:53 +02:00
Michael Vogel
68b88c0384 Notify and poll aren't fetched at the moment 2016-04-02 15:49:57 +02:00
Michael Vogel
b4b62493e6 Bugfix: The nickname vanished/better way to fetch the alias 2016-04-02 15:41:55 +02:00
Michael Vogel
e5377a5e91 Merge remote-tracking branch 'upstream/develop' into 1604-salmon-like 2016-04-02 14:12:02 +02:00
Michael Vogel
fd965b046a Update contact data for uid=0 at feed import 2016-04-02 14:10:40 +02:00
Tobias Diekershoff
c30306e085 Merge pull request #2424 from annando/1603-scrape-alias 
Scrape: Always take the first alias
 2016-04-02 09:48:31 +02:00
Michael Vogel
bc05984786 Only update contact when scrape runs with "probe_normal" 2016-04-02 09:06:10 +02:00
Michael Vogel
08fb662b4a OStatus: Salmon now works with "likes"/The alias is stored now as well 2016-04-02 00:24:56 +02:00
Michael Vogel
eeb462cd04 Only update the contact entry with uid=0 2016-04-01 21:41:37 +02:00
Michael Vogel
416a0e5ec2 Don't optimize the tables when the maximum size is lower than zero 2016-04-01 21:09:52 +02:00
Michael Vogel
ffcc5f372f Some more documentation 2016-03-31 22:24:54 +02:00
Michael Vogel
d0b8f2092d Some more documentation 2016-03-31 22:01:56 +02:00
Michael Vogel
ffd73d137b Added some documentation 2016-03-31 07:34:13 +02:00
Michael Vogel
6ff5c23d50 Doxygen structure added 2016-03-31 00:14:51 +02:00
Michael Vogel
1f2c495cd8 Tempory file is deleted 2016-03-30 23:26:37 +02:00
Michael Vogel
2c5b5c1cd4 OStatus class is now moved into the right place 2016-03-30 23:25:20 +02:00
Michael Vogel
7be0020da9 Merge remote-tracking branch 'upstream/develop' into 1603-scrape-alias 2016-03-30 12:47:48 +02:00
Michael Vogel
4a5a964d89 "Scrape" now respects the new url formats with "index.php" 2016-03-30 12:46:10 +02:00
Michael Vogel
b93e1d73a1 New OStatus implementation 2016-03-30 12:43:15 +02:00
Michael Vogel
4d668fac8b Not sure if that is correct ... 2016-03-29 17:54:36 +02:00
Michael Vogel
f80f4f6a97 Some changed doxygen header stuff 2016-03-28 22:35:11 +02:00
Michael Vogel
b6121a0009 And wow ... some more documentation 2016-03-28 00:06:46 +02:00
Michael Vogel
7e711d9d62 And some more doc stuff 2016-03-27 23:38:35 +02:00
Michael Vogel
faa9b77a90 Some more small documentation stuff 2016-03-27 23:25:32 +02:00
Michael Vogel
16ef9f4940 Support for the new contact request data type 2016-03-25 00:49:18 +01:00
Michael Vogel
7e7cac19f6 Avoid a guid whith spaces. 2016-03-24 21:32:55 +01:00
Michael Vogel
ec90a9e6ad Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-24 16:19:52 +01:00
Michael Vogel
7bf079d858 Some more documentation - again. 2016-03-24 15:59:53 +01:00
Michael Vogel
24afcdd5dd Scrape: Always take the first alias 2016-03-24 08:35:06 +01:00
Michael Vogel
7aae852fe0 Some more code cleaning 2016-03-23 22:12:08 +01:00
Michael Vogel
799ff77797 API: Support for the conversation api call from GNU Social 2016-03-23 10:24:01 +01:00
Michael Vogel
ac35f8c756 If the message already exists then the message id should be returned 2016-03-23 09:22:59 +01:00
Michael Vogel
28dfaa694c Add OEmbed data to the body of reshares 2016-03-23 07:36:17 +01:00
Michael Vogel
e8c07aaac6 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-23 06:59:20 +01:00
Michael Vogel
791ce24cd5 Bugfix: Avoid warning with non object OEmbed data 2016-03-22 23:24:07 +01:00
Michael Vogel
62103fe5f4 Reshare of reshares now work. 2016-03-22 23:00:42 +01:00
Michael Vogel
90d4b93424 Avoid an empty handle 2016-03-22 07:13:56 +01:00
Michael Vogel
c284ab5eff Some more documentation - to make @rabuzarus happy 2016-03-21 19:58:45 +01:00
Michael Vogel
206c26ae30 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-21 06:47:47 +01:00
Tobias Diekershoff
53546e92d3 Merge pull request #2420 from annando/1603-guid 
Add the guid to items that we create locally
 2016-03-21 06:40:55 +01:00
Michael Vogel
5a04ba8416 Added documentation 2016-03-20 16:16:15 +01:00
Michael Vogel
77ed71e2e0 DFRN: Remote tagging works now 2016-03-20 15:53:37 +01:00
Michael Vogel
8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel
d676ae0f32 The signature creation now moved into the Diaspora class. That's much cleaner. 2016-03-19 15:49:47 +01:00
Michael Vogel
5c44a787bf The documentation should now be complete 2016-03-18 22:28:20 +01:00
Michael Vogel
be5267edda Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-18 21:28:34 +01:00
fabrixxm
bfde20f5fe Merge pull request #2417 from annando/1603-sess_data 
There is no table "sess_data" - this database call is useless
 2016-03-18 18:46:28 +01:00
Michael Vogel
a2507804f2 There is no table "sess_data" - this database call is useless 2016-03-18 16:42:10 +01:00
Michael Vogel
e74587b375 Just some more documentation 2016-03-18 08:07:23 +01:00
Michael Vogel
fab48926d0 Added some documentation, script to generate a basic doxygen header 2016-03-17 23:44:18 +01:00
Tobias Diekershoff
bc579ff799 added title element to emoji images in main repository 2016-03-17 17:41:06 +01:00
Michael Vogel
16b92af71f Retraction do work as well 2016-03-17 12:24:23 +01:00
Michael Vogel
88fea17cab Everything tested, one open to-do 2016-03-17 00:37:44 +01:00
Michael Vogel
e058feed28 Better reshare detection 2016-03-16 21:27:07 +01:00
Michael Vogel
468734a26e Added checklist 2016-03-16 19:30:46 +01:00
Michael Vogel
f6c950823f Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-16 19:30:26 +01:00
Michael Vogel
84a475e589 Missing include 2016-03-16 16:49:54 +01:00
Michael Vogel
071ffd43bf DFRN: Mentions were imported as hash tags 2016-03-16 11:44:45 +01:00
Michael Vogel
be001d171b Values are sanitized, messages are not relayed when there is no signature 2016-03-15 20:14:08 +01:00
Michael Vogel
8027854886 Removed moved function 2016-03-15 07:18:11 +01:00
Michael Vogel
eed55664fc Reshares now store the original XML as well. 2016-03-15 00:26:28 +01:00
Michael Vogel
4b5e7007a7 Bugfix: XML copy had problems with "&" 2016-03-14 23:54:01 +01:00
Michael Vogel
dc2e7a66b3 The Diaspora class is now productive 2016-03-14 23:11:43 +01:00
Michael Vogel
6f43d3a4c4 Profile update is now working with the new function as well 2016-03-14 22:10:26 +01:00
Michael Vogel
56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Michael Vogel
3734555715 Conversations are working now too 2016-03-14 20:04:17 +01:00
Michael Vogel
9ae2b2292f Some more function calls changed to the new class 2016-03-14 08:11:14 +01:00
Michael Vogel
75f5cfe63e Retraction and reshares work 2016-03-13 21:11:48 +01:00
Michael Vogel
2841aa0281 New implementation is now live. 2016-03-13 19:47:02 +01:00
Michael Vogel
07818a6553 Decode function is now there as well. 2016-03-13 16:14:51 +01:00
Michael Vogel
f8f19038bf XML generation is now improved 2016-03-13 09:57:44 +01:00
Michael Vogel
f978bc9cc8 Some code cleaning, changes to the xml generation 2016-03-13 07:10:24 +01:00
Michael Vogel
0f65eee695 Everything could work - needs some beautification and documentation 2016-03-12 19:19:20 +01:00
Roland Haeder
9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result(). 
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
 2016-03-12 18:54:55 +01:00
Roland Haeder
c60605ce0c
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-12 18:50:14 +01:00
Michael Vogel
a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 07:38:25 +01:00
Michael Vogel
2718c8150f The table optimisation level calculation is now using the index size as well 2016-03-11 20:32:22 +01:00
Michael Vogel
cd0fbc5e9a Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-10 08:22:52 +01:00
Michael Vogel
df312402e4 Bugfix: A parameter was missing for the OStatus author check 2016-03-09 22:51:17 +01:00
Michael Vogel
c0bd7a866d Some small addition to the OStatus part. Better check if we follow the actor. 2016-03-09 21:53:30 +01:00
Michael Vogel
32c66246c4 Some fixes for the fetching of postings by using /p/ 2016-03-09 19:30:04 +01:00
Michael Vogel
65d6d45f8c Changed parameter order 2016-03-08 22:28:49 +01:00
Michael Vogel
beb2346cfc The function to check for maxload and the lockfile is centralized 2016-03-08 20:28:09 +01:00
Michael Vogel
ec9c9f0be7 Don't create lock files if the process is called from the poller via the worker 2016-03-08 00:20:06 +01:00
Michael Vogel
16eb8fd9bf Small things ... 2016-03-07 15:20:48 +01:00
Michael Vogel
373beb0343 Relayed Likes and relayed comments should work, code needs beautification 2016-03-07 08:17:21 +01:00
Michael Vogel
db15f76177 Relaying is nearly done 2016-03-07 01:34:06 +01:00
Michael Vogel
182bee265e Sending like and comment should work now. 2016-03-06 22:49:50 +01:00
Michael Vogel
918efbafac Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 21:20:00 +01:00
Michael Vogel
4ef44c67b8 Added documentation 2016-03-06 21:06:52 +01:00
Michael Vogel
27905cc21a Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion 2016-03-06 20:37:51 +01:00
Michael Vogel
ef2bc47cc6 New way of fetching the conversation id for thread completion 2016-03-06 20:36:28 +01:00
Tobias Diekershoff
bdfd81e723 Merge pull request #2400 from annando/1603-ostatus-thread 
Only import OStatus threads that are started by our contacts
 2016-03-06 19:40:01 +01:00
Michael Vogel
9579725d4d This should work better ... 2016-03-06 19:27:34 +01:00
Michael Vogel
279a0453f9 Or back ... 2016-03-06 15:13:19 +01:00
Michael Vogel
7f48df63a3 Relocated the check. 2016-03-06 15:11:04 +01:00
Michael Vogel
4bd1061a09 Only import OStatus threads if we follow the thread starter 2016-03-06 14:53:30 +01:00
Michael Vogel
8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
Michael Vogel
af7b028b13 Preparation for followups 2016-03-06 11:41:51 +01:00
Michael Vogel
305f6f9a7b Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-06 08:41:24 +01:00
Michael Vogel
6468fbb905 Retraction could work now as well. 2016-03-06 01:37:47 +01:00