Commit graph

3732 commits

Author SHA1 Message Date
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
Michael Vogel
71227b5d0d Receiving should be complete, sending partially works 2016-03-06 00:53:30 +01:00
Michael Vogel
f05cbf9ed8 Merge pull request #2397 from Quix0r/fixes/poller-warning
No processing if error or empty array
2016-03-05 13:35:43 +01:00
Michael Vogel
2a4ebaa438 Small cleanup 2016-03-05 01:30:49 +01:00
Michael Vogel
5bbc8a14ce "import" is now "receive" 2016-03-05 00:27:44 +01:00
Michael Vogel
ef3620c191 Conversations should work now too. 2016-03-04 23:28:43 +01:00
Roland Haeder
d5c1ce490b
No processing if error or empty array
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 22:38:18 +01:00
Michael Vogel
2edf4548dc Retractions could work now. 2016-03-03 23:34:17 +01:00
Michael Vogel
5adecf5b50 Some beautification 2016-03-02 23:39:50 +01:00
Michael Vogel
66919761ab Some work at the retractions. 2016-03-02 23:28:20 +01:00
Michael Vogel
1f7f964bb7 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-02 11:59:13 +01:00
Michael Vogel
f1dae26df8 Likes would now work with unlikes and with likes on comments. 2016-03-01 23:21:56 +01:00
Michael Vogel
411566f48b API: Some small speed improvement when calling the home timeline. 2016-03-01 19:17:01 +01:00
Michael Vogel
009cadf63b Just another commit message :-) 2016-03-01 19:10:35 +01:00
Roland Haeder
04eacb6470
Prevent some E_NOTICE in identity.php
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:36:23 +01:00
Michael Vogel
cb900c5742 Reshares could work now, code is cleaned 2016-03-01 07:57:26 +01:00
Michael Vogel
8bcbff30e0 Account deletion should work, status messages works - reshares are half done. 2016-02-29 23:54:25 +01:00
Michael Vogel
6d3581dac8 "profile". "like" and "comment" could work, status messages only partly. 2016-02-29 08:02:50 +01:00
Michael Vogel
c02b54997e Like and Comment could work (partially) 2016-02-28 19:05:23 +01:00
Michael Vogel
a3960bda37 New Diaspora code 2016-02-27 23:54:17 +01:00
Michael Vogel
d27ed6e9d8 Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-23 08:03:30 +01:00
Michael Vogel
148c89a20d Added documentation 2016-02-23 07:56:49 +01:00
Michael Vogel
bc283a5316 The "abstract" has moved after the "nobb" part in bbcode. 2016-02-23 07:21:40 +01:00
Michael Vogel
8ec833f808 New BBCode element "abstract" for network depending messages. 2016-02-22 23:20:59 +01:00
Michael Vogel
d10eee45b9 Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-19 11:55:57 +01:00
Michael Vogel
8a3de7b186 Issue 2367: The data for the gserver table is now sanitized. 2016-02-19 07:30:28 +01:00
Michael Vogel
2eb461ed2c Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-18 08:15:58 +01:00
Tobias Diekershoff
26463d92da Merge pull request #2366 from annando/1602-array_merge
Avoid "array_merge" warning.
2016-02-18 07:50:43 +01:00
Michael Vogel
9619829b4a Avoid "array_merge" warning. 2016-02-18 07:41:08 +01:00
Michael Vogel
f9e2543133 Merge pull request #2354 from fabrixxm/issues/api-errors
api: throw HTTPException instead of calling api_error directly
2016-02-18 07:26:33 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel
c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel
f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00