Merge remote-tracking branch 'upstream/develop' into parent-view
This commit is contained in:
commit
1129e8f17d
147 changed files with 1736 additions and 1725 deletions
|
|
@ -311,9 +311,9 @@ return [
|
|||
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
|
||||
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner id of this permission set"],
|
||||
"allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
|
||||
"deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
|
||||
],
|
||||
"indexes" => [
|
||||
"PRIMARY" => ["id"],
|
||||
|
|
@ -513,9 +513,9 @@ return [
|
|||
"created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time"],
|
||||
"edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edit time"],
|
||||
"allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
|
||||
"deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
|
||||
"backend-class" => ["type" => "tinytext", "comment" => "Storage backend class"],
|
||||
"backend-ref" => ["type" => "text", "comment" => "Storage backend data reference"],
|
||||
],
|
||||
|
|
@ -715,9 +715,9 @@ return [
|
|||
"nofinish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if event does have no end this is 1"],
|
||||
"ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "0 or 1"],
|
||||
"allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
|
||||
"deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
|
||||
],
|
||||
"indexes" => [
|
||||
"PRIMARY" => ["id"],
|
||||
|
|
@ -760,14 +760,14 @@ return [
|
|||
]
|
||||
],
|
||||
"group" => [
|
||||
"comment" => "privacy groups, group info",
|
||||
"comment" => "privacy circles, circle info",
|
||||
"fields" => [
|
||||
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
|
||||
"uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
|
||||
"visible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the member list is not private"],
|
||||
"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the group has been deleted"],
|
||||
"deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 indicates the circle has been deleted"],
|
||||
"cid" => ["type" => "int unsigned", "foreign" => ["contact" => "id"], "comment" => "Contact id of forum. When this field is filled then the members are synced automatically."],
|
||||
"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of group"],
|
||||
"name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "human readable name of circle"],
|
||||
],
|
||||
"indexes" => [
|
||||
"PRIMARY" => ["id"],
|
||||
|
|
@ -776,11 +776,11 @@ return [
|
|||
]
|
||||
],
|
||||
"group_member" => [
|
||||
"comment" => "privacy groups, member info",
|
||||
"comment" => "privacy circles, member info",
|
||||
"fields" => [
|
||||
"id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"],
|
||||
"gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["group" => "id"], "comment" => "groups.id of the associated group"],
|
||||
"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated group"],
|
||||
"gid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["group" => "id"], "comment" => "group.id of the associated circle"],
|
||||
"contact-id" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact.id of the member assigned to the associated circle"],
|
||||
],
|
||||
"indexes" => [
|
||||
"PRIMARY" => ["id"],
|
||||
|
|
@ -1150,9 +1150,9 @@ return [
|
|||
"scale" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
|
||||
"profile" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
|
||||
"allow_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed contact.id '<19><78>'"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed groups"],
|
||||
"allow_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of allowed circles"],
|
||||
"deny_cid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied contact.id"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied groups"],
|
||||
"deny_gid" => ["type" => "mediumtext", "comment" => "Access Control - list of denied circles"],
|
||||
"accessible" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Make photo publicly accessible, ignoring permissions"],
|
||||
"backend-class" => ["type" => "tinytext", "comment" => "Storage backend class"],
|
||||
"backend-ref" => ["type" => "text", "comment" => "Storage backend data reference"],
|
||||
|
|
|
|||
|
|
@ -310,10 +310,10 @@ return [
|
|||
// Number of "free" searches when system => permit_crawling is enabled.
|
||||
'free_crawls' => 10,
|
||||
|
||||
// groupedit_image_limit (Integer)
|
||||
// Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names.
|
||||
// circle_edit_image_limit (Integer)
|
||||
// Number of contacts at which the circle editor should switch from display the profile pictures of the contacts to only display the names.
|
||||
// This can alternatively be set on a per-account basis in the pconfig table.
|
||||
'groupedit_image_limit' => 400,
|
||||
'circle_edit_image_limit' => 400,
|
||||
|
||||
// gserver_update_limit (Integer)
|
||||
// How many servers should be checked at a time?
|
||||
|
|
|
|||
|
|
@ -89,12 +89,20 @@ $apiRoutes = [
|
|||
'/direct_messages_setseen[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\DirectMessages\Setseen::class, [ R::POST]],
|
||||
'/direct_messages_search[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\DirectMessages\Search ::class, [R::GET ]],
|
||||
'/events[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Index::class, [R::GET ]],
|
||||
'/event_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Create::class, [ R::POST]],
|
||||
'/event_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Delete::class, [ R::POST]],
|
||||
'/group_show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Show::class, [R::GET ]],
|
||||
'/group_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Create::class, [ R::POST]],
|
||||
'/group_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Delete::class, [ R::POST]],
|
||||
'/group_update[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Group\Update::class, [ R::POST]],
|
||||
'/event_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Create::class, [ R::POST]],
|
||||
'/event_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Events\Delete::class, [ R::POST]],
|
||||
'/circle_show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Show::class, [R::GET ]],
|
||||
'/circle_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Create::class, [ R::POST]],
|
||||
'/circle_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Delete::class, [ R::POST]],
|
||||
'/circle_update[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Update::class, [ R::POST]],
|
||||
|
||||
// Backward compatibility
|
||||
// @deprecated
|
||||
'/group_show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Show::class, [R::GET ]],
|
||||
'/group_create[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Create::class, [ R::POST]],
|
||||
'/group_delete[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Delete::class, [ R::POST]],
|
||||
'/group_update[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Circle\Update::class, [ R::POST]],
|
||||
|
||||
'/profile/show[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Profile\Show::class, [R::GET ]],
|
||||
'/photoalbums[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Photoalbum\Index::class, [R::GET ]],
|
||||
'/photoalbum[.{extension:json|xml|rss|atom}]' => [Module\Api\Friendica\Photoalbum\Show::class, [R::GET ]],
|
||||
|
|
@ -446,14 +454,14 @@ return [
|
|||
|
||||
'/fsuggest/{contact:\d+}' => [Module\FriendSuggest::class, [R::GET, R::POST]],
|
||||
|
||||
'/group' => [
|
||||
'[/]' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/{group:\d+}' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/none' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/new' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/drop/{group:\d+}' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/{group:\d+}/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/{group:\d+}/{command:add|remove}/{contact:\d+}' => [Module\Group::class, [R::GET, R::POST]],
|
||||
'/circle' => [
|
||||
'[/]' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
'/{circle:\d+}' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
'/none' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
'/new' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
'/drop/{circle:\d+}' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
'/{circle:\d+}/{contact:\d+}' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
'/{circle:\d+}/{command:add|remove}/{contact:\d+}' => [Module\Circle::class, [R::GET, R::POST]],
|
||||
],
|
||||
'/hashtag' => [Module\Hashtag::class, [R::GET]],
|
||||
'/help[/{doc:.+}]' => [Module\Help::class, [R::GET]],
|
||||
|
|
@ -511,7 +519,7 @@ return [
|
|||
'/newmember' => [Module\Welcome::class, [R::GET]],
|
||||
'/nodeinfo/1.0' => [Module\NodeInfo110::class, [R::GET]],
|
||||
'/nodeinfo/2.0' => [Module\NodeInfo120::class, [R::GET]],
|
||||
'/nogroup' => [Module\Group::class, [R::GET]],
|
||||
'/nocircle' => [Module\Circle::class, [R::GET]],
|
||||
|
||||
'/noscrape' => [
|
||||
'/{nick}' => [Module\NoScrape::class, [R::GET]],
|
||||
|
|
@ -660,7 +668,7 @@ return [
|
|||
'[/]' => [Module\Conversation\Network::class, [R::GET]],
|
||||
'/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Conversation\Network::class, [R::GET]],
|
||||
'/forum/{contact_id:\d+}' => [Module\Conversation\Network::class, [R::GET]],
|
||||
'/group/{group_id:\d+}' => [Module\Conversation\Network::class, [R::GET]],
|
||||
'/circle/{circle_id:\d+}' => [Module\Conversation\Network::class, [R::GET]],
|
||||
],
|
||||
|
||||
'/randprof' => [Module\RandomProfile::class, [R::GET]],
|
||||
|
|
@ -680,7 +688,7 @@ return [
|
|||
'[/]' => [Module\Update\Network::class, [R::GET]],
|
||||
'/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Update\Network::class, [R::GET]],
|
||||
'/forum/{contact_id:\d+}' => [Module\Update\Network::class, [R::GET]],
|
||||
'/group/{group_id:\d+}' => [Module\Update\Network::class, [R::GET]],
|
||||
'/circle/{circle_id:\d+}' => [Module\Update\Network::class, [R::GET]],
|
||||
],
|
||||
|
||||
'/update_profile' => [Module\Update\Profile::class, [R::GET]],
|
||||
|
|
|
|||
|
|
@ -114,9 +114,9 @@ return [
|
|||
// Default value comprises classic role names from RFC 2142.
|
||||
'forbidden_nicknames' => 'info, marketing, sales, support, abuse, noc, security, postmaster, hostmaster, usenet, news, webmaster, www, uucp, ftp, root, sysop',
|
||||
|
||||
// compute_group_counts (Boolean)
|
||||
// Compute contact group level when counting unseen network posts.
|
||||
'compute_group_counts' => true,
|
||||
// compute_circle_counts (Boolean)
|
||||
// Compute contact circle level when counting unseen network posts.
|
||||
'compute_circle_counts' => true,
|
||||
|
||||
// jpeg_quality (Integer)
|
||||
// Sets the ImageMagick quality level for JPEG images. Values ranges from 50 (awful) to 100 (near perfect).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue