Commit graph

120 commits

Author SHA1 Message Date
9f706fcfbb Add include 2017-02-04 22:27:49 +00:00
0d1f88033b Support for the new Diaspora mention format 2017-02-04 22:22:12 +00:00
ac88471e55 Make the code nicer 2017-01-29 14:00:44 +00:00
c1eea3771f Bugfix: Sometimes the self contact seems to destroy itself 2017-01-29 13:57:03 +00:00
Michael Vogel
3c51820515 Merge pull request #3076 from Hypolite/issue/#3039-boot-doc-include
Normalize App parameter declaration (doc-include folders, boot)
2017-01-11 09:01:48 +01:00
Hypolite Petovan
87eb3d5ef2 Normalize App parameter declaration (doc-include folders, boot) 2017-01-09 23:09:01 +11:00
ed0143c9f0 Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-07 16:13:57 +00:00
6976ad4892 Removed some removed indexes 2017-01-06 06:37:27 +00:00
f8a213e23b
*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-23 19:49:36 +01:00
d82ed5d1b4 Continued with code convention:
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:31:23 +01:00
c9194b0381 Continued with code convention:
- added more curly braces
- added space betweent if/foreach and brace
- added spaces for beautification
- converted some " to ' (mixed usage)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 15:30:23 +01:00
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
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
dac1dbd3e9 Merge branch 'rewrites/dbm_is_result' into develop 2016-12-19 14:47:05 +01:00
a96eb3428d Used more dbm::is_result() instead of (!$r) or (!count($r)), still there are
more pending ...

Also put SQL table columns into back-ticks.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-19 14:46:33 +01:00
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
ff569756ee Merge remote-tracking branch 'upstream/develop' into rewrites/mixed-static-object-reference-calls
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/follow.php
2016-12-19 09:40:34 +01:00
099f51c7b5 Removal of test code 2016-12-18 17:36:48 +00:00
bc323b0bfa OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
a905522eb5 Cleanup for #3010 - added spaces, thanks to @annando .
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:42:36 +01:00
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
5c04402448 String is no integer 2016-12-11 17:37:12 +00:00
c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00
a38a5019d0 Issue 2518: Remove contact data in the background 2016-11-28 21:44:04 +00:00
89d5aa64ba Mark contacts as dead or undead while transmitting and receiving messages 2016-11-19 20:10:29 +00:00
126c4774c3 Merge remote-tracking branch 'upstream/develop' into 1607-performance
Conflicts:
	include/dbstructure.php
	mod/item.php
	mod/nodeinfo.php
2016-11-16 06:27:21 +00:00
Hypolite Petovan
bae9f0852f misc performance: cache contact details by url during script 2016-11-06 00:51:23 -04:00
fbfaef1968 API calls should be much faster than before 2016-11-04 22:45:20 +00:00
Michael Vogel
3463a442ba Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-24 08:12:13 +00:00
Hypolite Petovan
4b0e76f3b7 Fix Issue #2803 - Hovercard view profile link and public directory link
- Change "Edit Contact" link to "View Contact" in `include/Contact.php`
and `include/conversation.php`
- Add zrl parameter to public directory on single user instances
- Improved formatting of modified functions
2016-10-22 22:49:12 -04:00
Michael Vogel
3e5cf5290e Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
Michael Vogel
87300b2b49 When we have the field, we should use it :) 2016-10-04 03:58:47 +00:00
Michael Vogel
ca53881cd3 Some more explanations 2016-10-02 06:40:08 +00:00
Michael Vogel
9dee3cc809 Some small changes 2016-10-01 20:20:27 +00:00
Michael Vogel
60a0235af0 The account type is now read and displayed 2016-10-01 20:03:27 +00:00
Michael Vogel
196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Michael Vogel
02b5f6a34d Merge remote-tracking branch 'upstream/develop' into develop 2016-08-01 08:02:26 +02:00
Michael Vogel
668da905e2 "proc_run" is now called with priority. 2016-08-01 07:48:43 +02:00
Michael Vogel
4961fb3a45 Unused indexes removed, queries changed 2016-07-26 22:10:13 +02:00
Michael Vogel
8bf7db06db New indexes for the API 2016-07-19 08:43:57 +02:00
Michael Vogel
0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
Michael Vogel
c3ed6f7d01 Improved default value handling 2016-06-19 01:22:32 +02:00
Michael Vogel
e512a83ecc Massively updated avatar handling 2016-06-19 01:07:20 +02:00
Michael Vogel
aac9caab2d Priority for native networks when searching by contact url 2016-06-12 10:46:15 +02:00
Michael Vogel
098a8ac6c2 Bugfix: In threads the contact data from users weren't taken. 2016-06-08 22:50:57 +02:00
Michael Vogel
98272fe386 Some better handling of "bd" and "birthday" 2016-06-05 15:09:40 +02:00
Michael Vogel
572402224f "bd" now always shows the upcoming birthday 2016-06-05 15:03:04 +02:00