mexon/friendica
1
0
Fork 0
Code Pull requests Activity
29896 commits 5 branches 60 tags 188 MiB
Commit graph

233 commits

Author SHA1 Message Date
Roland Häder 49527b70d3 Merge branch 'develop' into rewrites/coding-convention-split2 2017-04-01 22:16:08 +02:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Roland Häder 830af774d3
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-21 21:50:45 +01:00
Hypolite Petovan 7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Roland Häder 0cd241bcbe
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:44:40 +01:00
Roland Häder 3849e7c9ff
added more curly braces + a bit more usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2017-03-19 00:40:47 +01:00
Michael 53393233c3 Replace the direct access of config variables 2017-01-17 19:21:46 +00:00
Hypolite Petovan 8a197055e3 Normalize App parameter declaration (mod folder, 1 out of 3) 2017-01-09 23:12:54 +11:00
Roland Häder 20e71d21a6 Merge branch 'rewrites/app_get_baseurl_static' into develop 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
 2016-12-22 11:37:23 +01:00
Roland Häder ad20c5504d Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/diaspora.php
	object/Item.php
 2016-12-22 11:33:00 +01:00
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 de689583e2 added more curly braces + space between "if" and brace 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
 2016-12-20 17:58:34 +01: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 4805aa8fdb Don't cherry-pick: 
- reverted dbm::is_result() to count()

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 16:28:23 +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 65e1cd728c Coding convention: 
- added curly braces
- added space between "if" and brace

Signed-off-by: Roland Häder <roland@mxchange.org>
 2016-12-20 10:40:09 +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 abff6372dd Coding convention applied: 
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/lock.php
 2016-12-20 10:12:31 +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
Friendika c05c20aa56 set writable (e.g. writeable) flag for Diaspora contacts 2011-08-18 21:31:34 -07:00
Friendika a589e8e3fe filename typo 2011-08-15 20:47:09 -07:00
Friendika f7a1674cf6 set proper relation for diaspora in mod_follow 2011-08-15 19:15:56 -07:00
Friendika a6d88fb8f7 diaspora friend approvals 2011-08-15 18:17:19 -07:00
Friendika 3a0727d496 set network correctly - dfrn_confirm 2011-08-14 05:26:44 -07:00
Friendika fcf6651299 add diaspora support to dfrn_confirm (friendship confirmation) 2011-08-14 05:23:36 -07:00
Friendika fda593caed introduction fails if confirmation differs by http vs https 2011-08-12 02:58:29 -07:00
Friendika 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika 2637831d90 some more zot changes migrating back to f9a mainline 2011-08-01 21:02:25 -07:00
Friendika e320975d73 bug #95 2011-06-23 22:23:26 -07:00
Friendika 040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika 0af6014c94 keep space before t() for legacy string puller 2011-04-20 05:00:58 -07:00
Friendika afe4cc8bfa pull request #91 fabrixxm (manual merge) 2011-04-20 04:50:12 -07:00
Friendika de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika 12bc4a44cf [privacy] use owner's default permission settings on "is now friends with..." msg 2011-04-10 15:30:56 -07:00
Friendika 793967a1d3 better handling of troublesome feeds. 2011-04-04 19:36:18 -07:00
fabrixxm a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
fabrixxm 9f7878057f update source strings 2011-03-11 00:22:21 +01:00
Friendika 755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
fabrixxm e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika c55cb45855 revised openid patch, added fix for Windows servers, make "is now friends with" commentable, fix settings form hook to be inside form 2010-12-23 14:40:32 -08:00
Friendika b302012581 send new friend activity when appropriate 2010-12-22 17:25:04 -08:00
Friendika 9fb0bd5114 Raise network timeout during friend acceptance, because 
encryption/decryption might slow things down.
 2010-12-09 14:29:38 -08:00
