Commit Graph

5718 Commits

Author SHA1 Message Date
Michael c221376041 Some notification thingy 2017-01-04 23:12:28 +00:00
Michael 44d966574d Some more indexes and other query improvements 2017-01-04 19:13:50 +00:00
Michael 6b6e3e264f Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2017-01-04 13:57:27 +00:00
Roland Häder 42c2e09382 Merge remote-tracking branch 'upstream/develop' into develop 2017-01-04 09:03:00 +01:00
Michael 9a6478b273 Don't be greedy. 2017-01-02 07:00:44 +00:00
Michael 8aaf09f9ee Automatically add a Diaspora mention 2017-01-01 23:18:42 +00:00
Roland Haeder 9ca789b952
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-31 17:59:14 +01:00
Michael 4053499c38 Enable caching wirh comments 2016-12-30 23:18:31 +00:00
Michael 66902c7956 We now also transmit Dislikes 2016-12-30 22:40:30 +00:00
Michael 7cf70b64b8 We now send the participation message as well. 2016-12-30 22:31:21 +00:00
Roland Haeder d2df464d8c
added curly braces + fixed indenting according to code review by Hypolite
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:49:08 +01:00
Roland Haeder d2280d4120
Merge remote-tracking branch 'upstream/develop' into develop
dbm::is_result() calls needed merge

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-30 21:33:41 +01:00
Michael 4928d00e22 Standard stuff 2016-12-30 10:03:02 +00:00
Michael 55ee80338f Events are now shared with Diaspora. 2016-12-30 03:31:38 +00:00
Michael 5222bd2264 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 23:29:01 +00:00
Michael 94977cca18 Events are now done. 2016-12-29 23:27:11 +00:00
Tobias Diekershoff 51155d7716 Merge pull request #3047 from annando/1612-indexlength
New binary data fields to avoid index length problems
2016-12-29 19:11:54 +01:00
Michael 666eb2ddbd Merge branch '1612-diaspora' of github.com:annando/friendica into 1612-diaspora 2016-12-29 17:13:07 +00:00
Michael 9af3f5b0da Improved loggin 2016-12-29 17:11:59 +00:00
Michael 1490f2d3b7 Merge remote-tracking branch 'upstream/develop' into 1612-diaspora 2016-12-29 10:16:10 +00:00
Michael 483f34c4ce We now transmit event data as well 2016-12-29 03:13:57 +00:00
Michael ca0e6cba02 Relaying of Diaspora comments now work with the new fields as well. 2016-12-28 13:30:55 +00:00
Johannes Schwab aab21838a4 Missing self befor class constants 2016-12-28 13:14:03 +01:00
Michael 6a511066c4 Threaded comments will now be transmitted 2016-12-27 14:37:48 +00:00
Michael ce4c542e37 Support for threaded comments 2016-12-27 12:59:15 +00:00
Michael 3ba1ac595f New binary data fields to avoid index length problems 2016-12-25 21:04:10 +00:00
Roland Haeder b7c9d63b7a
Fixed parser errors (opps) + changed # -> // Please do so also as # for comments is deprecated.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 20:09:10 +01:00
Roland Haeder 3dbb92c0dc
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:11 +01:00
Roland Haeder ca82678a6d
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-23 19:51:04 +01:00
Roland Häder 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
Roland Häder 97c507e763
Coding convention applied:
- space between "if" and brace
- curly braces on conditional blocks

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-23 19:49:15 +01:00
rabuzarus e95337e9ae correct doxygen @todo 2016-12-23 18:31:42 +01:00
Roland Häder 5547bc2cc2 Continued rewriting a bit:
- more usage of dbm::is_result()
- nicer look of code

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 17:03:00 +01:00
Roland Häder 9c81b4948e Coding convention applied:
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:59:43 +01:00
Roland Häder 8db0be09b8 Coding convention applied:
- added curly braces
- added space between if/foreach and brace
- avoided 2 return statements (true/false) by replacing them with just one
- added TODO for applying above to all findings

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:58:50 +01:00
Roland Häder 2325d81048 Code style changed:
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:52:28 +01:00
Roland Häder 30642756e5 Code style changed:
- added more curly braces
- made SQL keywords all-uppercase
- added spaces between if/foreach and brace
- // Is for single-line comments *only*, please don't abuse it for multiple
  line comments, use /* */ instead and a asterisk in front of every line.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 16:50:40 +01:00
