Commit graph

154 commits

Author SHA1 Message Date
Roland Häder
7a9456d5ac
Merge branch 'develop' of github.com:friendica/friendica into rewrites/coding-convention-split2-4-2
Fixed some stuff:
- converted some files from DOS to Uni* (CRLF -> LF)
- removed trailing white-spaces

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-11 14:54:26 +02:00
rabuzarus
cc8a3a4101 rename methods of the Probe class to camelCase 2017-05-08 16:19:10 +02:00
Hypolite Petovan
3a2988c3fd Rename include/Scrape to include/probe 2017-05-07 14:45:19 -04:00
Hypolite Petovan
36e515ee6d Move Probe to src 2017-05-07 14:44:30 -04:00
Hypolite Petovan
82b423c5ac Fix require_once format 2017-05-07 14:40:23 -04:00
Hypolite Petovan
86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
Michael
eb0a701590 Just some more fixes to the protocol and the avatar stuff 2017-05-07 15:58:32 +00:00
Michael
30476623c5 Issue 3318: Make sure that we fetch an author 2017-05-05 19:41:41 +00:00
Hypolite Petovan
1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan
4b16de6d80 Fix wrong class name case
- Use leading backslash for non-namespace class names in App
2017-05-02 23:36:46 -04:00
Hypolite Petovan
20043914e6 Move App to src
- Add `use Friendica\App;` wherever needed
2017-05-02 22:59:36 -04:00
Michael
c0b5339691 There is now a function to store conversations 2017-04-28 16:35:53 +00:00
Michael
35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
Michael
45d73b106b Conversation data is now stored in another table 2017-04-26 21:16:25 +00:00
Roland Haeder
1dc4b60a5a
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-22 23:41:04 +02:00
Michael
3592f90910 Merge remote-tracking branch 'upstream/develop' into 1704-mastodon
Conflicts:
	include/bbcode.php
2017-04-20 05:44:31 +00:00
Michael
c6e7f6306c Some standards 2017-04-20 05:17:00 +00:00
Michael
e16fb74b0c Reworked OStatus communication part to better support Mastodon. 2017-04-19 21:37:00 +00:00
Alexandre Alapetite
15a44d945b Another GROUP BY fix for MySQL
https://github.com/friendica/friendica/issues/3322
2017-04-12 01:06:08 +02:00
Alexandre Alapetite
dbbe6efd27 Fix ostatus bug related to only_full_group_by
https://github.com/friendica/friendica/issues/3322
2017-04-12 00:19:05 +02:00
Michael Vogel
0d2bf557de Merge pull request #3315 from Hypolite/issue/#3285
Add spoiler tags for Mastodon Content Warning
2017-04-11 18:28:43 +02:00
Hypolite Petovan
21bb47a2e5 Added "braces" for @annando 2017-04-11 02:12:14 -04:00
Hypolite Petovan
ca7c2bfa00 Ignore Activity Streams delete messages from Mastodon 2017-04-10 22:20:03 -04:00
Hypolite Petovan
e45da5bcd3 Rewrote code according to @annando feedback
- Normalize boolean operators
2017-04-10 21:11:28 -04:00
Hypolite Petovan
ada5c4cc6a Add Content Warning support for comments too
Doh!
2017-04-10 00:57:36 -04:00
Hypolite Petovan
69d157c319 Add spoiler tags for Mastodon Content Warning 2017-04-10 00:08:14 -04:00
Michael
c574c317ef Removed unneeded comment 2017-04-02 20:43:54 +00:00
Michael
884c75a350 Issue 3278: Attachments in Reshares should now work 2017-04-02 19:18:11 +00:00
Michael
94f3f0887b Issue 2957: The avatar problem with mastodon should now finally be solved 2017-04-02 12:37:22 +00:00
Michael
07fd61b912 Mastodon: plink for reshares, missing hostnames for avatars 2017-04-01 23:39:19 +00:00
Michael
fa7721c735 Prevent Hypolite from doing comments about standards ;-) 2017-03-27 06:11:45 +00:00
Michael
364d88fa70 Only import new OStatus posts if they are from our followers 2017-03-27 05:33:43 +00:00
Michael
bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Haeder
1946cf143d
added logger ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-19 01:00:35 +01:00
Roland Häder
4fe5cdf3fd don't quit silently, at least a TODO is now around
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder
e8e51d8535 Missed a 't', thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:37 +01:00
Roland Häder
fbd559a823
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder
ed0d858f98
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:24 +01:00
Roland Häder
4c72cb3584
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:52:02 +01:00
Roland Häder
951006dd10
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
Roland Häder
41a36606c6
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00
Roland Häder
cc83e9d72a
fixed curly brace (opps)
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
6a3dc8b286
added more curly braces + fixed one
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
3ad0fd442e
Continued:
- added missing spaces/curly braces
- some more usage of dbm::is_result()
- 2 oppsite if() statements can be mored to else
- added more TODOs for type-hinting

Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:41:00 +01:00
Roland Häder
92901d8626
more curly braces added + dbm::is_result()
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:40:21 +01:00
Michael
2362e78c8f Issue 3011 (and others): OStatus: Don't fetch liked contents 2017-01-15 09:07:57 +00:00
Hypolite Petovan
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
Johannes Schwab
aab21838a4 Missing self befor class constants 2016-12-28 13:14:03 +01:00
Michael
3f6fd4bf84 Mastodon: Hopefully we can now detect reshares better 2016-12-18 20:34:34 +00:00