Commit graph

119 commits

Author SHA1 Message Date
Roland Häder c0df692f5f Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
2016-12-22 11:29:56 +01:00
Hypolite Petovan e8e1f9253d Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links
# Conflicts:
#	include/follow.php
2016-12-20 12:50:36 -05:00
Hypolite Petovan 4a7c3b9eef Diaspora: Fix class name case + add self 2016-12-20 12:44:15 -05:00
Roland Häder 4b221d216e added more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 17:57:40 +01:00
Roland Häder 51716957b2 converted more to dbm::is_result() + added braces/space
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 15:37:27 +01:00
Roland Häder a5e4882e25 Coding convention:
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:35:28 +01:00
Roland Häder fb676335db Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:10:33 +01:00
Roland Häder 884f44ce94 *much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:27:16 +01:00
Roland Häder c75d6ad850 More dbm::is_result() instead of count()
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 12:03:02 +01:00
Roland Häder 46d383369c Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:41:33 +01:00
Roland Häder 6a8a36f12d More usage of dbm::is_result($r) instead of count($r):
- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:44:13 +01:00
rabuzarus ac39928e5d upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
Michael Vogel 668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Michael Vogel d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel 206c26ae30 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-21 06:47:47 +01:00
Michael Vogel 8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel 56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Michael Vogel 8752ec11b2 Central function for default group, special setting for OStatus 2016-03-06 13:15:27 +01:00
fabrixxm b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
Andrej Stieben db949bb802 Updated modules to allow for partial overrides without errors
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
Michael Vogel 78e79de7c9 New central function to store avatar data in contacts 2016-01-28 11:09:08 +01:00
Michael Vogel 6f662b8c74 New avatar picture fields to better cope with changing avatars 2016-01-28 01:26:19 +01:00
Michael Vogel ab0fbc3a65 Bugfix: Unidirectional Diaspora connect request have to be followers - not sharers 2015-10-10 04:56:40 +02:00
Michael Vogel 0e895e24f7 Code reworks: replaced hardcoded network text with the corresponding constants. 2015-04-11 22:14:56 +02:00
fabrixxm 1bdddebd44 connection confirm notification mail via notification()
remove unused email templates
add a check for unexpected reponse from server
2014-09-06 17:28:46 +02:00
Michael Vogel 6e7bd68ebb More "LIMIT 1" removed - and some other SQL improvements. 2014-03-11 23:52:32 +01:00
Zach Prezkuta bce29054b9 allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
friendica 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica 07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
friendica 7f3813e9b0 service class basics 2012-06-24 00:56:27 -07:00
friendica 88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica bb4712b171 bug #434 - default group placement not working after accepting dfrn friend request 2012-05-25 18:06:51 -07:00
friendica afaf9ec74f rev update 2012-05-20 18:30:02 -07:00
friendica 5ecaeb8e5c catch more places to apply default group 2012-05-18 01:03:46 -07:00
friendica 3c0cf72716 make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it
also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages
2012-04-30 19:01:41 -07:00
friendica 5d10672fb8 fix join group notifications 2012-04-30 04:11:42 -07:00
friendica 3ff8fe53a2 provide "xxx joined yyy" notifications 2012-04-30 01:25:25 -07:00
friendica 894278dbcc change default profile photo to something more interesting than a reddish brown square 2012-03-20 15:41:06 -07:00
friendica 7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
friendica 60ae0d8974 cleaned up mess created when both people request friendship and one approves as duplex 2012-02-28 17:32:44 -08:00
Fabio Comuni dd09c2d125 use info() for successfull dfrn confirmation instead of notice() 2012-02-20 20:39:19 +01:00
friendica 76308eca67 add toggle to choose sending "friends with" activity even if contact is not hidden 2012-02-06 16:41:05 -08:00
friendica 4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica 5c72ead74e contact photo missing from friend activities 2012-01-08 01:08:57 -08:00
friendica c735582ead hide contacts on approval 2011-12-29 00:23:05 -08:00
Friendika cf82174520 bug #198 - create activitystream 'friends with' message for Diaspora confirmations 2011-11-12 04:06:33 -08:00
Friendika f17d91844f part of bug #143 2011-09-07 02:23:17 -07:00