Roland Häder 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
Roland Häder 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
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
Michael Vogel 9e689e8b9b Merge pull request #3031 from Hypolite/bug/fix-diaspora-people-links
Diaspora: Complete /people/* links from fcontact or author domain
2016-12-22 10:17:44 +01:00
Roland Häder ef5838bbd2 was not missing in develop branch, but here. :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:17 +01:00
Roland Häder 99c8fd36c0 applied coding convention rule
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:10:00 +01:00
Roland Häder d242e72c65 applied coding convention rule
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-22 09:09:27 +01:00
Roland Häder 8b7d5d0efc Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static 2016-12-22 09:06:00 +01:00
Roland Häder 4c04a78d1b Merge remote-tracking branch 'upstream/develop' into develop 2016-12-22 09:03:44 +01:00
rabuzarus 2fcbba9410 provide local time for notifications 2016-12-22 00:28:52 +01:00
rabuzarus 125d2f24dd frio: add profile link to the notifications url 2016-12-21 23:17:55 +01:00
Roland Haeder d3e666f71a
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:12:28 +01:00
Roland Haeder d97b6a2eba
added curly braces/spaces + replace spaces with tabs to fix code indending (or so?)
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 23:04:09 +01:00
Roland Haeder 0436782e70
Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-21 20:01:51 +01:00
Hypolite Petovan 769b849665 url_from_contact_guid: move network constant to arg list 2016-12-20 20:52:42 -05:00
Roland Haeder 3befdc6920
used more App::get_baseurl() instead of get_app()->get_baseurl().
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:54 +01:00
Roland Haeder 7c342600c3
used more App::get_baseurl() instead of get_app()->get_baseurl().
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:51:25 +01:00
Roland Haeder b4bc07fdcc
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:32:00 +01:00
Roland Haeder 536f078ed4
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:31:05 +01:00
Roland Haeder 6c0c9d542a
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:16:49 +01:00
Roland Haeder af2909bf8f
Continued with coding convention:
- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- made some SQL keywords upper-cased and added back-ticks to columns/table names

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-20 21:13:50 +01:00
Hypolite Petovan b631442760 Misc changes to url_from_contact_guid
- Rename url_from_fcontact_guid to url_from_fcontact_guid
- Use network name constant
- Standards
2016-12-20 14:33:33 -05:00
Hypolite Petovan a99532707b Resolve conflict 2016-12-20 12:52:24 -05: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 177f93f9a5 diaspora.php: Standards, standards everywhere 2016-12-20 12:49:50 -05:00
Hypolite Petovan 155e777d19 replace_people_guid: Break down nested calls
- Fix typo in function name
- Fix arguments
- Simplify url_from_fcontact_guid
2016-12-20 12:49:32 -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
Michael 23cef0936f Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes 2016-12-20 16:27:16 +00:00
Roland Häder 361a55155c Don't cherry-pick: reverted unrelated changes (dbm::is_result())
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 16:21:59 +01:00
Michael d72673b162 Only distribute items to active contacts 2016-12-20 16:02:39 +01:00
Michael 4aafbb09a5 The object type "photo" is deprecated and was replaced by "image"
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 16:00:23 +01:00
Michael 1f93024ed6 Workaround for vanished database connections while authentication 2016-12-20 15:59:28 +01:00
Roland Häder a020086128 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-20 15:50:39 +01:00
Tobias Diekershoff d4c3dcf2fc Merge pull request #3032 from annando/1612-auth-ejabber
Workaround for vanished database connections while authentication
2016-12-20 15:45:18 +01:00
Roland Häder b9e4b9f274 Merge remote-tracking branch 'upstream/develop' into develop
Changes in #3034 were somehow conflicting. :-(

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

Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php
2016-12-20 15:44:31 +01:00
Tobias Diekershoff cc16369b6f Merge pull request #3033 from annando/1612-object-type
The object type "photo" is deprecated and was replaced by "image"
2016-12-20 15:44:07 +01:00
Tobias Diekershoff c1193c9c13 Merge pull request #3034 from annando/1612-no-archive
Only distribute items to active contacts
2016-12-20 15:42:41 +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 ace8f753ac added much more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/events.php
	mod/network.php
	mod/suggest.php
	mod/uexport.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
2016-12-20 11:59:13 +01:00
Roland Häder e24c3a5b82 added much more curly braces + space between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:56:34 +01:00
Roland Häder fc9dbc0899 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:28 +01:00
Roland Häder 5588472f6d added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:38:16 +01:00
Roland Häder f3529e7dbc added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:27 +01:00
Roland Häder c86f09a894 added spaces + curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 11:36:03 +01:00
Roland Häder fb0ed18a43 changed to this:
---------------------
function bla (App &$a) {
	$a->bla = 'stuff';
}
---------------------

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:58:03 +01:00
Roland Häder a9bed1422e added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44:59 +01:00
Roland Häder be35349495 added more curyl braces + spaces between "if" and brace
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-20 10:44: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
Michael 37ce5ce886 Remove indexes that we don't use anymore 2016-12-20 07:14:59 +00:00
Michael 4c77ae2fe9 Only distribute items to active contacts 2016-12-20 07:13:22 +00:00
Michael 6e46987515 The object type "photo" is deprecated and was replaced by "image" 2016-12-20 07:10:47 +00:00
Michael 75711a947e Workaround for vanished database connections while authentication 2016-12-20 07:08:03 +00:00
Hypolite Petovan 81d003cad1 Diaspora: Complete /people/* links from fcontact or author domain 2016-12-19 23:30:50 -05:00
Roland Häder dac1dbd3e9 Merge branch 'rewrites/dbm_is_result' into develop 2016-12-19 14:47:05 +01:00
Roland Häder 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
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 4615f39836 Merge remote-tracking branch 'upstream/develop' into develop 2016-12-19 14:21:26 +01:00
Roland Häder 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
Michael 8cab220387 Bugfix: Reimported Friendica posts from pump.io had the links missing. 2016-12-18 23:39:44 +00:00
Michael 3f6fd4bf84 Mastodon: Hopefully we can now detect reshares better 2016-12-18 20:34:34 +00:00
Michael a8e80ef0a6 Ostatus: The follow/unfollow XML should now be even more compliant. 2016-12-18 20:02:13 +00:00
Michael 099f51c7b5 Removal of test code 2016-12-18 17:36:48 +00:00
Michael bc323b0bfa OStatus: Follow/Unfollow should now work again. 2016-12-18 17:10:38 +00:00
Roland Häder f89044ed61 Garrr ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:07:21 +01:00
Roland Häder 9c564c4fd3 Again, static *OR* object-referencing calls? Blue or red pill?
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:06:20 +01:00
Roland Häder 2eb3727542 Again, static *OR* object-referencing calls? Blue or red pill?
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 10:05:18 +01:00
Roland Häder 378cbd9027 Continued with #3010:
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:59:13 +01:00
Roland Häder 8e1796bb1f Continued with #3010:
- more reverts of $a->get_baseurl()
- you always do: function foo (&$a), please read my TODO why it is not so good.
- for now I have fixed this inconsistency (compared to other method signatures)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:57:55 +01:00
Roland Häder d26009e408 Garrr ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:52:15 +01:00
Roland Häder 1c82ad0734 Opps, tpzo found ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:21 +01:00
Roland Häder 8ad1bdaac1 Opps, tpzo found ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:51:06 +01:00
Roland Häder d4f737577b And more reverts:
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:17 +01:00
Roland Häder f42935421e And more reverts:
- $a->get_baseurl() -> App::get_baseurl()
- was_recently_delayed() (entirely)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:49:00 +01:00
Roland Häder dea8bef472 more reverts ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:57 +01:00
Roland Häder 7849b3f8e3 more reverts ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:32:32 +01:00
Roland Häder ba3bc420ca Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:59 +01:00
Roland Häder 6cef88c24e Also reverted these + added spaces for nicer appearance.
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-15 09:23:41 +01:00
Michael 53417aaf39 Create missing self contact 2016-12-15 07:15:33 +00:00
Roland Haeder 9e28f5a0c3 fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:51:38 +01:00
Roland Haeder c830bfcd96
fixed SQL writing: keywords upper-case, column/table names in back-ticks. #3010
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-12-14 20:50:39 +01:00
Roland Häder ab50585e9a reverted change (which duplicated above query), thanks to @annano to point this out. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:56 +01:00
Roland Häder cef6fce7f0 reverted change (which duplicated above query), thanks to @annano to point this out. #3010
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:41:28 +01:00
Roland Häder 467cdfeb34 3 slashes for Doxygen, 2 are enough for PHP ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:45 +01:00
Roland Häder ba45a292c4 3 slashes for Doxygen, 2 are enough for PHP ... :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:28:18 +01:00
Roland Häder 41db906dc4 Continued with #3010:
- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla'; will be FALSE
  (means found http at start), too.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 17:02:10 +01:00
Roland Häder 23d4db5149 Continued with #3010:
- removed added debug messages (maybe they will come back in accordance to
  code-style guidelines?)
- converted $a->get_baseurl() back to App::get_baseurl()
- reverted back other code I have touched/merged as this was double:
  (substr($url, 0, 4) !== 'http') on $url = 'https://bla'; will be FALSE
  (means found http at start), too.

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:59:35 +01:00
Roland Häder 307df4ee5c Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:41:23 +01:00
Roland Häder b21a1437f4 Also removed this, seems to come in from wrong merging? #3010 Thanks to @annando
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 16:39:39 +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 b5776ab959 Fixes for #3010:
- used static call, still App::get_baseurl() wraps it into an object-referencing
  call which seems to be a bit redundant?
- added spaces around dot (see one line below)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-14 09:49:52 +01:00
Roland Häder 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
Roland Häder a8dc8b288c import dbm here to avoid adding everywhere the namespace (if later changed,
only here it needs change, cool ha? ;-)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 15:24:44 +01:00
Roland Häder 797de5bfe0 Nope, get_basepath() should be static, then also mark it as static (in signature).
Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 14:53:57 +01:00
Roland Häder 63610c7b73 Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php
2016-12-13 11:00:44 +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
Roland Häder 293436e5fd Some rewrites:
- max_proccesses_reach() and maxload_reached() (why no _ behind max?) are called
  both way, static and with object reference.
- this is strongly discouraged and should be avoided as its support (in PHP) may
  be dropped in future releases.
- used $a = get_app(); to encapsulate code (even when the function does
  currently the same, it may be changed later)

Signed-off-by: Roland Häder <roland@mxchange.org>
2016-12-13 10:16:36 +01:00
Michael 73e330abbe Restore empty line 2016-12-12 06:51:08 +00:00
Michael 17f15e793f Issue 2999: Better Mastodon handling 2016-12-12 06:46:02 +00:00
Tobias Diekershoff 352b168e2d Merge pull request #3007 from annando/1607-performance
Some more performance stuff
2016-12-12 07:04:16 +01:00
Michael 0c99cee092 Some logging to detect possible problems with the probing 2016-12-11 18:39:39 +00:00
Michael 5c04402448 String is no integer 2016-12-11 17:37:12 +00:00
Michael c666c98559 Code bautification 2016-12-10 12:28:49 +00:00
Michael 00c74a7d6d Some more ... 2016-12-10 12:21:16 +00:00
Michael 5572bd0cf9 Redo the index changes for testing purposes 2016-12-10 12:19:57 +00:00
Michael fc3c1601b1 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-12-10 12:18:11 +00:00
Michael Vogel af42e5e481 Merge pull request #2932 from Hypolite/issue/missing-private-image-src
Fix Friendica private image URL replacing
2016-12-09 15:54:11 +01:00
Tobias Diekershoff 4059e58bbf Merge pull request #2990 from Hypolite/fix-diaspora-medium-link
Improve diaspora2bb autolinker
2016-12-08 21:11:47 +01:00
Hypolite Petovan cd354d3a57 Adding default protocols on missing config value for backward compatibility 2016-12-07 23:18:10 -05:00
Hypolite Petovan 88e336b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into issue/missing-private-image-src
# Conflicts:
#	doc/htconfig.md
2016-12-07 23:15:46 -05:00
Hypolite Petovan e29023dc8c Standards 2016-12-07 23:11:53 -05:00
Hypolite Petovan aef2c7373c Formatting 2016-12-05 22:48:02 -05:00
Hypolite Petovan d0cb8cdccf Fixs edge case where single stars on succeeding lines are wrongly turned into multi-line <em> 2016-12-05 22:47:52 -05:00
Hypolite Petovan 60b9203dd5 Add <br> for each carriage return
Fixes #2993
2016-12-05 22:46:51 -05:00
Hypolite Petovan 2b75ad5e0a src and href attributes sanitization touchups
- Use Config::get
- Add default to config call
- Add always allowed protocol to href
- Remove relative root URLs from allowed forms
2016-12-04 21:33:29 -05:00
Hypolite Petovan 5e20aed428 Revert adding a leading slash to redir links 2016-12-04 21:31:28 -05:00
Tobias Diekershoff 9899c30d0f Merge pull request #2991 from rabuzarus/20161204_-_allowfullscreen
Bugfix: Fix full screen for embedded videos
2016-12-04 17:49:15 +01:00
rabuzarus 3d4e1176ec Bugfix: cached data doesn't need to get unserialized anymore 2016-12-04 15:15:23 +01:00
rabuzarus 5ca93d0541 Bugfix: Fix full screen for embedded videos 2016-12-04 14:55:57 +01:00
Hypolite Petovan 166df0180b Improve diaspora2bb autolinker for URLs
- Add @ support for URLs (Medium URLs)
- Exclude trailing commas from autolinked URLs, likely to be normal text
- Formatting
2016-12-03 22:04:13 -05:00
Hypolite Petovan 979fc6d38a Add protocol whitelist for href/src attributes
- Add strict URL checker for src attributes
- Add protocol whitelist for href attributes
- Add error styling if URL fails to pass filter
- Add doc for new htconfig value
- Add emphasis to config key names in htconfig doc
2016-12-03 14:19:57 -05:00
Hypolite Petovan 47a370c5e3 Revert adding baseurl to private image URL 2016-12-03 10:39:06 -05:00
Hypolite Petovan 0f2c27e041 Merge branch 'develop' into issue/missing-private-image-src 2016-12-03 10:34:48 -05:00
Michael 6619e0791d Much more standards 2016-12-01 22:52:35 +00:00
Michael 13150c09a5 File was missing 2016-12-01 21:11:52 +00:00
Michael 6845775ff9 Store spooled data 2016-12-01 20:53:18 +00:00
Michael c5d571287c Merge branch '1612-spool' of github.com:annando/friendica into 1612-spool 2016-12-01 13:58:47 +00:00
Michael eff4ad2e0a Spool items that couldn't be stored 2016-12-01 13:50:26 +00:00
Tobias Diekershoff 6ef69ad2da Merge pull request #2983 from annando/issue-2915-2918
Disable richtext editor for frio - followup for #2938
2016-12-01 14:10:08 +01:00
Tobias Diekershoff 1fc35d5f44 Merge pull request #2979 from annando/issue-2772
Issue 2772: Pending contacts should now be displayed
2016-12-01 08:51:04 +01:00
Michael 57c95c93e1 The frontend worker is now working as a full replacement for the crontab. 2016-11-30 19:24:58 +00:00
Michael 63389ba23d Pending or blocked - that's the question ... 2016-11-30 04:30:48 +00:00
Michael cc5eebd173 The frontend worker can now fork background processes 2016-11-29 22:40:19 +00:00
Michael 624fabf884 Somehow the changes of pull request 2748 got vanished 2016-11-29 20:25:27 +00:00
Michael d49325d177 Disable richtext editor for frio - followup for #2938 2016-11-29 20:04:31 +00:00
Michael Vogel efb2df41ba Merge pull request #2977 from rabuzarus/20161128_-_help_page_polishing
Add protocol docu to the help docs
2016-11-29 19:38:31 +01:00
Michael af3549fa01 The first check for "pending" isn't neccessary. 2016-11-29 18:31:37 +00:00
Michael b2302f6290 Maybe we shouldn't count pending contacts 2016-11-29 18:23:34 +00:00
rabuzarus 250f978872 Merge pull request #2978 from annando/issue-2518
Issue 2518: Remove contact data in the background
2016-11-29 14:59:00 +01:00
Tobias Diekershoff d55d500e35 Merge pull request #2975 from annando/1611-frontend-worker
The worker can now run from the frontend as well
2016-11-29 09:40:59 +01:00
Michael fd28ecaacc Pending contacts shouldn't be displayed in the sidebar 2016-11-29 06:40:35 +00:00
Michael eede89f537 Some brackets added 2016-11-28 22:18:37 +00:00
Michael 3a76a6766f Issue 2772: Pending contacts should now be displayed 2016-11-28 22:11:13 +00:00
Michael e7ef34298a remove "blubb" 2016-11-28 21:48:06 +00:00
Michael a38a5019d0 Issue 2518: Remove contact data in the background 2016-11-28 21:44:04 +00:00
Michael Vogel 9894f7cea7 Merge pull request #2965 from tobiasd/20161122-cpActiveResponse
active response
2016-11-28 21:14:42 +01:00
Michael Vogel 37e8f6b442 Merge pull request #2973 from rabuzarus/berlin_parse_url
parse_url: recognize image/video/audio files + move functions into own class
2016-11-28 21:05:31 +01:00
rabuzarus ac39928e5d upload connection graphics & update doxygen headers to insert link to the spec 2016-11-28 16:23:47 +01:00
rabuzarus f229d65f85 ParseUrl: some docu work 2016-11-27 23:41:55 +01:00
rabuzarus 85b51ee41c xml:php - some code standard work 2016-11-27 20:42:40 +01:00
rabuzarus 56e38dd6bd move function deletenode() to the xml class 2016-11-27 20:19:43 +01:00
Michael 636a033364 Added documentation, config stuff, ... 2016-11-27 09:02:08 +00:00
Michael d71321c834 Some added documentation 2016-11-27 01:11:22 +00:00
Michael e856ab9a09 The worker can now run from the frontend as well 2016-11-27 00:55:05 +00:00
Michael ba1a304589 Delivery to other systems was needlessly deferred. 2016-11-24 03:34:11 +00:00
rabuzarus e9226eaf45 parse_url: recognize image/video/audio files + move functions into own class 2016-11-24 01:11:22 +01:00
Michael Vogel 4eeb5a0a17 Merge pull request #2969 from gerhard6380/develop
Develop
2016-11-23 05:13:31 +01:00
Hypolite Petovan 4937a3b7d8 Add the self property to conversation responses
- Add a condition to check if the current user is amongst the responses
- Populate the responses array with the self attribute
2016-11-22 18:35:19 +01:00
Michael edbdd0e34a Bugfix: We should only search in the current database for MyISAM tables 2016-11-22 16:47:08 +00:00
Michael Vogel 46ba1a46f5 Merge pull request #2896 from rabuzarus/0311_fix_photo_albums
chache: check for valid serialized data + uncomment caching of contac…
2016-11-21 04:04:36 +01:00
Michael 3de862712d Issue 2772: Posts from pending contacts should be displayed as well. 2016-11-20 16:52:57 +00:00
rabuzarus 721ac5fb9e cache: use unserialize(false) 2016-11-20 17:32:37 +01:00
Hypolite Petovan 003e6a7371 Improve BBCode javascript stripping regex 2016-11-19 18:01:45 -05:00
Tobias Diekershoff 914330bb8f Merge pull request #2940 from annando/1611-dead-contacts
Mark contacts as dead or undead while transmitting and receiving messages
2016-11-19 22:59:57 +01:00
Michael 89d5aa64ba Mark contacts as dead or undead while transmitting and receiving messages 2016-11-19 20:10:29 +00:00
Tobias Diekershoff b95bf00e89 Additional info in registration request 2016-11-19 18:22:49 +01:00
Tobias Diekershoff a7dae15e82 added return value to doxygen header 2016-11-19 14:34:06 +01:00
Tobias Diekershoff 32c0a9ef43 added return value to doxygen header 2016-11-19 14:32:01 +01:00
Hypolite Petovan c2eb2f460b Fix Friendica private image URL replacing
- Add baseurl to redir_private_images to prevent empty src attribute in
generated HTML
- URL encode the URL parameter url and conurl
- Formatting
- Documentation
2016-11-18 22:05:56 -05:00
Tobias Diekershoff f4c52f5a0e send email confirming pending registration #2916 2016-11-18 20:16:22 +01:00
Michael ccd484643d Polling feeds is now done with a higher priority. 2016-11-17 23:06:22 +00:00
rabuzarus 0f81411b26 Bugfix: avatar images for activty like was not shown notifications page 2016-11-16 13:21:13 +01:00
Michael b1999459af Removed commented code 2016-11-16 06:29:30 +00:00
Michael 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
rabuzarus e4a625ad12 Bugfix: seen status was not handled correcty on the notifications page 2016-11-16 04:57:55 +01:00
Tobias Diekershoff b628e82465 Merge pull request #2910 from annando/1611-slinky
Several shorteners doesn't work anymore
2016-11-15 09:53:38 +01:00
Tobias Diekershoff 44d79cbc27 Merge pull request #2911 from annando/1611-well-formatted-uri
URI of "remote self" are looking better now.
2016-11-15 09:53:14 +01:00
Michael d4e3bc1924 Added documentation 2016-11-15 07:05:43 +00:00
rabuzarus 9878974e1f fix photos page permissions 2016-11-14 18:49:51 +01:00
Jens Tautenhahn 31ad26aae2 Merge remote-tracking branch 'upstream/develop' into develop 2016-11-14 09:52:01 +01:00
Michael 88d073f3d9 URI of "remote self" are looking better now. 2016-11-14 06:55:17 +00:00
Michael 5ef688f1d2 Case correction 2016-11-14 05:44:18 +00:00
Michael 3de7b6d6ce Several shorteners doesn't work anymore 2016-11-13 19:19:35 +00:00
Michael 1aa9b7242d Merge remote-tracking branch 'upstream/develop' into 1611-parseurl 2016-11-13 19:12:11 +00:00
Michael 6dfaa5a95f Some more standard stuff 2016-11-13 19:09:47 +00:00
Michael e925c4139c Some documentation 2016-11-13 18:28:55 +00:00
Michael 26936755d9 Bugfix: Locations without coordinates aren't good for Diaspora 2016-11-13 17:42:26 +00:00
Michael 2937df21ad Standard stuff 2016-11-13 08:50:01 +00:00
Michael e5f55a5919 Improved handling with wrong formatted urls and fetchinfo 2016-11-12 20:23:00 +00:00
Michael d24e3a6a92 Removed "&" 2016-11-12 17:20:26 +00:00
Michael e6148f4c1c Performance improvements when storing items (via API) 2016-11-12 13:17:28 +00:00
gerhard6380 623d809cc3 changes in api call for showing profiles and disable proxy for images in html code for api calls 2016-11-09 21:35:52 +01:00
Jens Tautenhahn 12dd657868 fixes an sql error in NotificationsManager 2016-11-09 21:32:15 +01:00
rabuzarus d025b83c93 ref_session_write: fix update for entry in the session table 2016-11-07 22:25:09 +01:00
rabuzarus a337021c31 chache: correct misspelling 2016-11-07 22:20:13 +01:00
rabuzarus 915689dd79 chache: check for valid serialized data + uncomment caching of contact suggestion 2016-11-07 22:12:11 +01:00
Hypolite Petovan 67cdbe4538 misc performance: restore session write condition, keep 1 query 2016-11-06 01:00:17 -04:00
Hypolite Petovan 7b9470b804 misc performance: remove extraneous session write DB query 2016-11-06 00:52:31 -04:00
Hypolite Petovan bae9f0852f misc performance: cache contact details by url during script 2016-11-06 00:51:23 -04:00
Tobias Diekershoff 27a2e44d89 Merge pull request #2888 from annando/1610-priority-dbclean
Improved priorities and some more dbclean queries
2016-11-05 08:27:02 +01:00
Tobias Diekershoff ba1cd57087 Merge pull request #2887 from annando/1611-api-performance
API calls should be much faster than before
2016-11-05 08:25:09 +01:00
Michael 4b33573c20 Merge remote-tracking branch 'upstream/develop' into 1610-priority-dbclean 2016-11-05 05:25:22 +00:00
Michael Vogel 50651340ce Merge pull request #2886 from rabuzarus/0311_fix_photo_albums
cache: serialize the cache content directly in the cache class
2016-11-05 06:12:29 +01:00
Michael 37985a0d3f Use "micro" 2016-11-04 22:56:50 +00:00
Michael fbfaef1968 API calls should be much faster than before 2016-11-04 22:45:20 +00:00
rabuzarus e446e9571f some more coding style correction 2016-11-04 19:26:28 +01:00
rabuzarus 5459b00499 cache: serialize the cache content directly in the cache class 2016-11-04 16:44:49 +01:00
rabuzarus 75166cae27 Merge pull request #2882 from Hypolite/improvement/bbcode-documentation
BBCodes documentation improvement
2016-11-04 02:34:29 +01:00
Hypolite Petovan 3579a14945 bbcode documentation: minor formatting changes 2016-11-03 21:01:09 -04:00
Tobias Diekershoff 3a2ec5e4db missing placeholder for name_cache value 2016-11-03 14:00:20 +01:00
Michael Vogel 9dd3e9d19a Merge pull request #2878 from Hypolite/improvement/ping-performance
Improving ping.php performance
2016-11-02 21:56:18 +01:00
Hypolite Petovan aff467adf2 bbcode documentation: improve cleancss 2016-11-01 23:08:26 -04:00
Hypolite Petovan 73627df520 Merge branch 'develop' into improvement/bbcode-documentation 2016-11-01 19:29:56 -04:00
Michael b5d004e1d7 run dbclean as long as there is some data to be purged 2016-11-01 21:36:15 +00:00
Hypolite Petovan 5e188a9250 ping.php improvement: datetime.php formatting 2016-11-01 02:04:59 -04:00
Michael 4d966e1e21 Changed priority for onepoll/further enhancement for dbclean 2016-10-31 21:32:08 +00:00
Hypolite Petovan 63b1e822cd bbcode documentation: improved webfinger profile regexp 2016-10-31 00:00:12 -04:00
Hypolite Petovan c2e17cb9c4 bbcode documentation: fix broken bookmark form: #^[url]...[/url]
- Prevents the advance recognition of `^` in tags before bbcode()
- Formatting
- Documentation
2016-10-30 23:59:14 -04:00
Michael 2e59eec35d Added some comments 2016-10-29 22:06:18 +00:00
Michael 8ab90f02c3 Shadow entry mechanism improved 2016-10-29 21:27:56 +00:00
Michael 7bd79c67a7 Avoiding deadlocks and small sql improvements 2016-10-29 20:17:33 +00:00
Hypolite Petovan 8e50254bb9 Merge branch 'develop' into improvement/ping-performance 2016-10-28 22:26:38 -04:00
Hypolite Petovan 0131656a06 ping.php perfomance: reverting useless session write changes 2016-10-28 22:15:24 -04:00
Hypolite Petovan bc407080d2 ping.php performance: improve documentation and formatting 2016-10-28 22:14:51 -04:00
rabuzarus a65479ccfd Merge pull request #2861 from annando/1610-performance
Some more performance stuff
2016-10-28 22:24:35 +02:00
Hypolite Petovan f1c855e755 ping.php performance: Cache notification bbcode
- Add two fields to notifiy table to store cached bbcode result
- Add bbcode conversion on notif creation
- Add postfact caching if cache field is empty on retrieval
2016-10-28 06:28:16 -04:00
Hypolite Petovan 747f902e21 ping.php performance: optimizing session_write queries 2016-10-28 05:55:19 -04:00
Hypolite Petovan 63e5342ced ping.php performance: removing datetime_convert 2016-10-28 05:54:26 -04:00
Michael d78b4e7ffc We are doing uncommitted reads a little bit different. (We avoid commit) 2016-10-28 09:08:13 +00:00
Michael bebcbd04d3 We should check values after we fetched them :-) 2016-10-28 04:29:22 +00:00
Michael 6601e8c2b7 Prevent a memory Access Violation when the database isn't connected 2016-10-27 20:16:56 +00:00
Michael 3f0656fdbd Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-27 12:18:45 +00:00
Michael 86adaddca4 dbclean.php mustn't be stopped via "killme" 2016-10-26 05:57:11 +00:00
Michael Vogel 4996003800 Merge pull request #2874 from Hypolite/bug/fix-pgettext-typo
Fix pgettext function name typo
2016-10-25 22:31:59 +02:00
Michael 967ecb4205 Merge remote-tracking branch 'upstream/develop' into 1610-performance
Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php
2016-10-25 16:16:01 +00:00
Michael Vogel 4fdced1a0a Merge pull request #2862 from Hypolite/settings-save-perf
Performance improvements: Settings save (alt), profiler, logger
2016-10-25 07:56:11 +02:00
Michael Vogel 80efc422bf Added documentation 2016-10-25 05:44:57 +00:00
Hypolite Petovan a9e90d111d Restore newline at end of file 2016-10-24 22:18:22 -04:00
Hypolite Petovan 2fc2a1a228 Fix typo in get_available_languages function name
- Add Doxygen comment block
- Fix formatting
- Renamed variable for faster understanding
2016-10-24 22:17:02 -04:00
Hypolite Petovan d0b95e642f Reverted changes to config 2016-10-24 11:57:17 -04:00
rabuzarus b0d6c244c5 function nav_info(): insert lost comment 2016-10-24 14:02:38 +02:00
Michael Vogel 3463a442ba Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-24 08:12:13 +00:00
Michael Vogel 8cab3b5592 More transactions, more queries on uncommitted data 2016-10-24 08:10:27 +00:00
Michael Vogel 47b8975bb6 poller.php is now working with transactions as well. 2016-10-23 23:31:56 +00:00
Michael Vogel 1ade94fd8a Some code reformatting 2016-10-23 23:14:35 +00:00
Michael Vogel b99f5b576e Fixed code structure 2016-10-23 22:12:45 +00:00
Michael Vogel ee5ada6991 We now use memcache if configured and installed. 2016-10-23 21:59:40 +00:00
Michael Vogel deb2fee2f0 pconfig: Improved behaviour with already stored values 2016-10-23 07:49:21 +00:00
Hypolite Petovan 437ae412fa More include/nav.php formatting
- Add Doxygen comment block for `nav_info()`
- Remove superfluous by-reference symbol and added type hinting to
`nav_info()` declaration
- More formatting
2016-10-22 22:58:44 -04: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
Hypolite Petovan b806f87874 Formatting changes to make @annando happy 2016-10-22 13:54:30 -04:00
Michael Vogel 561f45b83b And again ... 2016-10-22 10:33:18 +00:00
Michael Vogel 66da84d1a9 Just some more code adjustments 2016-10-22 10:21:43 +00:00
Michael Vogel b429b85680 CSR changes, split dbclean in separate processes if worker is active 2016-10-22 10:14:41 +00:00
Michael Vogel 31409e2ca1 dbclean is restructured 2016-10-22 04:57:52 +00:00
Hypolite Petovan f9d713b228 Settings save: Switch from strict to fuzzy comparison 2016-10-21 23:23:44 -04:00
Hypolite Petovan 9a59878190 Standards enforcing 2016-10-21 23:08:42 -04:00
Hypolite Petovan 44d5dec06f Improve logger performance
- Reorder condition to prevent constant lookup (one-time ~3,500 substr)
- Enforce coding standards
2016-10-21 23:00:05 -04:00
Michael Vogel bc324c3ef4 Setting for the callstack in the database query added 2016-10-21 23:42:45 +00:00
Michael Vogel a8bef370d3 Some code adjustements and performance improvements to the DFRN feed. 2016-10-21 23:04:04 +00:00
Michael Vogel 501c45def5 Some more improved queries 2016-10-21 18:25:21 +00:00
Michael Vogel fd2d8cc180 Orphans are removed without giant lock problems 2016-10-20 22:05:21 +00:00
Michael Vogel abb827b784 Merge remote-tracking branch 'upstream/develop' into 1610-performance 2016-10-20 08:44:19 +00:00
Tobias Diekershoff 2d0c56fd37 Merge pull request #2866 from annando/1610-probe-hidden-profile
Bugfix: probing failed when a profile was hidden
2016-10-20 08:33:44 +02:00
Michael Vogel 4269315d8f Bugfix: probing failed when a profile was hidden 2016-10-20 06:04:11 +00:00
Michael Vogel 493d7bc698 Remove orphaned data 2016-10-19 21:06:37 +00:00
Hypolite Petovan a5923bdd4f Wrong whitespaces 2016-10-17 17:00:06 -04:00
Hypolite Petovan 62bd32c1ac Improve performance of settings save by not querying the DB if submitted value is the same 2016-10-17 16:54:22 -04:00
Hypolite Petovan c168d7d4ca Enforce coding standards in Config.php and PConfig.php 2016-10-17 16:53:37 -04:00
Michael Vogel 3e5cf5290e Improved queries, more uncommitted queries 2016-10-17 18:38:51 +00:00
Michael Vogel e09c55527c Merge pull request #2856 from rabuzarus/0510-update_fullcalendar
update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover
2016-10-16 18:04:11 +02:00
rabuzarus 8064ff6ecb update to fullCalendar 3.0.1, frio: cal list view, frio: cal month hover 2016-10-16 16:04:53 +02:00
Michael Vogel e5c7ce0902 Use "last-item" in the contact table instead of an expensive sql query 2016-10-14 05:45:32 +00:00
Michael Vogel a47ae788ba Improved logging 2016-10-11 06:30:53 +00:00
Michael Vogel ef6a23caf3 Worker: Reserve some space for low priority processes 2016-10-10 21:01:36 +00:00
Michael Vogel 9cdecd8ec8 webfinger_dfrn now work as expected 2016-10-09 10:47:47 +00:00
Michael Vogel 4322b56c0b Ensure that with multiple entries the newest one will be fetched 2016-10-09 07:18:52 +00:00
Michael Vogel 4404bf1651 The creation of unique keys failed for MariaDB 2016-10-09 07:01:19 +00:00
Tobias Diekershoff a1c63994d2 Merge pull request #2851 from annando/1610-performance-nodeinfo
Performance improvements to item storage and nodeinfo
2016-10-08 08:42:50 +02:00
Hypolite Petovan bb800f2992 Improve comment 2016-10-07 08:33:13 -04:00
Michael Vogel 94f7debb52 Loglines removed 2016-10-07 11:08:36 +00:00
Michael Vogel 6abac720e2 Small performance tweaks for "item_store" as well. 2016-10-07 06:05:43 +00:00
Hypolite Petovan 645fd414d5 Merge remote-tracking branch 'refs/remotes/origin/develop' into Issue-#2816-2 2016-10-06 20:58:28 -04:00
Michael Vogel a81f5859ad Mastodon is now detected as OStatus network 2016-10-05 20:54:26 +00:00
Michael Vogel aca6f63985 Merge remote-tracking branch 'upstream/develop' into 1610-performance-nodeinfo 2016-10-05 16:19:42 +00:00
Michael Vogel 5fb2e47809 Increased performance when storing items 2016-10-05 16:12:53 +00:00
Hypolite Petovan c1611fd3f6 Fix Issue #2816 - Add backward compatible server_info support 2016-10-04 23:43:44 -04:00
Michael Vogel 87300b2b49 When we have the field, we should use it :) 2016-10-04 03:58:47 +00:00
Michael Vogel 8cde8b375b Merge remote-tracking branch 'upstream/develop' into 1610-gcontact-type 2016-10-04 03:52:22 +00:00
Michael Vogel 095fa872ed Contact Type is now transmitted via poco 2016-10-04 03:48:01 +00:00
Michael Vogel 860f11e71b Merge pull request #2842 from tobiasd/20160929-lng
lang handling for #2752
2016-10-04 05:22:38 +02:00
Hypolite Petovan a052fe4a98 Fix Issue #2816 - MySQL version typo 2016-10-03 19:17:40 -04:00
Hypolite Petovan 0e8ae82a5c Fix Issue #2816 - Add MySQL version condition for IGNORE
- Checks for MySQL version before adding the IGNORE keyword on index
creation
- Added new dryrun command to usage text
2016-10-03 19:06:47 -04:00
Hypolite Petovan b3ac6189b3 Merge remote-tracking branch 'friendica/develop' into Issue-#2816-2 2016-10-03 19:04:57 -04:00
Tobias Diekershoff bb423ff9b4 rework fallback code 2016-10-03 21:12:47 +02:00
Michael Vogel 6d16c39b7e dbstructure now switches in the maintenance mode when updating 2016-10-02 13:52:52 +00:00
rabuzarus fa33f94b29 Merge pull request #2830 from annando/1610-account_type
The account type is now read and displayed
2016-10-02 14:55:52 +02:00
Michael Vogel 116520e733 Merge pull request #2837 from rabuzarus/0210-add-missing-at-brief
fix @brief in doxygen for function oembed_iframe()
2016-10-02 09:47:55 +02:00
Tobias Diekershoff ed631ba959 fallback to generic language for specific (de-CH => de) 2016-10-02 09:26:35 +02:00
Michael Vogel ca53881cd3 Some more explanations 2016-10-02 06:40:08 +00:00
rabuzarus aba6f2bf27 fix @brief in doxygen for function oembed_iframe() 2016-10-02 06:04:34 +02:00
Hypolite Petovan 3f619726b1 Fix Issue #2816 - Update dbstructure instead of update
- Add UNIQUE index support to `update_structure()`
- Move DB update from `update.php` to `dbstructure.php`
- Update DB_VERSION to 1210
2016-10-01 23:29:30 -04:00
rabuzarus 8fa64c43d6 Merge pull request #2818 from Hypolite/Issue-#2813
Fix Issue #2813 - Double notification + wrong message for requested registrations
2016-10-02 05:14:05 +02:00
Hypolite Petovan 3c85fb8c9a Fix Issue #2816
- Change (P)Config::set to use INSERT >>> ON DUPLICATE KEY UPDATE
- Add DB update
2016-10-01 21:40:41 -04: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
Tobias Diekershoff 8b972510fe with translations now in /view/lang/lng shift the array index along 2016-10-01 16:07:23 +02:00
Tobias Diekershoff aba8313b21 don't save browser selected language on login 2016-10-01 15:57:37 +02:00
Tobias Diekershoff 82dcc3fe79 Merge pull request #2821 from Hypolite/Issue-#2817
Fix #2817 - Move translation language folder in a subfolder of view
2016-10-01 10:58:32 +02:00
Tobias Diekershoff 4eaa0c4892 Merge pull request #2826 from annando/1610-utf8mb4
Support of utf8mb4
2016-10-01 10:51:33 +02:00
Michael Vogel 40fbe1644d Merge pull request #2824 from Hypolite/Issue-#2823
Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
2016-10-01 10:40:08 +02:00
Michael Vogel f4f09f08b5 Removed unneeded line 2016-10-01 08:33:09 +00:00
Michael Vogel efd574ab83 Support of utf8mb4 2016-10-01 08:21:37 +00:00
Hypolite Petovan 76b1b109e5 Fix Issue #2823 - Ugly scrollbars in oembed iframes and broken resizing
- Fix _resizeIframe function, shorten the timeout between calls
- Simplify the oembed iframe generation code and reduce the minimum
iframe height to 200px
- Add smooth CSS transition for iframe resizing
2016-09-30 23:26:22 -04:00
Hypolite Petovan 8fc558b8e6 Fix #2817
- Change all references to language folders
2016-09-30 10:46:56 -04:00
Hypolite Petovan 76382147ae Fix Issue #2816
- Fix wrong variable name in Config and PConfig
2016-09-30 09:22:35 -04:00
Hypolite Petovan f9678bb6c3 Remove extraneous comments
- If needed, the version control system can be used to restore this code
2016-09-30 09:22:00 -04:00
Hypolite Petovan f0382bb159 Restore admin notification email on register approval
- Reverted changes to mod/register.php
- Added "show_in_notification_page" flag to prevent `notify` DB
insertion
2016-09-30 08:57:16 -04:00
Tobias Diekershoff 92dac133a0 Merge pull request #2815 from annando/1609-mysql
We should only use utf8mb4 for dumpsql and new installations
2016-09-29 09:26:17 +02:00
Michael Vogel 6b318ed304 We should only use utf8mb4 for dumpsql and new installations 2016-09-29 06:31:42 +00:00
Tobias Diekershoff 1cfcc939c0 Merge pull request #2790 from gerhard6380/develop
New API /api/friendica/profile/show
2016-09-28 08:11:20 +02:00
Tobias Diekershoff 4aa834564a Merge pull request #2802 from annando/xmpp-profile
New fields for the DFRN protocol (XMPP and Account Type)
2016-09-27 20:57:56 +02:00
Michael Vogel d632d282cd We are now having an account type and are publishing it 2016-09-25 20:37:27 +00:00
gerhard6380 6c3c3a64ae remove parameter from doxygen description 2016-09-25 22:25:59 +02:00
gerhard6380 0e8a9f93d7 another correction of spaces 2016-09-25 18:52:59 +02:00
gerhard6380 0581cbcfc8 change spaces/tabstopps 2016-09-25 18:50:08 +02:00
gerhard6380 5e1726184a correct some spaces/tabs 2016-09-25 18:45:00 +02:00
gerhard6380 01ff105a43 correct tab indents and CRLF 2016-09-25 18:22:42 +02:00
Michael Vogel 196eb6009f The XMPP address is now in the profile and will be transmitted 2016-09-25 15:28:00 +00:00
Tobias Diekershoff 252f1827c1 correction of typos 2016-09-24 08:08:04 +02:00
Tobias Diekershoff 1ea9df5974 correction of typos 2016-09-24 08:07:48 +02:00
gerhard6380 528a492282 Merge branch 'develop' of https://github.com/gerhard6380/friendica into develop 2016-09-23 19:38:57 +02:00
gerhard6380 afc7d316a7 Change API documentation to contain new API call /api/friendica/profile/show 2016-09-23 19:26:44 +02:00
gerhard6380 4de12dacc7 New API /api/friendica/profile/show to return data of all profiles a user has to a client 2016-09-23 19:06:41 +02:00
Michael Vogel 5f9a392fc4 At the search we should do it as well. 2016-09-23 06:36:48 +00:00
Michael Vogel 6fd54df940 Some additional beautification 2016-09-22 18:18:26 +00:00
Michael Vogel abbf501602 The string is an array ... 2016-09-22 18:07:32 +00:00
Michael Vogel c6f50d0468 Reworked ejabberd authentification 2016-09-22 02:57:40 +00:00
Roland Haeder 50d168ab6b
Use more dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-19 22:13:33 +02:00
Roland Haeder 636164e9ef
Opps, wrong brace and removed invert of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:31:27 +02:00
Roland Haeder c825cc8d0d
This merge brings back dbm::is_result() where I could find it.
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-09-18 23:21:18 +02:00
Michael Vogel 4f5997f30a XMPP authentification for multi domain systems 2016-09-13 20:29:47 +00:00
Michael Vogel 1caa87dce6 Restructured the way, processes are inserted and removed 2016-09-09 20:55:49 +00:00
Michael Vogel 22f32d9721 New process table for a better detection of running workers 2016-09-09 20:33:54 +00:00
Michael Vogel ac1787d1e5 Merge remote-tracking branch 'upstream/3.5rc' into sql-default-value 2016-09-05 11:52:41 +00:00
Michael Vogel 1cb6043aea Attachments are now displayed again. 2016-09-04 18:06:07 +02:00
Michael Vogel 6e25077893 Merge pull request #2760 from gerhard6380/3.5rc
API: change friendica_activities to include arrays of users
2016-09-03 20:47:52 +02:00
Michael Vogel 6df40b1161 sQL: No "NOT NULL" on text fields. 2016-09-03 15:06:42 +00:00
Michael Vogel c02b1c3f36 The "tagged with" message now works again. 2016-09-03 12:48:51 +02:00
gerhard6380 3a31619509 API: change friendica_activities to include arrays of users 2016-09-02 17:01:52 +02:00
Tobias Diekershoff 014fc5dccb Merge pull request #2758 from annando/1609-sql-charset
Set the charset for the SQL connection for new installations
2016-09-01 09:22:07 +02:00
Michael Vogel 59ff309ee5 Add the new charset parameter to the database creation 2016-09-01 04:44:29 +00:00
Michael Vogel 9209d88c4a Set the charset for the SQL connection for new installations 2016-09-01 03:50:41 +00:00
Tobias Diekershoff 02c29f1313 Merge pull request #2748 from rabuzarus/rabuzarus-pending
best_link_url: don't use redirect for pending contacts
2016-08-31 15:55:26 +02:00
Tobias Diekershoff c62a28d95e Merge pull request #2755 from rabuzarus/theme-init-identity
fix theme loading
2016-08-31 15:53:42 +02:00
rabuzarus aedd2cfa60 Update identity.php 2016-08-31 13:49:24 +02:00
Michael Vogel 41613ec55d Bugfix: Fixed two bad sql queries 2016-08-29 18:40:40 +00:00
rabuzarus e0d329ece9 Merge pull request #2750 from annando/1608-worker-priority-again
Prevent lowest priority calls from never being called
2016-08-28 00:39:58 +02:00
Michael Vogel 6a167cf8b1 Prevent lowest priority calls from never being called 2016-08-27 21:05:38 +00:00
Michael Vogel e46dae3937 Removed some accidentally written code 2016-08-27 19:53:09 +02:00
Michael Vogel a156d59e2a dbstructure: Set the version when updating manually 2016-08-27 19:50:19 +02:00
rabuzarus c1555b623a best_link_url: don't use redirect for pending contacts 2016-08-26 15:47:45 +02:00
Tobias Diekershoff dc6cce4080 Merge pull request #2746 from annando/1608-diaspora-handle-lowercase
The handle for Diaspora contacts must always be low…
2016-08-23 07:52:35 +02:00
Michael Vogel 80bfcc7694 The handle (user@domain.tld) for Diaspora contacts must always be lowercase 2016-08-23 07:48:48 +02:00
Tobias Diekershoff be4ce36a97 Merge pull request #2745 from annando/1608-atachments
Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode
2016-08-23 07:48:18 +02:00
Michael Vogel 50dc7a6047 Bugfix: Handle attachments with bbcode inside/handle the [p] bbcode 2016-08-23 07:40:16 +02:00
Tobias Diekershoff f344813054 events with no finish should not export it to ical 2016-08-20 16:16:19 +02:00
Michael Vogel 108a1c4ac6 New priority level for stale processes. 2016-08-18 12:33:17 +02:00
Tobias Diekershoff 789e9577c6 Merge pull request #2737 from annando/1608-worker-again
Performance improvements for the poller
2016-08-14 22:10:13 +02:00
gerhard6380 078767630c improved sql statements for direct_messages calls 2016-08-14 22:03:59 +02:00
gerhard6380 01a2eb3555 Implement api/direct_messages/destroy
Twitter compliant call replaces api/friendica/direct_messages_delete;
JSON return expected by Twitter API and parameter include_entities not
yet implemented
2016-08-14 22:03:40 +02:00
gerhard6380 ef0cc850d4 remove api_friendica_direct_messages_all
instead included 'friendica_verbose' parameter into standard function
api_direct_messages_box()
2016-08-14 22:03:27 +02:00
gerhard6380 f9f1825e33 Removing api_friendica_direct_messages_conversations
due to implementing 'seen' and 'parent-uri' into standard
api_format_messages() this call is not needed anymore. Adapting comment
blocks.
2016-08-14 22:03:08 +02:00
gerhard6380 f99a646328 remove api_format_messages_win and include new fields in api_format_messages 2016-08-14 22:02:56 +02:00
gerhard6380 fe5182559f new API calls for private messsages in Win10 app
new API calls used for Windows 10 app (similar calls to existing but
extended to include seen id and parent-uri)
2016-08-14 22:02:43 +02:00
Michael Vogel 67b16507f1 Performance improvements for the poller 2016-08-14 21:02:29 +02:00
Michael Vogel 0ea9af3d7d Ping is now using a standard routine to generate the xml. 2016-08-10 22:51:03 +02:00
rabuzarus 5e4eaa433b Merge pull request #2720 from annando/1608-kill-stale-worker
Process timeouts are now priority depending
2016-08-08 22:34:45 +02:00
Michael Vogel d138b11868 Use a 10 minute timeout for high priority processes. This may be better. 2016-08-08 21:28:44 +02:00
Michael Vogel 29168de677 Process timeouts are now priority depending 2016-08-08 19:20:40 +02:00
Michael Vogel 61e3a8ca3a Merge pull request #2702 from rabuzarus/0308-Notifications-restructure
notifications restructure
2016-08-08 07:41:48 +02:00
Michael Vogel 65a09c67a0 Bugfix: proc_run hadn't worked anymore due to the priority changes 2016-08-08 07:14:40 +02:00
rabuzarus 0532dc6a61 notifications - correct boolean variable checking 2016-08-07 12:26:49 +02:00
rabuzarus de02154a1b notifications - set default values for some varibles 2016-08-06 18:59:39 +02:00
Michael Vogel 0411eb289e Lower the priority for stale processes 2016-08-04 15:41:32 +02:00
Michael Vogel 074ae59f49 Reschedule killed processes at the beginning of the queue. 2016-08-04 15:33:15 +02:00
Michael Vogel dad74e9650 pubsubpublish is now split into separate calls per entry. 2016-08-04 15:15:43 +02:00
rabuzarus 8ad345c434 notifications - remove TAB (clean up) 2016-08-04 11:46:57 +02:00
Michael Vogel 0cba02a805 Added priority to some forgotten proc_run calls 2016-08-03 18:24:22 +02:00
Michael Vogel 7157ca3809 Fastlane is now working with any priority level 2016-08-03 15:59:25 +02:00
rabuzarus ae905cbd1b Merge develop into 0308-Notifications-restructure
Conflicts:
	mod/notifications.php
2016-08-03 12:53:38 +02:00
rabuzarus ce3188d5c6 notifications - move intros to NotificationsManager & make json output work 2016-08-03 12:44:04 +02:00
Michael Vogel ff430640c0 Small variable type fixed, removed unused includes 2016-08-03 10:19:46 +02:00
Michael Vogel d673f44c5b Split cron jobs in cronjobs, introduce fastlane for high priority tasks 2016-08-03 10:03:05 +02:00
fabrixxm 87fb0b7b26 Quick fix to PR #2682 2016-08-02 12:24:07 +02:00
Michael Vogel 13c285d61d Updated documentation 2016-08-02 10:19:10 +02:00
Michael Vogel b9dbb0ace1 Split cronhook call to several single calls 2016-08-02 06:28:34 +02:00
rabuzarus 6d3c15fe91 notifications - add attendance notifications 2016-08-02 00:01:43 +02:00
rabuzarus bcee356f66 notifications - add docu & pagination 2016-08-01 23:04:41 +02:00
rabuzarus 7a4be1cead notifications.php: move more code to NotificationsManager 2016-08-01 18:18:11 +02:00
Tobias Diekershoff c6f7952f37 Merge pull request #2696 from annando/1608-performance
Small performance improvements
2016-08-01 08:21:36 +02:00
Michael Vogel d8c4fceef8 Merge remote-tracking branch 'upstream/develop' into 1608-performance 2016-08-01 08:04:11 +02: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 84e84a0689 Small performance improvements 2016-08-01 07:22:54 +02:00
trebor 52f641904b notifications.php: reduce code duplication 2016-07-30 10:51:21 +02:00
Michael Vogel 4e02b80868 Merge remote-tracking branch 'upstream/develop' into 1607-performance 2016-07-26 22:16:37 +02:00
Michael Vogel 287c9cfbdd Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-26 22:15:49 +02:00
Michael Vogel 4961fb3a45 Unused indexes removed, queries changed 2016-07-26 22:10:13 +02:00
Michael Vogel 0deea97cf2 Merge pull request #2686 from rabuzarus/2107-contact_edit
frio: templates for contact_edit and crepair
2016-07-26 09:33:37 +02:00
rabuzarus 768d10536f frio: templates for contact_edit and crepair 2016-07-26 09:09:40 +02:00
rabuzarus e4bef09717 dbm.php - is_result should be a static function
there was a notice in php.out - `Non-static method dbm::is_result() should not be called statically`
This should fix it.
2016-07-25 11:46:14 +02:00
Michael Vogel 5e81c105e0 We now work with the "priority" field - that's better 2016-07-24 20:25:11 +02:00
Michael Vogel 747dc934f7 Avoid warning because $a isn't called by reference 2016-07-24 13:53:26 +02:00
Michael Vogel 4be7e5a581 "Fast lane" mechanism to reserve one queue for priority processes 2016-07-24 11:22:44 +02:00
Michael Vogel 7580c8ed11 Processing of high priority processes 2016-07-23 22:57:22 +02:00
Michael Vogel fb447e84ee Some more information about the current queue status of the worker 2016-07-22 18:07:04 +02:00
Michael Vogel 8bf7db06db New indexes for the API 2016-07-19 08:43:57 +02:00
Michael Vogel 4f07dfb35a Optimized queries 2016-07-18 15:25:42 +02:00
Michael Vogel 838f976715 Some more improvements to xml.php, code cleanup 2016-07-17 23:59:35 +02:00
Michael Vogel d7f093cb2e Enhanced XML creation, and so on. 2016-07-17 19:42:30 +02:00
Michael Vogel bc2c565060 Work in progress: API XML output without templates 2016-07-16 12:32:08 +02:00
Michael Vogel de6f48365b Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 20:12:46 +02:00
Tobias Diekershoff 0a49b7dc77 Merge pull request #2681 from annando/bugfix-diaspora
Bugfix: There was an SQL error when adding new entries in the fcontac…
2016-07-15 17:35:50 +02:00
Michael Vogel 1603aa41ef Bugfix: There was an SQL error when adding new entries in the fcontact table 2016-07-15 17:25:30 +02:00
Michael Vogel a64b7704d8 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 17:19:16 +02:00
Michael Vogel 1130f11037 Merge pull request #2680 from fabrixxm/feature-api-update
API: fix plaintext of reshared attachment
2016-07-15 16:58:59 +02:00
fabrixxm ec22b6086a API: fix plaintext of reshared attachment
When replacing `[attachment]` element, text after it wasn't restored.
`[share]` element can contain `[attachment]`, the closing `[/share]` was elided,
then the `[share]` element was shown in plaintext instead of recycle symbol
2016-07-15 16:53:30 +02:00
Michael Vogel 4e25d08a77 Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml 2016-07-15 16:15:20 +02:00
Michael Vogel 6ebfbc5993 API: Use a generic function to create the XML 2016-07-15 15:37:51 +02:00
Tobias Diekershoff 334db69d5d Merge pull request #2678 from fabrixxm/feature-api-update
api updates
2016-07-15 15:08:55 +02:00
fabrixxm d68c09e428 API: use diaspora::is_reshare() 2016-07-15 12:22:35 +02:00
fabrixxm 43699646d6 API: use doxygen todo style 2016-07-15 11:46:19 +02:00
fabrixxm 66199c9861 API: rework retweeted_status
`api_share_as_retweet()` now returns a copy of the item with
fields updated to shared content, instead of modify the item itself.
The new item array is used to build 'retweeted_status'.
2016-07-14 16:39:40 +02:00
fabrixxm c7876d0c38 API: add docs to api_item_get_user()
and remove commented out lines
2016-07-14 13:36:15 +02:00
fabrixxm 18bd7f5eb7 API: use regex instead of SimpleXMLElement
It's easier with exotic chars.
And the editor replaced all leading spaces with tabs.
2016-07-14 13:32:31 +02:00
Michael Vogel 2c5fb55725 Diaspora: Link to protocol description added. Support for creation date of comments 2016-07-14 07:20:20 +02:00
fabrixxm ce2f765d28 API: rework share as retweet
new shared status xml template.
<retweeted_status> element in xml.
parent status keeps his body and author, 'retweeted_status'
get body, author and plink from share bbcode.
2016-07-13 22:29:07 +02:00
fabrixxm 3cd2ed54eb api: item owner and activities details
return new fileld for items 'friendica_owner'.
'user' is always the author of the item.
Items activitites now returns array of contacts details: {'name','url'}
2016-07-13 19:58:38 +02:00
Michael Vogel 4b29937a74 Worker: New value for cooldown time after each function call 2016-07-13 19:43:16 +02:00
fabrixxm 95b7de6313 API: Fix api_array_to_xml() 2016-07-13 19:11:10 +02:00
Michael Vogel fdd679636b Bugfix: Avoid a warning if "theme_info" isn't an array 2016-07-12 12:59:34 +02:00
rabuzarus 4e4580f326 Merge pull request #2669 from annando/1607-new-probe
New probing mechanism
2016-07-11 21:42:48 +02:00
Michael Vogel a64db18731 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-11 20:45:56 +02:00
Michael Vogel 0a46a3d10e Bugfix: Avatar pictures of mail contacts weren't displayed correctly 2016-07-11 20:42:18 +02:00
Michael Vogel ee7f10f130 Some more little documentation 2016-07-11 19:48:37 +02:00
rabuzarus 15471f3835 add possibility to load custom page templates + none.php pagetemplate is part of core now 2016-07-11 10:33:39 +02:00
Michael Vogel aad3fb2d32 Some more documentation 2016-07-10 18:44:48 +02:00
Michael Vogel 230bfcebea Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-10 14:03:10 +02:00
Tobias Diekershoff 26098fa263 Merge pull request #2671 from annando/1607-diaspora-soapbox-connect
Bugfix: Diaspora connect requests to soapbox account work now
2016-07-10 13:55:56 +02:00
Michael Vogel 9ac26802ce Diaspora: Send the profile data after a successful connect 2016-07-10 13:11:09 +02:00
Michael Vogel 19377f2a9c Just make the bugfix a little bit simpler 2016-07-10 12:18:10 +02:00
Michael Vogel 84aa01b377 Bugfix: Diaspora connects to a Soapbox account weren't established correctly 2016-07-10 12:09:58 +02:00
Michael Vogel 8a11a60932 Small text correction 2016-07-10 09:29:43 +02:00
Michael Vogel b9da831138 Fallback for empty names 2016-07-10 09:27:40 +02:00
Michael Vogel f27bc00464 Remove obsolote functions 2016-07-09 20:09:09 +02:00
Michael Vogel 058c93a64c Changed documentation 2016-07-08 22:55:39 +02:00
Michael Vogel f86dac652f OStatus now has "location" and "about", probing for urls added 2016-07-08 22:31:11 +02:00
Michael Vogel 0ccb171449 Probing now has a Twitter detection. 2016-07-08 21:15:20 +02:00
Michael Vogel e43a90252c Diaspora: Relayed retraction hadn't worked. 2016-07-08 20:39:14 +02:00
Michael Vogel b954714464 If the nick is missing then take the first part of the name 2016-07-08 20:37:10 +02:00
Michael Vogel edfee710fe To-Do added 2016-07-07 23:35:44 +02:00
Michael Vogel db1d8caaf2 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-07 23:35:14 +02:00
Michael Vogel a65547c578 Added documentation 2016-07-07 23:04:30 +02:00
Michael Vogel c625b6aba8 If a page contains a feed url then follow it. 2016-07-07 22:37:16 +02:00
Tobias Diekershoff b4b2a6d5b8 Merge pull request #2666 from annando/1607-more-logging
Logging for feeds improved, new "process id" for logging
2016-07-07 22:36:20 +02:00
Michael Vogel 2e37234a41 Merge remote-tracking branch 'upstream/develop' into 1607-new-probe 2016-07-07 21:57:10 +02:00
Michael Vogel fc25e605cb Logging for feeds improved, new "process id" for logging 2016-07-07 20:32:13 +02:00
Tobias Diekershoff 5b03db4a1b adjust the rand bounderies to be within the allowed max value 2016-07-05 15:45:39 +02:00
Michael Vogel 585c893456 You can now prove with an uid (important for mails) 2016-07-04 22:34:35 +02:00
Michael Vogel 4e5d335492 Removed the legacy function calls, removed unused functions 2016-07-04 08:05:30 +02:00
Michael Vogel e1c0b4fe03 Warnings removed 2016-07-04 00:49:38 +02:00
Michael Vogel f5593b1981 Removed old code 2016-07-04 00:14:08 +02:00
Michael Vogel b124b94288 Support for noscrape when probing. 2016-07-03 23:11:21 +02:00
Michael Vogel 99f94edc9c New class to probe urls 2016-07-03 22:27:16 +02:00
Tobias Diekershoff ce64955fe0 Merge pull request #2659 from annando/1607-bugfix-scrape-diaspora
Bugfix: The notify value for Diaspora wasn't assigned
2016-07-02 22:07:41 +02:00
Tobias Diekershoff 598a9f76a6 Merge pull request #2658 from annando/1607-maxload
Central Backend/Frontend detection when checking for overload
2016-07-02 21:52:48 +02:00
Michael Vogel 34475ad262 Bugfix: The notify value for Diaspora wasn't assigned 2016-07-02 21:14:21 +02:00
Tobias Diekershoff 7cda169f24 Merge pull request #2657 from annando/1607-share-contact
Only use the profile data in shares if there is data
2016-07-02 20:06:20 +02:00
Michael Vogel f1af0fe360 Obly use the profile data in shares if there is data 2016-07-02 17:51:16 +02:00
Michael Vogel c7f10bacb5 Merge remote-tracking branch 'upstream/develop' into 1607-is-result2 2016-07-02 14:01:52 +02:00
Michael Vogel e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Tobias Diekershoff b580a338f6 Merge pull request #2654 from annando/1607-thumb-micro
use thumb avatar size instead of micro size in the contact list
2016-07-02 13:53:35 +02:00
Michael Vogel 7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
	boot.php
2016-07-02 13:38:23 +02:00
Michael Vogel e67554924a use thumb avatar size instead of micro size in the contact list 2016-07-02 09:32:42 +02:00
Michael Vogel c549ae939c Added the new function to the poller. 2016-07-02 09:31:28 +02:00
Michael Vogel c1ce7059b6 If it doesn't work with the new method, try the old one 2016-06-30 22:58:56 +02:00
Michael Vogel e5dd67121f Some logging added. 2016-06-30 22:42:46 +02:00
Michael Vogel 97abbe83f4 Diaspora: Support for reading the /fetch/post/ functionality 2016-06-30 22:18:48 +02:00
Michael Vogel 24e0fffa2e Small bugfix 2016-06-30 07:56:06 +02:00
Michael Vogel d125939888 Just some more centralised functionality 2016-06-30 07:46:00 +02:00
Michael Vogel 99f0746660 Cleaned up the code 2016-06-30 07:32:07 +02:00
Michael Vogel 2c7fd1cb3c It should be now valid 2016-06-30 01:18:44 +02:00
Michael Vogel 2d72e2d932 Diaspora: Support for new fetch functionality (replacement for /p/) 2016-06-29 22:50:30 +02:00
Michael Vogel 230a645307 Diaspora: Another Bugfix for the new protocol 2016-06-29 20:37:04 +02:00
Michael Vogel 152efdaec5 Diaspora: Incompatibilities with signature check solved 2016-06-29 10:33:43 +02:00
Tobias Diekershoff 773517a734 Merge pull request #2638 from annando/1606-avatar-handling
Imrpoved avatar handling when storing them/partly use of "micro"
2016-06-25 19:51:00 +02:00
rabuzarus fd72f36ffe move html from function micropro() to own templates 2016-06-25 18:46:47 +02:00
Michael Vogel ad6b3f8815 Merge pull request #2636 from rabuzarus/2506_frio_strings
add missing strings for frio
2016-06-25 14:03:34 +02:00
Michael Vogel 0b1188b7fe Imrpoved avatar handling when storing them/partly use of "micro" 2016-06-25 13:56:55 +02:00
rabuzarus 073f520cee add missing strings for frio 2016-06-25 12:21:13 +02:00
Michael Vogel e2023b6667 Store the guid value as well. 2016-06-25 11:52:52 +02:00
Michael Vogel ec5b3109e4 Support for the case when the guid and public key will vanish from webfinger 2016-06-25 00:38:47 +02:00
Tobias Diekershoff f8a20a15d3 Merge pull request #2633 from annando/1606-author-id-update
author-id/owner-id: Post update function/added database documentation
2016-06-24 07:03:46 +02:00
Michael Vogel eabf8734a8 Merge pull request #2631 from rabuzarus/1906-event-test
cal export && public calendar - fix permissions
2016-06-23 23:24:27 +02:00
Michael Vogel c7373dcec4 author-id/owner-id: Post update function/added database documentation 2016-06-23 21:15:54 +02:00
rabuzarus e352458ef0 pub calendar - permission clean up and docu 2016-06-23 10:07:13 +02:00
rabuzarus cd92a0dc34 Merge pull request #2624 from annando/1606-contact-id
Item: New fields for author id and owner id - avatar improvement with relocation
2016-06-22 14:26:39 +02:00
rabuzarus 2cac69ca86 cal export && public calendar - even better permissions testing 2016-06-22 13:50:47 +02:00
rabuzarus 8cc5dd35e8 cal export && public calendar - fix permissions 2016-06-22 00:39:52 +02:00
Michael Vogel 49c19a3c00 Merge pull request #2628 from rabuzarus/1906-event-test
move the cal addon (exporting calendars) to core
2016-06-21 22:48:31 +02:00
Michael Vogel 266fea3874 Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-21 00:10:24 +02:00
rabuzarus 71c9f562ae move the cal addon (exporting calendars) to core 2016-06-20 23:31:49 +02:00
Michael Vogel a657377616 Diaspora: Try to fetch the uri if we already received the message 2016-06-20 22:48:55 +02:00
Michael Vogel 40a44f1571 Some manual revert ... 2016-06-20 22:48:09 +02:00
Michael Vogel 467176fa65 Diaspora: Ensure that we always store the correct URI 2016-06-20 22:43:14 +02:00
Michael Vogel 65b541413f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-20 07:28:47 +02:00
rabuzarus 7495a34b32 implement a public calendar for vistors of someones profile page 2016-06-19 22:04:34 +02:00
Michael Vogel 0adff6f6b8 Fix for author-thumb/owner-thumb - DFRN: Relocate stuff 2016-06-19 20:01:25 +02:00
Michael Vogel 91db7a549c Optimised the amount of function for the item query 2016-06-19 08:32:38 +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 bf2e23c205 Merge pull request #2616 from rabuzarus/1206-events-template
use standard templates in events + frio templates for events
2016-06-18 15:01:00 +02:00
rabuzarus b977efc95c code highlight - some spacing for readability 2016-06-17 15:29:01 +02:00
rabuzarus 7dc5fc8b9f Merge develop into 1206-events-template
Conflicts:
	view/theme/frio/css/style.css
2016-06-17 14:33:08 +02:00
rabuzarus 4313982e02 frio - event - code clean up + docu 2016-06-17 14:27:33 +02:00
rabuzarus 8b4c416713 frio: events - split event form in different sections 2016-06-16 20:16:16 +02:00
rabuzarus 0167a2bd61 port of Hubzillas code highlight feature 2016-06-16 11:38:12 +02:00
Michael Vogel 8762fb671f Merge remote-tracking branch 'upstream/develop' into 1606-contact-id 2016-06-16 10:48:52 +02:00
Michael Vogel 3c9a80a31c dfrn relocate: addr field added, gcontact update added 2016-06-15 21:23:22 +02:00
Michael Vogel 0e35427dfc New fields "author-id" and "owner-id" in the item table 2016-06-15 21:20:55 +02:00
Michael Vogel 7f5a2d5c23 Categories were missing 2016-06-14 09:50:17 +02:00
Michael Vogel a05f0c39a6 Merge remote-tracking branch 'upstream/develop' into 1606-time-travel 2016-06-13 22:32:40 +02:00
Michael Vogel 81395fe385 Avoid time travel in posts (received before created) 2016-06-13 22:21:33 +02:00
Michael Vogel 2815173a52 Bugfix: Items weren't sorted correctly 2016-06-13 22:20:09 +02:00
Fabrixxm 6e28cdf2ee Fix Config and PConfig ::get() on new keys 2016-06-13 10:28:40 +02:00
rabuzarus 5e98f27fcd frio: events - work on event_form.tpl + datetime.php 2016-06-13 10:19:38 +02:00
rabuzarus 869a439466 Merge pull request #2595 from annando/1606-contact-priority
Priority for native networks when searching by contact url
2016-06-13 09:28:54 +02:00
Michael Vogel 125d80292b Some cleanup 2016-06-12 23:06:48 +02:00
Michael Vogel c68f28bc77 Merge remote-tracking branch 'upstream/develop' into 1606-item-query-cleanup 2016-06-12 21:07:45 +02:00
Michael Vogel c05898c57d The queries for items are unified (a little bit) 2016-06-12 21:04:55 +02:00
rabuzarus 64753f474c fix config & pconfig 2016-06-12 18:55:20 +02:00
Michael Vogel 6d50d18242 Merge pull request #2584 from rabuzarus/0906-profiles
some restructure in profiles.php + frio template for profiles settings
2016-06-12 14:20:42 +02:00
Michael Vogel 09fbcbc685 Just some added todo 2016-06-12 12:06:15 +02:00
Michael Vogel aac9caab2d Priority for native networks when searching by contact url 2016-06-12 10:46:15 +02:00
Fabrixxm 136ae34245 Add $default_value parameter to Config::get() and PConfig::get() 2016-06-10 12:00:34 +02:00
Fabrixxm 6c346b1ab6 Move Config and PConfig classes in \Friendica\Core namespace 2016-06-10 11:52:01 +02:00
Fabrixxm f2e79e976d set include/ folder base for 'Friendica' PSR4 namespace 2016-06-10 11:50:52 +02:00
rabuzarus 3a9a9e6a1c frio + core: some restructure in profiles.php + frio template for profiles settings 2016-06-10 11:24:38 +02:00
fabrixxm 60c1172e7e Merge pull request #2576 from rabuzarus/0806-PConfig
move config to its own class (with legacy support)
2016-06-10 11:13:08 +02:00
Michael Vogel 098a8ac6c2 Bugfix: In threads the contact data from users weren't taken. 2016-06-08 22:50:57 +02:00
rabuzarus 023c43fa4a config && pconfig: return NULL if config is unset 2016-06-08 21:52:10 +02:00
rabuzarus 7e8ea1cb87 move config to its own class (with legacy support) 2016-06-08 11:02:18 +02:00
Michael Vogel aad00ddc04 Renamed template 2016-06-08 07:11:16 +02:00
Michael Vogel f59b21d4a8 Merge remote-tracking branch 'upstream/develop' into 1606-shared-template 2016-06-07 22:40:29 +02:00
Michael Vogel e2e32eecac New template for shared content instead of hardcoded stuff in source 2016-06-07 22:29:50 +02:00
rabuzarus 3a368214c0 frio: saved_searches_aside & searchbox template 2016-06-07 15:29:38 +02:00
Michael Vogel fc66a86dc5 Some optimized sql queries 2016-06-06 22:57:27 +02:00
Tobias Diekershoff 9d72c3d170 Merge pull request #2565 from rabuzarus/0606-confic-docu
move pconfig to its own class
2016-06-06 18:31:37 +02:00
rabuzarus fa02d0f2f8 rename PConfig::del to PConfig:delete 2016-06-06 10:46:33 +02:00
rabuzarus f10011c282 move pconfig to it's own class PConfig 2016-06-06 10:22:14 +02:00
rabuzarus 5f081cc47b add doxygen to config functions 2016-06-06 10:01:14 +02:00
Michael Vogel 3d27ebcb34 Added documentation 2016-06-06 06:29:03 +02:00
Michael Vogel a25d58b2ee Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-06 06:21:36 +02:00
Michael Vogel 3e7e866e13 Baseurl removed 2016-06-05 21:22:14 +02:00
Michael Vogel 4b640dbd97 Fetching of profile data improved 2016-06-05 21:17:55 +02:00
Michael Vogel ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +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
Michael Vogel 71d3274841 Unified contact data handling 2016-06-05 13:57:11 +02:00
Michael Vogel 0518f004c2 removed duplicated functions 2016-06-04 12:20:09 +02:00
Michael Vogel b45772ba6e Configurable amount of maximum processes 2016-06-04 11:04:26 +02:00
Michael Vogel 140225b1a8 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-04 10:18:43 +02:00
rabuzarus 33f7513ff3 Merge pull request #2554 from annando/1606-mention-class
Mentions are now having an own class
2016-06-04 09:45:42 +02:00
Michael Vogel df337e57d1 Quit when processlist is too long 2016-06-03 23:10:23 +02:00
Michael Vogel 4914e8826b Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-02 07:37:37 +02:00
Michael Vogel 46659f15d3 One div too much 2016-06-01 21:58:50 +02:00
Michael Vogel 09e63e616a Shared content now has a surrounding div 2016-06-01 21:57:08 +02:00
Michael Vogel 85a9c7d96e The poller now has the logging for processes as well. 2016-06-01 21:54:02 +02:00
Michael Vogel 0b766b86ba By setting the "userinfo" class the hovercard in frio works with mentions 2016-06-01 17:10:43 +02:00
Michael Vogel 85f42ad26d Tags are now supported as well 2016-06-01 16:19:53 +02:00
Michael Vogel 5090ec1500 Mentions are now having an own class 2016-06-01 16:04:31 +02:00
Michael Vogel 395e83fa06 Merge remote-tracking branch 'upstream/develop' into 1606-dbm 2016-06-01 10:55:13 +02:00
rabuzarus 4e1c515004 Merge pull request #2550 from annando/1605-frio-github-markread
Frio: Removed github link, changed notification description
2016-06-01 09:21:58 +02:00
Michael Vogel e2c0f04eeb Added short description to "mark as seen" 2016-06-01 07:05:44 +02:00
Michael Vogel f07c96ee5f New class "dbm" for the database management 2016-06-01 07:04:31 +02:00
Michael Vogel 4c53f76c22 OStatus: repeated items in OStatus had a wrong "edited" date 2016-05-31 21:18:14 +02:00
Michael Vogel d22d36be7d Now with correct url 2016-05-29 22:13:08 +02:00
Michael Vogel e4ec867df3 Better detection for remote user 2016-05-29 22:02:31 +02:00
Michael Vogel 0a617da044 Wall message can now redirect to your own page if you are connected. 2016-05-29 21:29:26 +02:00
Michael Vogel 5580c0d708 Bugfix: Sometimes uploaded pictures weren't posted correctly to other networks 2016-05-29 10:59:06 +02:00
Michael Vogel 4a388e84af Frio: Adopt changes to search_item.tpl as well. 2016-05-28 13:08:43 +02:00
Michael Vogel eca1b1ff58 Bugfix: Some more encoding problems with attachments fixed 2016-05-26 23:22:30 +02:00
Tobias Diekershoff c013ca9d36 Merge pull request #2529 from annando/1605-events
Issue 2277: Events can now be edited and deleted
2016-05-23 18:06:09 +02:00
Michael Vogel 39ce023158 Merge remote-tracking branch 'upstream/develop' into 1605-bugfix-notificatoon 2016-05-23 06:49:31 +02:00
Michael Vogel b9e702742c Remove some test logging 2016-05-22 18:22:05 +02:00
Michael Vogel b7f2858486 Issue 2277: changes to events are now distributed. 2016-05-22 18:16:47 +02:00
Michael Vogel 06998f13b6 Events: Now with guid. 2016-05-22 18:05:01 +02:00
Michael Vogel 36063b47ab Bugfix: The url in attachments had problems with entities 2016-05-22 13:46:05 +02:00
Michael Vogel a1691664f3 Bugfix: Under certain circumstances notifications were send 2016-05-21 13:19:30 +02:00
Michael Vogel 8daa49b233 Bugfix: Feeds weren't detected correctly 2016-05-18 22:50:15 +02:00
Tobias Diekershoff 01a491c783 Merge pull request #2513 from annando/1605-diaspora-relay
Support for comments for the Diaspora relay system
2016-05-16 07:57:16 +02:00
Tobias Diekershoff 12e3c9ca59 Merge pull request #2514 from annando/1605-plaintext
Bugfix for shares in the plaintext function
2016-05-16 07:56:42 +02:00
Michael Vogel 247f866655 There were undecoded entities in the title 2016-05-15 10:36:56 +02:00
rabuzarus 7be1c83b0c photo.php: correct misspelling of an array key 2016-05-15 02:37:18 +02:00
Michael Vogel 1b2f67906b Bugfix for shares in the plaintext function 2016-05-13 22:23:46 +02:00
Michael Vogel 6434b5d8ce Support for comments for the Diaspora relay system 2016-05-13 22:19:31 +02:00
Michael Vogel 4d105111a7 Added documentation 2016-05-06 18:30:34 +02:00
Michael Vogel b7c14803b2 The feed header is now displayed even with "hidewall" activated 2016-05-06 18:27:19 +02:00
Michael Vogel 6f72bc8d3a Better implementation of "hidewall" 2016-05-06 11:04:21 +02:00
Michael Vogel ea78f63eac Diaspora: Reshares of non native reshares now look better 2016-05-06 08:22:27 +02:00
Tobias Diekershoff 480c35fb86 Merge pull request #2503 from annando/1605-hide-profile
Better handling of hidden profiles
2016-05-06 07:45:44 +02:00
Michael Vogel 1aa3aa21b3 Avoid warning messages at "strstr" 2016-05-05 20:36:23 +02:00
Michael Vogel bd1030b246 Update the global contact entries for local users on a regular base 2016-05-05 15:38:28 +02:00
Michael Vogel de431e185e New function to update the global contact for the user id. 2016-05-05 15:08:05 +02:00
Michael Vogel 3df235e5bd The global contact for server users is now stored directly 2016-05-05 12:02:51 +02:00
Michael Vogel 90155da59a The "hide" element is included in the feed as well. 2016-05-05 06:46:23 +02:00
Michael Vogel 683cdcc19e Changed check for searchability 2016-05-05 00:29:54 +02:00
Michael Vogel ed485b9d61 Set "hide" in noscrape 2016-05-04 23:50:31 +02:00
Michael Vogel fbc5404522 DFRN: "Hidewall" is now transmitted, "hide" is respected in dfrn and ostatus. 2016-05-04 23:21:30 +02:00
Michael Vogel 8992577bb6 Better handling of hidden profiles 2016-05-04 09:30:55 +02:00
Tobias Diekershoff 167a8998d6 Merge pull request #2502 from annando/1605-diaspora-share
Shared links to Diaspora should look better now
2016-05-04 07:20:22 +02:00
Michael Vogel bed4799728 Some more beautification. 2016-05-03 21:57:08 +02:00
Michael Vogel a7aaf7cc98 Shared links to Diaspora should look better now 2016-05-03 20:12:13 +02:00
Michael Vogel 26e1c4d458 Avoid SQL errors because of existing entries 2016-05-03 19:20:58 +02:00
Roland Haeder 432f96b646
And even more logging.
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 15:07:06 +02:00
Roland Haeder f18e493e32
More logging!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 15:01:19 +02:00
Roland Haeder f88345cbea
HTTPS support in validate_url()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:58:41 +02:00
Roland Haeder 738e22d3eb
Some fixes:
- Letting $profile_link and $hcard always been overwritten with newly found
  entries has caused DFRN network detectio to fail and "connect" is no longer
  working. This fix makes sure that these both variables are only set if they
  are still empty.
- added more debug lines to see which URL was it before and after webfinger "detection"

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:52:48 +02:00
Roland Haeder 7c04a0d232
Found some more for dba::is_result().
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:40:47 +02:00
Roland Haeder 3e701b90ac
Continued rewriting:
- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-05-01 14:24:44 +02:00
rabuzarus ad20ef3dba
add a hook call to acl_lookup() 2016-05-01 13:49:58 +02:00
Michael Vogel 134c491da0
Bugfix for XML function 2016-05-01 13:49:58 +02:00
Michael Vogel 0c9c58a683
Check before doing the database update 2016-05-01 13:49:58 +02:00
rabuzarus 95f129d9b6
xml: rename convert_element_to_array to element_to_array 2016-05-01 13:48:52 +02:00
rabuzarus 89f7a91907
move xml related function to the xml class + some doxygen docu 2016-05-01 13:48:52 +02:00
Michael Vogel f6deae08ba
Code redesign and comments 2016-05-01 13:48:52 +02:00
Michael Vogel 6065fca243
Minor session stuff 2016-05-01 13:48:52 +02:00
Michael Vogel 3e983dd45a
Only hide the search if "local_search" was activated. 2016-05-01 13:48:52 +02:00
Michael Vogel 38ae4f0326
We now work with a hash to avoid cookie manipulation 2016-05-01 13:48:52 +02:00
Michael Vogel af8b3b1fb7
"Remember Me" should work now but needs more fine tuning 2016-05-01 13:48:52 +02:00
Michael Vogel da7040efd4
Improved "remember me" functionality 2016-05-01 13:48:52 +02:00
Michael Vogel 829e7ace06
Vier: No visible login border/no search and events without login 2016-05-01 13:48:52 +02:00
Michael Vogel e7c4d0bc50
Bugfix DFRN and bookmark detection 2016-05-01 13:48:52 +02:00
Michael Vogel cea445b6f3
Check the global contacts every 90 days/Better handling in item creation 2016-05-01 13:48:52 +02:00
Michael Vogel 62ca636612
New (experimental) value to define the maximum level of database connections for the worker 2016-05-01 13:48:52 +02:00
Michael Vogel 6fe6191c2f
Quickfix for Hubzilla systems with enabled OStatus addon 2016-05-01 13:48:52 +02:00
Michael Vogel 883e8b5451
Clean the url at "poco" 2016-05-01 13:48:52 +02:00
Michael Vogel 761fa37f94
Diaspora: Comments and Likes are now signed at any time 2016-05-01 13:48:52 +02:00
Michael Vogel ede888dd4c
Start a gcontact probing for new gcontacts 2016-05-01 13:48:52 +02:00
Michael Vogel bdd55638ce
Only do the cleaning on specific networks 2016-05-01 13:48:52 +02:00
Michael Vogel 598ed2bdf3
Don't clean the contact url of feeds 2016-05-01 13:48:52 +02:00
Michael Vogel 49ca25f81a
We have to store feeds in the gcontact table ... 2016-05-01 13:48:52 +02:00
Michael Vogel 74883adfd1
Bugfix: We checked in the wrong array ... 2016-05-01 13:48:52 +02:00
Michael Vogel 8fb9f3fee5
Improved logging 2016-05-01 13:48:52 +02:00
Michael Vogel e088b919a8
Added description 2016-05-01 13:48:52 +02:00
Michael Vogel 5efd25a0eb
Some more checks that the gcontact table contains valid data 2016-05-01 13:48:52 +02:00
Michael Vogel 1627401cfa
Bugfix: The function to remove parts of attachments forgot about the rest 2016-05-01 13:48:52 +02:00
Michael Vogel 8396164afd
Don't store unknown networks 2016-05-01 13:48:52 +02:00
Michael Vogel 0f96e34e06
Don't cache account probing for empty networks 2016-05-01 13:48:52 +02:00
Michael Vogel 0e79f8cbca
Some small Diaspora changes 2016-05-01 13:48:52 +02:00
Michael Vogel 46dd775d10
Now we are having "after" at the old attach mechanism as well 2016-05-01 13:48:52 +02:00
Michael Vogel 08308e588d
Attachments: Better handling of preview pictures 2016-05-01 13:48:52 +02:00
Michael Vogel d2741d7f2e
Bugfix: Missing include added 2016-05-01 13:48:52 +02:00
Michael Vogel 0b121a6ffe
Improved handling of photos 2016-05-01 13:48:52 +02:00
Michael Vogel dd71a05ab3
Added documentation 2016-05-01 13:48:52 +02:00
Michael Vogel 6cdcbabb3b
Use the "attachment" element instead of a mixture of several elements 2016-05-01 13:48:52 +02:00
Michael Vogel 5b6a708007
the "nurl" index was accidentally dropped 2016-05-01 13:48:52 +02:00
Michael Vogel 5370b3f76d
Speeding up the gcontact search 2016-05-01 13:48:52 +02:00
Michael Vogel 7c68e14b3d
Added comment 2016-05-01 13:48:52 +02:00
Michael Vogel 67d272749e
Clean gcontact url before saving in gcontact table 2016-05-01 13:48:52 +02:00
Michael Vogel 313586e224
Speed up the contact search, proxy the images, search for addresses 2016-05-01 13:48:52 +02:00
rabuzarus db581c08d0
rework autocomplete: some polishing 2016-05-01 13:47:24 +02:00
Michael Vogel 535f382c4e
Bugfix: "default_group" behaviour wasn't implemented correctly 2016-05-01 13:47:24 +02:00
Michael Vogel 667cb76b79
API: Just some more elements where Twidere has problems ... 2016-05-01 13:47:24 +02:00
Michael Vogel a201d5b9cc
API: Improvement for Twidere/Conversation call improved 2016-05-01 13:47:24 +02:00
rabuzarus f674795a20
Update ForumManager.php - small correction 2016-05-01 13:47:24 +02:00
rabuzarus f2b690f876
Update ForumManager.php
fix some doxygen description
2016-05-01 13:47:24 +02:00
Michael Vogel b43638f8ee
"remember me" in session does work now 2016-05-01 13:47:24 +02:00
Michael Vogel 71f93d0bdf
Scrape: Changed detection for the profile link 2016-05-01 13:47:24 +02:00
Michael Vogel af80d67f9c
Some more documentation 2016-05-01 13:47:24 +02:00
Michael Vogel c588edd49b
Some reverted stuff 2016-05-01 13:47:24 +02:00
Michael Vogel 4b0506879a
Post update ist now done. 2016-05-01 13:47:24 +02:00
Michael Vogel f711258183
New field in item table ("shadow") that indicates if there is a shadow entry 2016-05-01 13:47:24 +02:00
Michael Vogel c8a62a4073
Small bugfix: We always liked the parent 2016-05-01 13:47:24 +02:00
Michael Vogel e99ec7feeb
Notify and poll aren't fetched at the moment 2016-05-01 13:47:24 +02:00
Michael Vogel 0c6ff4202d
Bugfix: The nickname vanished/better way to fetch the alias 2016-05-01 13:47:24 +02:00
Michael Vogel 7158390b98
Update contact data for uid=0 at feed import 2016-05-01 13:47:24 +02:00
Michael Vogel bacece897b
Only update contact when scrape runs with "probe_normal" 2016-05-01 13:47:24 +02:00
Michael Vogel 5e1652922d
OStatus: Salmon now works with "likes"/The alias is stored now as well 2016-05-01 13:47:24 +02:00
Michael Vogel fda9a88a31
Only update the contact entry with uid=0 2016-05-01 13:47:24 +02:00
Michael Vogel 783932000c
Don't optimize the tables when the maximum size is lower than zero 2016-05-01 13:47:24 +02:00
Michael Vogel d49055c980
Some more documentation 2016-05-01 13:47:24 +02:00
Michael Vogel 28e68f5704
Some more documentation 2016-05-01 13:47:24 +02:00
Michael Vogel f76d24bb83
Added some documentation 2016-05-01 13:47:24 +02:00
Michael Vogel b640db2b17
Doxygen structure added 2016-05-01 13:47:24 +02:00
Michael Vogel 93af22fcd2
Tempory file is deleted 2016-05-01 13:47:24 +02:00
Michael Vogel ebd1b31473
OStatus class is now moved into the right place 2016-05-01 13:47:24 +02:00
Michael Vogel abf6fb10a5
"Scrape" now respects the new url formats with "index.php" 2016-05-01 13:47:24 +02:00
Michael Vogel f2ce7f51cd
New OStatus implementation 2016-05-01 13:47:24 +02:00
Michael Vogel 9d322d7473
Not sure if that is correct ... 2016-05-01 13:47:24 +02:00
Michael Vogel 0bf076ecc0
Some changed doxygen header stuff 2016-05-01 13:47:24 +02:00
Michael Vogel a7f656c041
And wow ... some more documentation 2016-05-01 13:47:24 +02:00
Michael Vogel ce603cbb49
And some more doc stuff 2016-05-01 13:47:24 +02:00
Michael Vogel b198e73ef0
Some more small documentation stuff 2016-05-01 13:47:24 +02:00
Michael Vogel 805f1287d0
Support for the new contact request data type 2016-05-01 13:47:24 +02:00
Michael Vogel 617e1768e1
Avoid a guid whith spaces. 2016-05-01 13:47:24 +02:00
Michael Vogel 721b2edb33
Some more documentation - again. 2016-05-01 13:47:24 +02:00
Michael Vogel 7362dce2f4
Scrape: Always take the first alias 2016-05-01 13:47:24 +02:00
Michael Vogel df961742da
Some more code cleaning 2016-05-01 13:47:24 +02:00
Michael Vogel 0ed299a495
API: Support for the conversation api call from GNU Social 2016-05-01 13:47:24 +02:00
Michael Vogel 2a84e7fac1
If the message already exists then the message id should be returned 2016-05-01 13:47:24 +02:00
Michael Vogel a0c0881e54
Add OEmbed data to the body of reshares 2016-05-01 13:47:24 +02:00
Michael Vogel ab0325b9a9
Bugfix: Avoid warning with non object OEmbed data 2016-05-01 13:47:24 +02:00
Michael Vogel 0f71d0bd07
Reshare of reshares now work. 2016-05-01 13:47:24 +02:00
Michael Vogel 3414328673
Avoid an empty handle 2016-05-01 13:47:24 +02:00
Michael Vogel eb511b3fef
Some more documentation - to make @rabuzarus happy 2016-05-01 13:47:24 +02:00
Michael Vogel 3981ed4cda
Added documentation 2016-05-01 13:47:24 +02:00
Michael Vogel debc6a86c6
DFRN: Remote tagging works now 2016-05-01 13:47:24 +02:00
Michael Vogel 5a90f865ed
Add the guid to items that we create locally 2016-05-01 13:47:24 +02:00
Michael Vogel 8d82bf922e
The signature creation now moved into the Diaspora class. That's much cleaner. 2016-05-01 13:47:24 +02:00
Michael Vogel f5ac69a0cf
The documentation should now be complete 2016-05-01 13:47:24 +02:00
Michael Vogel 99bf63dbdf
There is no table "sess_data" - this database call is useless 2016-05-01 13:47:24 +02:00
Michael Vogel 4aec4f5bd4
Just some more documentation 2016-05-01 13:47:24 +02:00
Michael Vogel f282748c52
Added some documentation, script to generate a basic doxygen header 2016-05-01 13:47:24 +02:00
Tobias Diekershoff c7d8102afe
added title element to emoji images in main repository 2016-05-01 13:47:24 +02:00
Michael Vogel 22c889c319
Retraction do work as well 2016-05-01 13:46:08 +02:00
Michael Vogel f7c9ee5848
Everything tested, one open to-do 2016-05-01 13:46:08 +02:00
Michael Vogel cc7b34b7e6
Better reshare detection 2016-05-01 13:46:08 +02:00
Michael Vogel 3d8770a9da
Added checklist 2016-05-01 13:46:08 +02:00
Michael Vogel 35d5f4caee
Missing include 2016-05-01 13:46:08 +02:00
Michael Vogel 8b06893488
DFRN: Mentions were imported as hash tags 2016-05-01 13:46:08 +02:00
Michael Vogel b84ed78f8f
Values are sanitized, messages are not relayed when there is no signature 2016-05-01 13:46:08 +02:00
Michael Vogel 79fb05ff80
Removed moved function 2016-05-01 13:46:08 +02:00
Michael Vogel d87e78a488
Reshares now store the original XML as well. 2016-05-01 13:46:08 +02:00
Michael Vogel 357c48076d
Bugfix: XML copy had problems with "&" 2016-05-01 13:46:08 +02:00
Michael Vogel 2898749cc6
The Diaspora class is now productive 2016-05-01 13:46:08 +02:00
Michael Vogel cdbf1a7556
Profile update is now working with the new function as well 2016-05-01 13:46:08 +02:00
Michael Vogel 07bd89c35f
Removed just more old diaspora function calls. 2016-05-01 13:46:08 +02:00
Michael Vogel 2446c56e50
Conversations are working now too 2016-05-01 13:46:08 +02:00
Michael Vogel 3e79a19e57
Some more function calls changed to the new class 2016-05-01 13:46:08 +02:00
Michael Vogel 77dbb4bfbc
Retraction and reshares work 2016-05-01 13:46:08 +02:00
Michael Vogel d176fff214
New implementation is now live. 2016-05-01 13:46:08 +02:00
Michael Vogel e90af0be68
Decode function is now there as well. 2016-05-01 13:46:08 +02:00
Michael Vogel 7dcf6c2116
XML generation is now improved 2016-05-01 13:46:08 +02:00
Michael Vogel 3e299aa7bf
Some code cleaning, changes to the xml generation 2016-05-01 13:46:08 +02:00
Michael Vogel c9100e1102
Everything could work - needs some beautification and documentation 2016-05-01 13:46:08 +02:00
Michael Vogel 5ec00840ba
Some fixes for the fetching of postings by using /p/ 2016-05-01 13:46:08 +02:00
Michael Vogel b34d230f13
Small things ... 2016-05-01 13:46:08 +02:00
Michael Vogel 41b0ff929d
Relayed Likes and relayed comments should work, code needs beautification 2016-05-01 13:46:08 +02:00
Michael Vogel f3206bc382
Relaying is nearly done 2016-05-01 13:46:08 +02:00
Michael Vogel ffbb17a919
Sending like and comment should work now. 2016-05-01 13:46:08 +02:00
Michael Vogel c5c1237d3e
Preparation for followups 2016-05-01 13:46:08 +02:00
Michael Vogel cd57c49600
Retraction could work now as well. 2016-05-01 13:46:08 +02:00
Michael Vogel 265af9c99b
Receiving should be complete, sending partially works 2016-05-01 13:46:08 +02:00
Michael Vogel 49e8528e52
Small cleanup 2016-05-01 13:46:08 +02:00
Michael Vogel 1424ff9fea
"import" is now "receive" 2016-05-01 13:46:08 +02:00
Michael Vogel 8521d79606
Conversations should work now too. 2016-05-01 13:46:08 +02:00
Michael Vogel b1dc4cc528
Retractions could work now. 2016-05-01 13:46:08 +02:00
Michael Vogel bad5a6e84a
Some beautification 2016-05-01 13:46:08 +02:00
Michael Vogel 599d242e00
Some work at the retractions. 2016-05-01 13:46:08 +02:00
Michael Vogel f70ee94fa0
Likes would now work with unlikes and with likes on comments. 2016-05-01 13:46:08 +02:00
Michael Vogel c88fd73b80
Just another commit message :-) 2016-05-01 13:46:08 +02:00
Michael Vogel 558f13e322
Reshares could work now, code is cleaned 2016-05-01 13:46:08 +02:00
Michael Vogel f06f27c93d
Account deletion should work, status messages works - reshares are half done. 2016-05-01 13:46:08 +02:00
Michael Vogel 81f5a359bf
"profile". "like" and "comment" could work, status messages only partly. 2016-05-01 13:46:08 +02:00
Michael Vogel 859c9501f5
Like and Comment could work (partially) 2016-05-01 13:46:08 +02:00
Michael Vogel 37e25313a4
New Diaspora code 2016-05-01 13:46:08 +02:00
rabuzarus 0e531e148e
rework autocomplete: polishing class and methods naming 2016-05-01 13:46:08 +02:00
rabuzarus 2bd60075ae
rework autocomplete: some styling if contact is forum 2016-05-01 13:46:08 +02:00
rabuzarus ac912eaadf
rework autocomplete: add NavBar forum search 2016-05-01 13:46:08 +02:00
rabuzarus 341a22800d
rework autocomplete: add class dir and static function 2016-05-01 13:46:08 +02:00
rabuzarus 12479fb478
rework autocomplete: Access list of smilies over JSON 2016-05-01 13:46:08 +02:00
rabuzarus 586b251539
rework autocomplete: some cleanup and docu 2016-05-01 13:46:08 +02:00
rabuzarus 7ee0bca2bb
rework autocomplete: new ac for poke, contacts, prv_messages 2016-05-01 13:45:38 +02:00
rabuzarus 6d159633d4
rework autocomplete: make remote and local search work 2016-05-01 13:45:17 +02:00
rabuzarus 3dad86f0e0 add a hook call to acl_lookup() 2016-04-28 22:15:55 +02:00
Michael Vogel af22007481 Bugfix for XML function 2016-04-28 08:30:15 +02:00
Tobias Diekershoff 1644919880 Merge pull request #2489 from annando/1604-unseen
Check before doing the database update
2016-04-28 07:18:35 +02:00
Michael Vogel 5e4a2badb2 Check before doing the database update 2016-04-28 06:56:55 +02:00
rabuzarus 9b3931e48a xml: rename convert_element_to_array to element_to_array 2016-04-27 17:04:46 +02:00
rabuzarus dbc39bea74 move xml related function to the xml class + some doxygen docu 2016-04-27 16:31:03 +02:00
Michael Vogel ca72c5f256 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 22:25:13 +02:00
Michael Vogel 18aa43e6f6 Code redesign and comments 2016-04-25 22:10:45 +02:00
Michael Vogel 2c75a0fefc Minor session stuff 2016-04-25 20:43:40 +02:00
Tobias Diekershoff 714eb1a296 Merge pull request #2479 from annando/1604-vier-login
Vier: No visible login border/no search and events without login
2016-04-25 20:24:10 +02:00
Michael Vogel f0d5c97c08 Merge remote-tracking branch 'upstream/develop' into 1604-cookie 2016-04-25 16:44:06 +02:00
Michael Vogel 75fefeba95 Only hide the search if "local_search" was activated. 2016-04-25 16:42:16 +02:00
Michael Vogel 8c2a4fe02a We now work with a hash to avoid cookie manipulation 2016-04-25 11:19:42 +02:00
Michael Vogel a214fc798a "Remember Me" should work now but needs more fine tuning 2016-04-25 07:10:40 +02:00
Michael Vogel b4369d51f5 Improved "remember me" functionality 2016-04-25 00:02:43 +02:00
Michael Vogel 0c5f315294 Vier: No visible login border/no search and events without login 2016-04-24 21:45:06 +02:00
Michael Vogel 93347d3279 Bugfix DFRN and bookmark detection 2016-04-24 17:00:19 +02:00
Tobias Diekershoff 1756ecaba3 Merge pull request #2476 from annando/1604-poller-maxlevel
Value to define the maximum level of database connections for the worker
2016-04-23 11:35:43 +02:00
Michael Vogel 5711e561fc Check the global contacts every 90 days/Better handling in item creation 2016-04-23 10:46:16 +02:00
Michael Vogel 76b24f61a9 New (experimental) value to define the maximum level of database connections for the worker 2016-04-23 10:11:09 +02:00
Michael Vogel e76475d81f Quickfix for Hubzilla systems with enabled OStatus addon 2016-04-22 23:58:06 +02:00
Tobias Diekershoff 19a24d6ada Merge pull request #2470 from annando/1604-gprobe
Some gcontact stuff and DDoS/Spam prevention
2016-04-21 08:40:52 +02:00
Michael Vogel 5eb6b75645 Clean the url at "poco" 2016-04-21 07:24:00 +02:00
Michael Vogel e333efc9aa Diaspora: Comments and Likes are now signed at any time 2016-04-20 23:27:33 +02:00
Michael Vogel 0434b0485a Start a gcontact probing for new gcontacts 2016-04-20 21:47:57 +02:00
Michael Vogel 378d444fc3 Only do the cleaning on specific networks 2016-04-20 09:38:06 +02:00
Michael Vogel 7f8aee2baa Don't clean the contact url of feeds 2016-04-20 09:31:36 +02:00
Michael Vogel ea3ecd83ea We have to store feeds in the gcontact table ... 2016-04-20 08:27:11 +02:00
Michael Vogel 919728126a Bugfix: We checked in the wrong array ... 2016-04-20 07:58:52 +02:00
Michael Vogel c6fb6c559a Improved logging 2016-04-20 07:48:21 +02:00
Michael Vogel bc0ba8a0d7 Added description 2016-04-20 07:26:18 +02:00
Michael Vogel 28f97845ca Some more checks that the gcontact table contains valid data 2016-04-20 07:00:55 +02:00
Michael Vogel bb5421d925 Bugfix: The function to remove parts of attachments forgot about the rest 2016-04-20 00:12:27 +02:00
Tobias Diekershoff f7548b87c6 Merge pull request #2463 from annando/1604-diaspora-again
Some small Diaspora changes
2016-04-19 21:35:33 +02:00
Michael Vogel 53d8c21d3c Don't store unknown networks 2016-04-19 20:39:12 +02:00
Michael Vogel cb12e145a7 Don't cache account probing for empty networks 2016-04-19 16:19:23 +02:00
Michael Vogel ea8cfed6a9 Some small Diaspora changes 2016-04-19 07:39:17 +02:00
Michael Vogel 432c1ec5e4 Now we are having "after" at the old attach mechanism as well 2016-04-18 21:28:09 +02:00
Michael Vogel 999ef7f679 Attachments: Better handling of preview pictures 2016-04-18 12:13:54 +02:00
Michael Vogel 26f62a97fd Bugfix: Missing include added 2016-04-18 06:11:29 +02:00
Michael Vogel 81bcafe28f Improved handling of photos 2016-04-17 23:38:29 +02:00
Michael Vogel 502b660ca9 Added documentation 2016-04-17 20:55:19 +02:00
Michael Vogel 49d52faab5 Use the "attachment" element instead of a mixture of several elements 2016-04-17 20:43:41 +02:00
Tobias Diekershoff e44bec3c37 Merge pull request #2452 from annando/1604-clean-contact-url
Clean gcontact url before saving in gcontact table
2016-04-17 16:51:06 +02:00
Michael Vogel ae75a46529 the "nurl" index was accidentally dropped 2016-04-17 16:41:28 +02:00
Michael Vogel 017bfe17f8 Speeding up the gcontact search 2016-04-17 13:46:49 +02:00
Michael Vogel 2d4fd30cc3 Merge remote-tracking branch 'upstream/develop' into 1604-clean-contact-url 2016-04-17 11:55:51 +02:00
Michael Vogel 146dc5c8cd Added comment 2016-04-16 17:01:32 +02:00
Michael Vogel 57cadf5b8f Clean gcontact url before saving in gcontact table 2016-04-16 15:22:54 +02:00
Michael Vogel f8c96d24b4 Speed up the contact search, proxy the images, search for addresses 2016-04-16 15:01:03 +02:00
Tobias Diekershoff bbd5878734 Merge pull request #2449 from rabuzarus/1404_reworked_autocomplete
new autocompletion
2016-04-16 08:16:21 +02:00
rabuzarus ce1faf17d1 rework autocomplete: some polishing 2016-04-14 17:05:19 +02:00
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
Michael Vogel d6a79abb68 Bugfix: "default_group" behaviour wasn't implemented correctly 2016-04-13 22:21:23 +02:00
Michael Vogel 018b3ed25f API: Just some more elements where Twidere has problems ... 2016-04-12 22:53:54 +02:00
Michael Vogel 34dc23b871 API: Improvement for Twidere/Conversation call improved 2016-04-09 22:44:32 +02:00
Tobias Diekershoff dfa5183774 Merge pull request #2441 from rabuzarus/0704_doxygen_forum
Update ForumManager.php
2016-04-07 21:06:32 +02:00
rabuzarus d5bf386cf7 Update ForumManager.php - small correction 2016-04-07 16:58:26 +02:00
rabuzarus a3c79d2007 Update ForumManager.php
fix some doxygen description
2016-04-07 14:43:56 +02:00
Michael Vogel 542be50e26 Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2016-04-05 23:35:33 +02:00
Michael Vogel 952f8514a5 "remember me" in session does work now 2016-04-05 23:28:33 +02:00
Tobias Diekershoff b9d9ffbd01 Merge pull request #2429 from annando/1604-item-shadow
New post update function, search is now using the "global" field
2016-04-03 19:55:34 +02:00
Michael Vogel 1f61efc7fe Scrape: Changed detection for the profile link 2016-04-03 19:29:35 +02:00
Michael Vogel 3fdaafd54a Some more documentation 2016-04-03 18:49:41 +02:00
Michael Vogel f192767d7a Some reverted stuff 2016-04-03 16:38:32 +02:00
Michael Vogel 9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
Michael Vogel beb1e04069 New field in item table ("shadow") that indicates if there is a shadow entry 2016-04-03 13:48:31 +02:00
Michael Vogel ce2c1b4fc1 Small bugfix: We always liked the parent 2016-04-02 17:43:53 +02:00
Michael Vogel 68b88c0384 Notify and poll aren't fetched at the moment 2016-04-02 15:49:57 +02:00
Michael Vogel b4b62493e6 Bugfix: The nickname vanished/better way to fetch the alias 2016-04-02 15:41:55 +02:00
Michael Vogel e5377a5e91 Merge remote-tracking branch 'upstream/develop' into 1604-salmon-like 2016-04-02 14:12:02 +02:00
Michael Vogel fd965b046a Update contact data for uid=0 at feed import 2016-04-02 14:10:40 +02:00
Tobias Diekershoff c30306e085 Merge pull request #2424 from annando/1603-scrape-alias
Scrape: Always take the first alias
2016-04-02 09:48:31 +02:00
Michael Vogel bc05984786 Only update contact when scrape runs with "probe_normal" 2016-04-02 09:06:10 +02:00
Michael Vogel 08fb662b4a OStatus: Salmon now works with "likes"/The alias is stored now as well 2016-04-02 00:24:56 +02:00
Michael Vogel eeb462cd04 Only update the contact entry with uid=0 2016-04-01 21:41:37 +02:00
Michael Vogel 416a0e5ec2 Don't optimize the tables when the maximum size is lower than zero 2016-04-01 21:09:52 +02:00
Michael Vogel ffcc5f372f Some more documentation 2016-03-31 22:24:54 +02:00
Michael Vogel d0b8f2092d Some more documentation 2016-03-31 22:01:56 +02:00
Michael Vogel ffd73d137b Added some documentation 2016-03-31 07:34:13 +02:00
Michael Vogel 6ff5c23d50 Doxygen structure added 2016-03-31 00:14:51 +02:00
Michael Vogel 1f2c495cd8 Tempory file is deleted 2016-03-30 23:26:37 +02:00
Michael Vogel 2c5b5c1cd4 OStatus class is now moved into the right place 2016-03-30 23:25:20 +02:00
Michael Vogel 7be0020da9 Merge remote-tracking branch 'upstream/develop' into 1603-scrape-alias 2016-03-30 12:47:48 +02:00
Michael Vogel 4a5a964d89 "Scrape" now respects the new url formats with "index.php" 2016-03-30 12:46:10 +02:00
Michael Vogel b93e1d73a1 New OStatus implementation 2016-03-30 12:43:15 +02:00
Michael Vogel 4d668fac8b Not sure if that is correct ... 2016-03-29 17:54:36 +02:00
Michael Vogel f80f4f6a97 Some changed doxygen header stuff 2016-03-28 22:35:11 +02:00
Michael Vogel b6121a0009 And wow ... some more documentation 2016-03-28 00:06:46 +02:00
Michael Vogel 7e711d9d62 And some more doc stuff 2016-03-27 23:38:35 +02:00
Michael Vogel faa9b77a90 Some more small documentation stuff 2016-03-27 23:25:32 +02:00
Michael Vogel 16ef9f4940 Support for the new contact request data type 2016-03-25 00:49:18 +01:00
Michael Vogel 7e7cac19f6 Avoid a guid whith spaces. 2016-03-24 21:32:55 +01:00
Michael Vogel ec90a9e6ad Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-24 16:19:52 +01:00
Michael Vogel 7bf079d858 Some more documentation - again. 2016-03-24 15:59:53 +01:00
Michael Vogel 24afcdd5dd Scrape: Always take the first alias 2016-03-24 08:35:06 +01:00
Michael Vogel 7aae852fe0 Some more code cleaning 2016-03-23 22:12:08 +01:00
Michael Vogel 799ff77797 API: Support for the conversation api call from GNU Social 2016-03-23 10:24:01 +01:00
Michael Vogel ac35f8c756 If the message already exists then the message id should be returned 2016-03-23 09:22:59 +01:00
Michael Vogel 28dfaa694c Add OEmbed data to the body of reshares 2016-03-23 07:36:17 +01:00
Michael Vogel e8c07aaac6 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-23 06:59:20 +01:00
Michael Vogel 791ce24cd5 Bugfix: Avoid warning with non object OEmbed data 2016-03-22 23:24:07 +01:00
Michael Vogel 62103fe5f4 Reshare of reshares now work. 2016-03-22 23:00:42 +01:00
Michael Vogel 90d4b93424 Avoid an empty handle 2016-03-22 07:13:56 +01:00
Michael Vogel c284ab5eff Some more documentation - to make @rabuzarus happy 2016-03-21 19:58:45 +01:00
Michael Vogel 206c26ae30 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-21 06:47:47 +01:00
Tobias Diekershoff 53546e92d3 Merge pull request #2420 from annando/1603-guid
Add the guid to items that we create locally
2016-03-21 06:40:55 +01:00
Michael Vogel 5a04ba8416 Added documentation 2016-03-20 16:16:15 +01:00
Michael Vogel 77ed71e2e0 DFRN: Remote tagging works now 2016-03-20 15:53:37 +01:00
Michael Vogel 8f00836ffb Add the guid to items that we create locally 2016-03-20 15:01:50 +01:00
Michael Vogel d676ae0f32 The signature creation now moved into the Diaspora class. That's much cleaner. 2016-03-19 15:49:47 +01:00
Michael Vogel 5c44a787bf The documentation should now be complete 2016-03-18 22:28:20 +01:00
Michael Vogel be5267edda Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-18 21:28:34 +01:00
fabrixxm bfde20f5fe Merge pull request #2417 from annando/1603-sess_data
There is no table "sess_data" - this database call is useless
2016-03-18 18:46:28 +01:00
Michael Vogel a2507804f2 There is no table "sess_data" - this database call is useless 2016-03-18 16:42:10 +01:00
Michael Vogel e74587b375 Just some more documentation 2016-03-18 08:07:23 +01:00
Michael Vogel fab48926d0 Added some documentation, script to generate a basic doxygen header 2016-03-17 23:44:18 +01:00
Tobias Diekershoff bc579ff799 added title element to emoji images in main repository 2016-03-17 17:41:06 +01:00
Michael Vogel 16b92af71f Retraction do work as well 2016-03-17 12:24:23 +01:00
Michael Vogel 88fea17cab Everything tested, one open to-do 2016-03-17 00:37:44 +01:00
Michael Vogel e058feed28 Better reshare detection 2016-03-16 21:27:07 +01:00
Michael Vogel 468734a26e Added checklist 2016-03-16 19:30:46 +01:00
Michael Vogel f6c950823f Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-16 19:30:26 +01:00
Michael Vogel 84a475e589 Missing include 2016-03-16 16:49:54 +01:00
Michael Vogel 071ffd43bf DFRN: Mentions were imported as hash tags 2016-03-16 11:44:45 +01:00
Michael Vogel be001d171b Values are sanitized, messages are not relayed when there is no signature 2016-03-15 20:14:08 +01:00
Michael Vogel 8027854886 Removed moved function 2016-03-15 07:18:11 +01:00
Michael Vogel eed55664fc Reshares now store the original XML as well. 2016-03-15 00:26:28 +01:00
Michael Vogel 4b5e7007a7 Bugfix: XML copy had problems with "&" 2016-03-14 23:54:01 +01:00
Michael Vogel dc2e7a66b3 The Diaspora class is now productive 2016-03-14 23:11:43 +01:00
Michael Vogel 6f43d3a4c4 Profile update is now working with the new function as well 2016-03-14 22:10:26 +01:00
Michael Vogel 56cb6cc897 Removed just more old diaspora function calls. 2016-03-14 20:53:44 +01:00
Michael Vogel 3734555715 Conversations are working now too 2016-03-14 20:04:17 +01:00
Michael Vogel 9ae2b2292f Some more function calls changed to the new class 2016-03-14 08:11:14 +01:00
Michael Vogel 75f5cfe63e Retraction and reshares work 2016-03-13 21:11:48 +01:00
Michael Vogel 2841aa0281 New implementation is now live. 2016-03-13 19:47:02 +01:00
Michael Vogel 07818a6553 Decode function is now there as well. 2016-03-13 16:14:51 +01:00
Michael Vogel f8f19038bf XML generation is now improved 2016-03-13 09:57:44 +01:00
Michael Vogel f978bc9cc8 Some code cleaning, changes to the xml generation 2016-03-13 07:10:24 +01:00
Michael Vogel 0f65eee695 Everything could work - needs some beautification and documentation 2016-03-12 19:19:20 +01:00
Roland Haeder 9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result().
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 18:54:55 +01:00
Roland Haeder c60605ce0c
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-12 18:50:14 +01:00
Michael Vogel a0aeea4a89 Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-12 07:38:25 +01:00
Michael Vogel 2718c8150f The table optimisation level calculation is now using the index size as well 2016-03-11 20:32:22 +01:00
Michael Vogel cd0fbc5e9a Merge remote-tracking branch 'upstream/develop' into 1602-diaspora 2016-03-10 08:22:52 +01:00
Michael Vogel df312402e4 Bugfix: A parameter was missing for the OStatus author check 2016-03-09 22:51:17 +01:00
Michael Vogel c0bd7a866d Some small addition to the OStatus part. Better check if we follow the actor. 2016-03-09 21:53:30 +01:00
Michael Vogel 32c66246c4 Some fixes for the fetching of postings by using /p/ 2016-03-09 19:30:04 +01:00
Michael Vogel 65d6d45f8c Changed parameter order 2016-03-08 22:28:49 +01:00
Michael Vogel beb2346cfc The function to check for maxload and the lockfile is centralized 2016-03-08 20:28:09 +01:00
Michael Vogel ec9c9f0be7 Don't create lock files if the process is called from the poller via the worker 2016-03-08 00:20:06 +01:00
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 d88606321d
Just easier code ...
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 22:39:08 +01:00
Roland Haeder 425665795d
Merge branch 'fixes/poller-warning' into rhaeder-develop 2016-03-04 22:38:47 +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
Roland Haeder cc4349777a
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 20:05:24 +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 24cbac1a5b Also use is_filled_array() here, too. if $contacts is FALSE count() issues are E_WARNING
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +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 ba99ac7200 Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2016-02-17 12:21:03 +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
Michael Vogel a18fde458c Added documentation. 2016-02-16 08:06:55 +01:00
Michael Vogel ade5ef7065 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-16 07:58:01 +01:00
Tobias Diekershoff e9fe220116 Merge pull request #2356 from annando/1602-redmatrix-name
We now show the correct platform (redmatrix or hubzilla)
2016-02-15 07:38:16 +01:00
Michael Vogel 92007a1438 Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2016-02-14 21:04:59 +01:00
Michael Vogel ec1bfe3d22 Merge remote-tracking branch 'upstream/develop' into 1602-redmatrix-name 2016-02-14 21:03:57 +01:00
Michael Vogel 88018b6e73 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-14 20:57:57 +01:00
Michael Vogel b0548018d8 Simplepie is removed since we don't use it anymore 2016-02-14 19:50:59 +01:00
Michael Vogel 21fc3c60d4 We now show the correct platform (redmatrix or hubzilla) 2016-02-14 15:05:43 +01:00
Michael Vogel ec57b61f01 The feed function has now a simulation mode 2016-02-14 15:02:59 +01:00
Michael Vogel 922186bdd1 Small bugfix for the keyword bug in the gcontact table 2016-02-14 12:39:57 +01:00
Michael Vogel 5d35974c19 "addr" and "server_url" are now generated directly in "update_gcontact" if not given. 2016-02-14 11:56:23 +01:00
fabrixxm 3f5f1351b9 api: throw HTTPException instead of calling api_error directly
there was some places where api_error() was called instead of throwing
correct subclass of HTTPException. This was causing php errors.

Dogygen comment of api_error() is updated as well
2016-02-14 11:24:51 +01:00
Michael Vogel b9e1792076 The shadow contact (contact with uid=0) will be updated now as well. 2016-02-14 07:31:57 +01:00
Michael Vogel 5086b8b2a7 DFRN Bugfix: The poco data wasn't sent 2016-02-14 00:14:03 +01:00
Michael Vogel 15296b8036 Avoid errors when noscrape data can't be fetched. 2016-02-13 22:20:00 +01:00
Michael Vogel f496af08bb OStatus: The gcontact table will now be updated from the conversation as well 2016-02-13 21:35:05 +01:00
Michael Vogel 9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup 2016-02-13 20:12:31 +01:00
Tobias Diekershoff d0b5c16a20 Merge pull request #2351 from annando/1602-performance-unread-group
Optimized query for unread group postings
2016-02-13 19:43:33 +01:00
Michael Vogel bf7dedb03b Optimized query for unread group postings 2016-02-13 18:15:24 +01:00
Michael Vogel a4da9fb55d Update the gcontact entry when the contact entry is checked for updates 2016-02-13 14:09:08 +01:00
Michael Vogel 253ba45c1a Added a to-do 2016-02-13 13:30:53 +01:00
Tobias Diekershoff 4ee15cc682 Merge pull request #2334 from fabrixxm/feature_autoloader
Autoloader
2016-02-13 12:27:24 +01:00
Michael Vogel 2ca6cdf6b6 Improvements how gcontact entries are updated 2016-02-13 12:26:58 +01:00
Michael Vogel acb09d3a3d Database connections: When we now check for user values we check the system values as well 2016-02-12 11:04:25 +01:00
Tobias Diekershoff 8451397857 Merge pull request #2346 from annando/1602-poller-user-limits
Poller: Now the user limits can be detected automatically as well
2016-02-12 08:17:30 +01:00