Friendika 4d0f0f9a94 more instrumentation on dfrn_confirm to help track down why it quietly gives up on occasion with no helpful log messages. 2010-12-08 15:30:26 -08:00
Friendika 3757c9cae5 use sha1 keys for friends as well 2010-11-24 16:07:42 -08:00
Friendika ef39bd080f more dfrn_confirm logging 2010-11-18 21:14:16 -08:00
Friendika e0b392b06e add a bit more logging to friend accept 2010-11-18 20:58:46 -08:00
Friendika 22f7ffc2d7 enumerate required php modules 2010-11-16 15:38:56 -08:00
Friendika 70bcf000e3 if pre-existing relationship, don't set duplex 2010-11-09 17:53:20 -08:00
Friendika d825db3649 lint 2010-11-07 15:46:49 -08:00
Friendika a3ddbb5d7c issues with friendship again 2010-11-06 22:56:39 -07:00
Friendika b94cb8d234 add micro profile photo 2010-11-04 23:50:32 -07:00
Mike Macgirvin d2e20d029a de-duplicate photo importation logic 2010-10-26 14:50:38 -07:00
Mike Macgirvin b41218ca30 workflow for federated/non-dfrn followers 2010-10-24 20:39:24 -07:00
Mike Macgirvin d58ff1a8df duplex wasn't getting set correctly on group pages 2010-10-19 16:23:05 -07:00
Mike Macgirvin ac824fe83e eradicate redundant get_uid function 2010-10-18 14:34:59 -07:00
Mike Macgirvin 0f47ac282c celebrity/group/community pages about 75% implemented 2010-10-17 20:04:17 -07:00
Mike Macgirvin 033935c194 cleanup to ensure protocol version is passed properly. We will need it if/when any incompatible protocol changes are introduced. 2010-10-12 20:29:04 -07:00
Mike Macgirvin b9d768972e added 's' keys - salmon keys, small keys, stupid keys, whatever... 2010-10-11 23:22:38 -07:00
Mike Macgirvin 6b67d00fce if pubkey is encrypted, it will also be packaged for safe transport 2010-10-11 04:01:24 -07:00
Mike Macgirvin eafd225bdd protocol revision, send dfrn_confirm binary items as hex 2010-10-11 03:16:25 -07:00
Mike Macgirvin 524f73e306 A bit more telemetry of friend confirms and lots of extra doco 
to understand what is happening and why.
 2010-10-10 18:25:34 -07:00
Mike Macgirvin 3531f466e5 further enhance the friend confirm reporting 2010-10-10 16:33:28 -07:00
Mike Macgirvin 0ddfdce6a4 make it much easier to debug friend acceptance issues 
by reporting specific error conditions across the wire.
 2010-10-10 16:16:29 -07:00
Mike Macgirvin 036964de4d friend acceptance sets up lots of important stuff, so we 
need to be absolutely bulletproof when (not if) things go wrong.
 2010-10-05 19:56:09 -07:00
Mike Macgirvin 8424f31aad a bit more robust about loading external pics 
also friend confirm was getting wrong email
 2010-10-04 16:04:52 -07:00
Mike Macgirvin abe6a3286e pubsubhubbub endpoint 2010-09-30 19:41:22 -07:00
Mike Macgirvin dd3f754e23 found yet another typo, so created a typo finder 2010-09-28 16:10:44 -07:00
Mike Macgirvin d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin 188dc1fcf8 relationship direction was too confusing to work with. instead of "in,out,both" it's now declared by role e.g. "vip,fan,bud". 2010-09-21 19:51:08 -07:00
Mike Macgirvin e583ba0bff improved "friendship accepted" emails enumerating what has 
changed in the relationship and what you can do now.
 2010-09-19 22:00:31 -07:00
Mike Macgirvin c5031139eb abstractify items, check photos for birthday paradox 2010-09-13 22:57:31 -07:00
Mike Macgirvin 440a3fea3f redirection to wrong profile in multi-user mode 2010-09-09 17:09:38 -07:00
Mike Macgirvin ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin 99a903ed66 better intro text 2010-08-27 15:35:41 -07:00
Mike Macgirvin 478f84d9f2 sql typo 2010-08-17 04:08:35 -07:00
Mike Macgirvin ce515ac2e8 prepare for federation 2010-08-16 19:38:07 -07:00
Mike Macgirvin d11c1c63c0 lots of fixes - most recent photo updates for contacts 2010-08-08 21:03:08 -07:00
Mike Macgirvin b294ff6302 fixed zero uid in imported contact photo 2010-08-04 20:11:14 -07:00
Mike Macgirvin d090033a0a more photo progress 2010-08-04 20:03:38 -07:00
Mike Macgirvin 4b39cc5f9b add default album names to photos 2010-08-02 20:21:21 -07:00
Mike Macgirvin 3fd4b4264e set frequency of poll per contact, other misc fixes (photo now has contact-id) 2010-08-01 05:46:51 -07:00
Mike Macgirvin 2e5fb9c37e lots of formatting, bug fixes on profile updates, i18n 2010-07-27 19:27:14 -07:00
Mike Macgirvin 6d7b018237 minor edit to last commit 2010-07-26 20:45:54 -07:00
Mike Macgirvin 8c1adbefe3 redirect to contact editor after introduction approval 2010-07-26 20:30:52 -07:00
Mike Macgirvin 6695b4a203 more bugs 2010-07-19 06:58:03 -07:00
Mike Macgirvin 6817c5d59a lots of work, 2way friends, comments... 2010-07-05 21:39:55 -07:00
Mike Macgirvin 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00