From e73566c0a1bab49ca1da8011d61197289189c563 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 2 Nov 2024 16:11:29 +0000 Subject: [PATCH] SVG icons for various fediverse systems --- LICENSES/AGPL-3.0-only.txt | 661 ++++++++++++++++++ LICENSES/CC-PDDC.txt | 9 + LICENSES/EUPL-1.2.txt | 287 ++++++++ LICENSES/Zlib.txt | 15 + images/platforms/black/akkoma.svg | 7 + images/platforms/black/akkoma.svg.license | 2 + images/platforms/black/bluesky.svg | 1 + images/platforms/black/bluesky.svg.license | 2 + images/platforms/black/calckey.svg | 13 + images/platforms/black/calckey.svg.license | 2 + images/platforms/black/diaspora.svg | 8 + images/platforms/black/diaspora.svg.license | 2 + images/platforms/black/discourse.svg | 2 + images/platforms/black/discourse.svg.license | 2 + images/platforms/black/email.svg | 4 + images/platforms/black/email.svg.license | 2 + images/platforms/black/firefish.svg | 1 + images/platforms/black/firefish.svg.license | 2 + images/platforms/black/flipboard.svg | 2 + images/platforms/black/flipboard.svg.license | 2 + images/platforms/black/friendica.svg | 8 + images/platforms/black/friendica.svg.license | 3 + images/platforms/black/glitchsoc.svg | 7 + images/platforms/black/glitchsoc.svg.license | 2 + images/platforms/black/gnusocial.svg | 10 + images/platforms/black/gnusocial.svg.license | 2 + images/platforms/black/gotosocial.svg | 9 + images/platforms/black/gotosocial.svg.license | 2 + images/platforms/black/hometown.svg | 17 + images/platforms/black/hometown.svg.license | 2 + images/platforms/black/hubzilla.svg | 8 + images/platforms/black/hubzilla.svg.license | 2 + images/platforms/black/iceshrimp.svg | 1 + images/platforms/black/iceshrimp.svg.license | 2 + images/platforms/black/lemmy.svg | 75 ++ images/platforms/black/lemmy.svg.license | 2 + images/platforms/black/mastodon.svg | 9 + images/platforms/black/mastodon.svg.license | 2 + images/platforms/black/mbin.svg | 1 + images/platforms/black/mbin.svg.license | 2 + images/platforms/black/misskey.svg | 1 + images/platforms/black/misskey.svg.license | 2 + images/platforms/black/mobilizon.svg | 2 + images/platforms/black/mobilizon.svg.license | 2 + images/platforms/black/peertube.svg | 7 + images/platforms/black/peertube.svg.license | 2 + images/platforms/black/pixelfed.svg | 8 + images/platforms/black/pixelfed.svg.license | 2 + images/platforms/black/pleroma.svg | 8 + images/platforms/black/pleroma.svg.license | 2 + images/platforms/black/plume.svg | 9 + images/platforms/black/plume.svg.license | 2 + images/platforms/black/pump-io.svg | 108 +++ images/platforms/black/pump-io.svg.license | 2 + images/platforms/black/rss.svg | 8 + images/platforms/black/rss.svg.license | 2 + images/platforms/black/sharkey.svg | 1 + images/platforms/black/sharkey.svg.license | 2 + images/platforms/black/threads.svg | 1 + images/platforms/black/threads.svg.license | 2 + images/platforms/black/tumblr.svg | 19 + images/platforms/black/tumblr.svg.license | 2 + images/platforms/black/wordpress.svg | 10 + images/platforms/black/wordpress.svg.license | 2 + images/platforms/color/activitypub.svg | 288 ++++++++ .../platforms/color/activitypub.svg.license | 2 + images/platforms/color/akkoma.svg | 7 + images/platforms/color/akkoma.svg.license | 2 + images/platforms/color/bluesky.svg | 4 + images/platforms/color/bluesky.svg.license | 2 + images/platforms/color/discourse.svg | 8 + images/platforms/color/discourse.svg.license | 2 + images/platforms/color/firefish.svg | 153 ++++ images/platforms/color/firefish.svg.license | 2 + images/platforms/color/flipboard.svg | 9 + images/platforms/color/flipboard.svg.license | 2 + images/platforms/color/friendica.svg | 1 + images/platforms/color/friendica.svg.license | 2 + images/platforms/color/gnusocial.svg | 99 +++ images/platforms/color/gnusocial.svg.license | 2 + images/platforms/color/mastodon.svg | 10 + images/platforms/color/mastodon.svg.license | 2 + images/platforms/color/peertube.svg | 1 + images/platforms/color/peertube.svg.license | 2 + images/platforms/color/pixelfed.svg | 101 +++ images/platforms/color/pixelfed.svg.license | 2 + images/platforms/color/pleroma.svg | 75 ++ images/platforms/color/pleroma.svg.license | 2 + images/platforms/color/rss.svg | 18 + images/platforms/color/rss.svg.license | 2 + images/platforms/color/tumblr.svg | 18 + images/platforms/color/tumblr.svg.license | 2 + images/platforms/color/wordpress.svg | 1 + images/platforms/color/wordpress.svg.license | 2 + src/Content/ContactSelector.php | 117 +++- src/Content/Conversation.php | 1 + src/Content/Text/BBCode.php | 1 + src/Content/Widget/VCard.php | 3 + src/Core/Protocol.php | 18 +- src/Model/GServer.php | 21 + src/Module/Admin/Federation.php | 7 + .../Moderation/Blocklist/Server/Add.php | 1 + src/Module/Settings/Display.php | 4 + src/Object/Post.php | 1 + view/lang/C/messages.po | 406 +++++------ view/templates/admin/federation.tpl | 7 +- view/templates/settings/display.tpl | 1 + view/templates/shared_content.tpl | 20 +- view/theme/frio/css/style.css | 8 +- view/theme/frio/scheme/black.css | 4 + view/theme/frio/scheme/dark.css | 4 + view/theme/frio/templates/search_item.tpl | 6 +- .../theme/frio/templates/settings/display.tpl | 1 + view/theme/frio/templates/wall_thread.tpl | 18 +- view/theme/frio/templates/widget/vcard.tpl | 6 +- 115 files changed, 2640 insertions(+), 236 deletions(-) create mode 100644 LICENSES/AGPL-3.0-only.txt create mode 100644 LICENSES/CC-PDDC.txt create mode 100644 LICENSES/EUPL-1.2.txt create mode 100644 LICENSES/Zlib.txt create mode 100644 images/platforms/black/akkoma.svg create mode 100644 images/platforms/black/akkoma.svg.license create mode 100644 images/platforms/black/bluesky.svg create mode 100644 images/platforms/black/bluesky.svg.license create mode 100644 images/platforms/black/calckey.svg create mode 100644 images/platforms/black/calckey.svg.license create mode 100644 images/platforms/black/diaspora.svg create mode 100644 images/platforms/black/diaspora.svg.license create mode 100644 images/platforms/black/discourse.svg create mode 100644 images/platforms/black/discourse.svg.license create mode 100644 images/platforms/black/email.svg create mode 100644 images/platforms/black/email.svg.license create mode 100644 images/platforms/black/firefish.svg create mode 100644 images/platforms/black/firefish.svg.license create mode 100644 images/platforms/black/flipboard.svg create mode 100644 images/platforms/black/flipboard.svg.license create mode 100644 images/platforms/black/friendica.svg create mode 100644 images/platforms/black/friendica.svg.license create mode 100644 images/platforms/black/glitchsoc.svg create mode 100644 images/platforms/black/glitchsoc.svg.license create mode 100644 images/platforms/black/gnusocial.svg create mode 100644 images/platforms/black/gnusocial.svg.license create mode 100644 images/platforms/black/gotosocial.svg create mode 100644 images/platforms/black/gotosocial.svg.license create mode 100644 images/platforms/black/hometown.svg create mode 100644 images/platforms/black/hometown.svg.license create mode 100644 images/platforms/black/hubzilla.svg create mode 100644 images/platforms/black/hubzilla.svg.license create mode 100644 images/platforms/black/iceshrimp.svg create mode 100644 images/platforms/black/iceshrimp.svg.license create mode 100644 images/platforms/black/lemmy.svg create mode 100644 images/platforms/black/lemmy.svg.license create mode 100644 images/platforms/black/mastodon.svg create mode 100644 images/platforms/black/mastodon.svg.license create mode 100644 images/platforms/black/mbin.svg create mode 100644 images/platforms/black/mbin.svg.license create mode 100644 images/platforms/black/misskey.svg create mode 100644 images/platforms/black/misskey.svg.license create mode 100644 images/platforms/black/mobilizon.svg create mode 100644 images/platforms/black/mobilizon.svg.license create mode 100644 images/platforms/black/peertube.svg create mode 100644 images/platforms/black/peertube.svg.license create mode 100644 images/platforms/black/pixelfed.svg create mode 100644 images/platforms/black/pixelfed.svg.license create mode 100644 images/platforms/black/pleroma.svg create mode 100644 images/platforms/black/pleroma.svg.license create mode 100644 images/platforms/black/plume.svg create mode 100644 images/platforms/black/plume.svg.license create mode 100644 images/platforms/black/pump-io.svg create mode 100644 images/platforms/black/pump-io.svg.license create mode 100644 images/platforms/black/rss.svg create mode 100644 images/platforms/black/rss.svg.license create mode 100644 images/platforms/black/sharkey.svg create mode 100644 images/platforms/black/sharkey.svg.license create mode 100644 images/platforms/black/threads.svg create mode 100644 images/platforms/black/threads.svg.license create mode 100644 images/platforms/black/tumblr.svg create mode 100644 images/platforms/black/tumblr.svg.license create mode 100644 images/platforms/black/wordpress.svg create mode 100644 images/platforms/black/wordpress.svg.license create mode 100644 images/platforms/color/activitypub.svg create mode 100644 images/platforms/color/activitypub.svg.license create mode 100644 images/platforms/color/akkoma.svg create mode 100644 images/platforms/color/akkoma.svg.license create mode 100644 images/platforms/color/bluesky.svg create mode 100644 images/platforms/color/bluesky.svg.license create mode 100644 images/platforms/color/discourse.svg create mode 100644 images/platforms/color/discourse.svg.license create mode 100644 images/platforms/color/firefish.svg create mode 100644 images/platforms/color/firefish.svg.license create mode 100644 images/platforms/color/flipboard.svg create mode 100644 images/platforms/color/flipboard.svg.license create mode 100644 images/platforms/color/friendica.svg create mode 100644 images/platforms/color/friendica.svg.license create mode 100644 images/platforms/color/gnusocial.svg create mode 100644 images/platforms/color/gnusocial.svg.license create mode 100644 images/platforms/color/mastodon.svg create mode 100644 images/platforms/color/mastodon.svg.license create mode 100644 images/platforms/color/peertube.svg create mode 100644 images/platforms/color/peertube.svg.license create mode 100644 images/platforms/color/pixelfed.svg create mode 100644 images/platforms/color/pixelfed.svg.license create mode 100644 images/platforms/color/pleroma.svg create mode 100644 images/platforms/color/pleroma.svg.license create mode 100644 images/platforms/color/rss.svg create mode 100644 images/platforms/color/rss.svg.license create mode 100644 images/platforms/color/tumblr.svg create mode 100644 images/platforms/color/tumblr.svg.license create mode 100644 images/platforms/color/wordpress.svg create mode 100644 images/platforms/color/wordpress.svg.license diff --git a/LICENSES/AGPL-3.0-only.txt b/LICENSES/AGPL-3.0-only.txt new file mode 100644 index 0000000000..be3f7b28e5 --- /dev/null +++ b/LICENSES/AGPL-3.0-only.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/LICENSES/CC-PDDC.txt b/LICENSES/CC-PDDC.txt new file mode 100644 index 0000000000..846c9c00b8 --- /dev/null +++ b/LICENSES/CC-PDDC.txt @@ -0,0 +1,9 @@ +Creative Commons Public Domain Dedication and Certification + +The person or persons who have associated work with this document (the "Dedicator" or "Certifier") hereby either (a) certifies that, to the best of his knowledge, the work of authorship identified is in the public domain of the country from which the work is published, or (b) hereby dedicates whatever copyright the dedicators holds in the work of authorship identified below (the "Work") to the public domain. A certifier, moreover, dedicates any copyright interest he may have in the associated work, and for these purposes, is described as a "dedicator" below. + +A certifier has taken reasonable steps to verify the copyright status of this work. Certifier recognizes that his good faith efforts may not shield him from liability if in fact the work certified is not in the public domain. + +Dedicator makes this dedication for the benefit of the public at large and to the detriment of the Dedicator's heirs and successors. Dedicator intends this dedication to be an overt act of relinquishment in perpetuity of all present and future rights under copyright law, whether vested or contingent, in the Work. Dedicator understands that such relinquishment of all rights includes the relinquishment of all rights to enforce (by lawsuit or otherwise) those copyrights in the Work. + +Dedicator recognizes that, once placed in the public domain, the Work may be freely reproduced, distributed, transmitted, used, modified, built upon, or otherwise exploited by anyone for any purpose, commercial or non-commercial, and in any way, including by methods that have not yet been invented or conceived. diff --git a/LICENSES/EUPL-1.2.txt b/LICENSES/EUPL-1.2.txt new file mode 100644 index 0000000000..7aed2eafc9 --- /dev/null +++ b/LICENSES/EUPL-1.2.txt @@ -0,0 +1,287 @@ + EUROPEAN UNION PUBLIC LICENCE v. 1.2 + EUPL © the European Union 2007, 2016 + +This European Union Public Licence (the 'EUPL') applies to the Work (as defined +below) which is provided under the terms of this Licence. Any use of the Work, +other than as authorised under this Licence is prohibited (to the extent such +use is covered by a right of the copyright holder of the Work). + +The Work is provided under the terms of this Licence when the Licensor (as +defined below) has placed the following notice immediately following the +copyright notice for the Work: + + Licensed under the EUPL + +or has expressed by any other means his willingness to license under the EUPL. + +1. Definitions + +In this Licence, the following terms have the following meaning: + +- 'The Licence': this Licence. + +- 'The Original Work': the work or software distributed or communicated by the + Licensor under this Licence, available as Source Code and also as Executable + Code as the case may be. + +- 'Derivative Works': the works or software that could be created by the + Licensee, based upon the Original Work or modifications thereof. This Licence + does not define the extent of modification or dependence on the Original Work + required in order to classify a work as a Derivative Work; this extent is + determined by copyright law applicable in the country mentioned in Article 15. + +- 'The Work': the Original Work or its Derivative Works. + +- 'The Source Code': the human-readable form of the Work which is the most + convenient for people to study and modify. + +- 'The Executable Code': any code which has generally been compiled and which is + meant to be interpreted by a computer as a program. + +- 'The Licensor': the natural or legal person that distributes or communicates + the Work under the Licence. + +- 'Contributor(s)': any natural or legal person who modifies the Work under the + Licence, or otherwise contributes to the creation of a Derivative Work. + +- 'The Licensee' or 'You': any natural or legal person who makes any usage of + the Work under the terms of the Licence. + +- 'Distribution' or 'Communication': any act of selling, giving, lending, + renting, distributing, communicating, transmitting, or otherwise making + available, online or offline, copies of the Work or providing access to its + essential functionalities at the disposal of any other natural or legal + person. + +2. Scope of the rights granted by the Licence + +The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +sublicensable licence to do the following, for the duration of copyright vested +in the Original Work: + +- use the Work in any circumstance and for all usage, +- reproduce the Work, +- modify the Work, and make Derivative Works based upon the Work, +- communicate to the public, including the right to make available or display + the Work or copies thereof to the public and perform publicly, as the case may + be, the Work, +- distribute the Work or copies thereof, +- lend and rent the Work or copies thereof, +- sublicense rights in the Work or copies thereof. + +Those rights can be exercised on any media, supports and formats, whether now +known or later invented, as far as the applicable law permits so. + +In the countries where moral rights apply, the Licensor waives his right to +exercise his moral right to the extent allowed by law in order to make effective +the licence of the economic rights here above listed. + +The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to +any patents held by the Licensor, to the extent necessary to make use of the +rights granted on the Work under this Licence. + +3. Communication of the Source Code + +The Licensor may provide the Work either in its Source Code form, or as +Executable Code. If the Work is provided as Executable Code, the Licensor +provides in addition a machine-readable copy of the Source Code of the Work +along with each copy of the Work that the Licensor distributes or indicates, in +a notice following the copyright notice attached to the Work, a repository where +the Source Code is easily and freely accessible for as long as the Licensor +continues to distribute or communicate the Work. + +4. Limitations on copyright + +Nothing in this Licence is intended to deprive the Licensee of the benefits from +any exception or limitation to the exclusive rights of the rights owners in the +Work, of the exhaustion of those rights or of other applicable limitations +thereto. + +5. Obligations of the Licensee + +The grant of the rights mentioned above is subject to some restrictions and +obligations imposed on the Licensee. Those obligations are the following: + +Attribution right: The Licensee shall keep intact all copyright, patent or +trademarks notices and all notices that refer to the Licence and to the +disclaimer of warranties. The Licensee must include a copy of such notices and a +copy of the Licence with every copy of the Work he/she distributes or +communicates. The Licensee must cause any Derivative Work to carry prominent +notices stating that the Work has been modified and the date of modification. + +Copyleft clause: If the Licensee distributes or communicates copies of the +Original Works or Derivative Works, this Distribution or Communication will be +done under the terms of this Licence or of a later version of this Licence +unless the Original Work is expressly distributed only under this version of the +Licence — for example by communicating 'EUPL v. 1.2 only'. The Licensee +(becoming Licensor) cannot offer or impose any additional terms or conditions on +the Work or Derivative Work that alter or restrict the terms of the Licence. + +Compatibility clause: If the Licensee Distributes or Communicates Derivative +Works or copies thereof based upon both the Work and another work licensed under +a Compatible Licence, this Distribution or Communication can be done under the +terms of this Compatible Licence. For the sake of this clause, 'Compatible +Licence' refers to the licences listed in the appendix attached to this Licence. +Should the Licensee's obligations under the Compatible Licence conflict with +his/her obligations under this Licence, the obligations of the Compatible +Licence shall prevail. + +Provision of Source Code: When distributing or communicating copies of the Work, +the Licensee will provide a machine-readable copy of the Source Code or indicate +a repository where this Source will be easily and freely available for as long +as the Licensee continues to distribute or communicate the Work. + +Legal Protection: This Licence does not grant permission to use the trade names, +trademarks, service marks, or names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the copyright notice. + +6. Chain of Authorship + +The original Licensor warrants that the copyright in the Original Work granted +hereunder is owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each Contributor warrants that the copyright in the modifications he/she brings +to the Work are owned by him/her or licensed to him/her and that he/she has the +power and authority to grant the Licence. + +Each time You accept the Licence, the original Licensor and subsequent +Contributors grant You a licence to their contributions to the Work, under the +terms of this Licence. + +7. Disclaimer of Warranty + +The Work is a work in progress, which is continuously improved by numerous +Contributors. It is not a finished work and may therefore contain defects or +'bugs' inherent to this type of development. + +For the above reason, the Work is provided under the Licence on an 'as is' basis +and without warranties of any kind concerning the Work, including without +limitation merchantability, fitness for a particular purpose, absence of defects +or errors, accuracy, non-infringement of intellectual property rights other than +copyright as stated in Article 6 of this Licence. + +This disclaimer of warranty is an essential part of the Licence and a condition +for the grant of any rights to the Work. + +8. Disclaimer of Liability + +Except in the cases of wilful misconduct or damages directly caused to natural +persons, the Licensor will in no event be liable for any direct or indirect, +material or moral, damages of any kind, arising out of the Licence or of the use +of the Work, including without limitation, damages for loss of goodwill, work +stoppage, computer failure or malfunction, loss of data or any commercial +damage, even if the Licensor has been advised of the possibility of such damage. +However, the Licensor will be liable under statutory product liability laws as +far such laws apply to the Work. + +9. Additional agreements + +While distributing the Work, You may choose to conclude an additional agreement, +defining obligations or services consistent with this Licence. However, if +accepting obligations, You may act only on your own behalf and on your sole +responsibility, not on behalf of the original Licensor or any other Contributor, +and only if You agree to indemnify, defend, and hold each Contributor harmless +for any liability incurred by, or claims asserted against such Contributor by +the fact You have accepted any warranty or additional liability. + +10. Acceptance of the Licence + +The provisions of this Licence can be accepted by clicking on an icon 'I agree' +placed under the bottom of a window displaying the text of this Licence or by +affirming consent in any other similar way, in accordance with the rules of +applicable law. Clicking on that icon indicates your clear and irrevocable +acceptance of this Licence and all of its terms and conditions. + +Similarly, you irrevocably accept this Licence and all of its terms and +conditions by exercising any rights granted to You by Article 2 of this Licence, +such as the use of the Work, the creation by You of a Derivative Work or the +Distribution or Communication by You of the Work or copies thereof. + +11. Information to the public + +In case of any Distribution or Communication of the Work by means of electronic +communication by You (for example, by offering to download the Work from a +remote location) the distribution channel or media (for example, a website) must +at least provide to the public the information requested by the applicable law +regarding the Licensor, the Licence and the way it may be accessible, concluded, +stored and reproduced by the Licensee. + +12. Termination of the Licence + +The Licence and the rights granted hereunder will terminate automatically upon +any breach by the Licensee of the terms of the Licence. + +Such a termination will not terminate the licences of any person who has +received the Work from the Licensee under the Licence, provided such persons +remain in full compliance with the Licence. + +13. Miscellaneous + +Without prejudice of Article 9 above, the Licence represents the complete +agreement between the Parties as to the Work. + +If any provision of the Licence is invalid or unenforceable under applicable +law, this will not affect the validity or enforceability of the Licence as a +whole. Such provision will be construed or reformed so as necessary to make it +valid and enforceable. + +The European Commission may publish other linguistic versions or new versions of +this Licence or updated versions of the Appendix, so far this is required and +reasonable, without reducing the scope of the rights granted by the Licence. New +versions of the Licence will be published with a unique version number. + +All linguistic versions of this Licence, approved by the European Commission, +have identical value. Parties can take advantage of the linguistic version of +their choice. + +14. Jurisdiction + +Without prejudice to specific agreement between parties, + +- any litigation resulting from the interpretation of this License, arising + between the European Union institutions, bodies, offices or agencies, as a + Licensor, and any Licensee, will be subject to the jurisdiction of the Court + of Justice of the European Union, as laid down in article 272 of the Treaty on + the Functioning of the European Union, + +- any litigation arising between other parties and resulting from the + interpretation of this License, will be subject to the exclusive jurisdiction + of the competent court where the Licensor resides or conducts its primary + business. + +15. Applicable Law + +Without prejudice to specific agreement between parties, + +- this Licence shall be governed by the law of the European Union Member State + where the Licensor has his seat, resides or has his registered office, + +- this licence shall be governed by Belgian law if the Licensor has no seat, + residence or registered office inside a European Union Member State. + +Appendix + +'Compatible Licences' according to Article 5 EUPL are: + +- GNU General Public License (GPL) v. 2, v. 3 +- GNU Affero General Public License (AGPL) v. 3 +- Open Software License (OSL) v. 2.1, v. 3.0 +- Eclipse Public License (EPL) v. 1.0 +- CeCILL v. 2.0, v. 2.1 +- Mozilla Public Licence (MPL) v. 2 +- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3 +- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for + works other than software +- European Union Public Licence (EUPL) v. 1.1, v. 1.2 +- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong + Reciprocity (LiLiQ-R+). + +The European Commission may update this Appendix to later versions of the above +licences without producing a new version of the EUPL, as long as they provide +the rights granted in Article 2 of this Licence and protect the covered Source +Code from exclusive appropriation. + +All other changes or additions to this Appendix require the production of a new +EUPL version. diff --git a/LICENSES/Zlib.txt b/LICENSES/Zlib.txt new file mode 100644 index 0000000000..480c61edca --- /dev/null +++ b/LICENSES/Zlib.txt @@ -0,0 +1,15 @@ +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. diff --git a/images/platforms/black/akkoma.svg b/images/platforms/black/akkoma.svg new file mode 100644 index 0000000000..db6fbd5372 --- /dev/null +++ b/images/platforms/black/akkoma.svg @@ -0,0 +1,7 @@ + + + Akkoma + + + + \ No newline at end of file diff --git a/images/platforms/black/akkoma.svg.license b/images/platforms/black/akkoma.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/akkoma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/bluesky.svg b/images/platforms/black/bluesky.svg new file mode 100644 index 0000000000..ce0126edac --- /dev/null +++ b/images/platforms/black/bluesky.svg @@ -0,0 +1 @@ +Bluesky \ No newline at end of file diff --git a/images/platforms/black/bluesky.svg.license b/images/platforms/black/bluesky.svg.license new file mode 100644 index 0000000000..00bd211190 --- /dev/null +++ b/images/platforms/black/bluesky.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://github.com/simple-icons/simple-icons/ +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/calckey.svg b/images/platforms/black/calckey.svg new file mode 100644 index 0000000000..b7d247c66f --- /dev/null +++ b/images/platforms/black/calckey.svg @@ -0,0 +1,13 @@ + + + Calckey + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/calckey.svg.license b/images/platforms/black/calckey.svg.license new file mode 100644 index 0000000000..482f1809d0 --- /dev/null +++ b/images/platforms/black/calckey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: ThatOneCalculator https://commons.wikimedia.org/wiki/File:Calckey_Logomark.svg +SPDX-License-Identifier: CC-BY-4.0 diff --git a/images/platforms/black/diaspora.svg b/images/platforms/black/diaspora.svg new file mode 100644 index 0000000000..5eedacaccc --- /dev/null +++ b/images/platforms/black/diaspora.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/diaspora.svg.license b/images/platforms/black/diaspora.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/diaspora.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/discourse.svg b/images/platforms/black/discourse.svg new file mode 100644 index 0000000000..250d6389ed --- /dev/null +++ b/images/platforms/black/discourse.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/images/platforms/black/discourse.svg.license b/images/platforms/black/discourse.svg.license new file mode 100644 index 0000000000..38caf821b0 --- /dev/null +++ b/images/platforms/black/discourse.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kenan Gundogan https://www.svgrepo.com/svg/394118/discourse +SPDX-License-Identifier: MIT diff --git a/images/platforms/black/email.svg b/images/platforms/black/email.svg new file mode 100644 index 0000000000..04c39cbfd9 --- /dev/null +++ b/images/platforms/black/email.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/images/platforms/black/email.svg.license b/images/platforms/black/email.svg.license new file mode 100644 index 0000000000..d51dd6d76e --- /dev/null +++ b/images/platforms/black/email.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Instructure Ui https://github.com/instructure/instructure-ui?ref=svgrepo.com +SPDX-License-Identifier: MIT diff --git a/images/platforms/black/firefish.svg b/images/platforms/black/firefish.svg new file mode 100644 index 0000000000..800668c539 --- /dev/null +++ b/images/platforms/black/firefish.svg @@ -0,0 +1 @@ +Firefish \ No newline at end of file diff --git a/images/platforms/black/firefish.svg.license b/images/platforms/black/firefish.svg.license new file mode 100644 index 0000000000..00bd211190 --- /dev/null +++ b/images/platforms/black/firefish.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://github.com/simple-icons/simple-icons/ +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/flipboard.svg b/images/platforms/black/flipboard.svg new file mode 100644 index 0000000000..5e30e51ff1 --- /dev/null +++ b/images/platforms/black/flipboard.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/images/platforms/black/flipboard.svg.license b/images/platforms/black/flipboard.svg.license new file mode 100644 index 0000000000..fa07a94d1f --- /dev/null +++ b/images/platforms/black/flipboard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kenan Gundogan https://www.svgrepo.com/svg/394160/flipboard +SPDX-License-Identifier: MIT diff --git a/images/platforms/black/friendica.svg b/images/platforms/black/friendica.svg new file mode 100644 index 0000000000..9195f0a8d5 --- /dev/null +++ b/images/platforms/black/friendica.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/friendica.svg.license b/images/platforms/black/friendica.svg.license new file mode 100644 index 0000000000..0c5f79700d --- /dev/null +++ b/images/platforms/black/friendica.svg.license @@ -0,0 +1,3 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 + diff --git a/images/platforms/black/glitchsoc.svg b/images/platforms/black/glitchsoc.svg new file mode 100644 index 0000000000..b097a6608a --- /dev/null +++ b/images/platforms/black/glitchsoc.svg @@ -0,0 +1,7 @@ + + + Glitch-soc Alt 1 + + + + \ No newline at end of file diff --git a/images/platforms/black/glitchsoc.svg.license b/images/platforms/black/glitchsoc.svg.license new file mode 100644 index 0000000000..a53eead85a --- /dev/null +++ b/images/platforms/black/glitchsoc.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Copyright (C) 2016-2024 Eugen Rochko & other Mastodon contributors +SPDX-License-Identifier: AGPL-3.0-only diff --git a/images/platforms/black/gnusocial.svg b/images/platforms/black/gnusocial.svg new file mode 100644 index 0000000000..8314f315f0 --- /dev/null +++ b/images/platforms/black/gnusocial.svg @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/gnusocial.svg.license b/images/platforms/black/gnusocial.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/gnusocial.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/gotosocial.svg b/images/platforms/black/gotosocial.svg new file mode 100644 index 0000000000..128032e499 --- /dev/null +++ b/images/platforms/black/gotosocial.svg @@ -0,0 +1,9 @@ + + + GoToSocial + + + + + + \ No newline at end of file diff --git a/images/platforms/black/gotosocial.svg.license b/images/platforms/black/gotosocial.svg.license new file mode 100644 index 0000000000..92bf50a2b6 --- /dev/null +++ b/images/platforms/black/gotosocial.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Anna Abramek https://abramek.art/ +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/black/hometown.svg b/images/platforms/black/hometown.svg new file mode 100644 index 0000000000..33cc6fbe79 --- /dev/null +++ b/images/platforms/black/hometown.svg @@ -0,0 +1,17 @@ + + + Hometown + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/hometown.svg.license b/images/platforms/black/hometown.svg.license new file mode 100644 index 0000000000..50895de908 --- /dev/null +++ b/images/platforms/black/hometown.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Copyright (C) 2016-2022 Eugen Rochko & other Mastodon contributors +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/black/hubzilla.svg b/images/platforms/black/hubzilla.svg new file mode 100644 index 0000000000..b175f2a759 --- /dev/null +++ b/images/platforms/black/hubzilla.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/hubzilla.svg.license b/images/platforms/black/hubzilla.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/hubzilla.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/iceshrimp.svg b/images/platforms/black/iceshrimp.svg new file mode 100644 index 0000000000..b0eaa569ac --- /dev/null +++ b/images/platforms/black/iceshrimp.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/iceshrimp.svg.license b/images/platforms/black/iceshrimp.svg.license new file mode 100644 index 0000000000..a6ab3519b6 --- /dev/null +++ b/images/platforms/black/iceshrimp.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://iceshrimp.dev/iceshrimp/iceshrimp.net +SPDX-License-Identifier: EUPL-1.2 diff --git a/images/platforms/black/lemmy.svg b/images/platforms/black/lemmy.svg new file mode 100644 index 0000000000..eb07724289 --- /dev/null +++ b/images/platforms/black/lemmy.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + diff --git a/images/platforms/black/lemmy.svg.license b/images/platforms/black/lemmy.svg.license new file mode 100644 index 0000000000..47758d23cf --- /dev/null +++ b/images/platforms/black/lemmy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Andy Cuccaro https://commons.wikimedia.org/wiki/File:Lemmy_logo.svg +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/black/mastodon.svg b/images/platforms/black/mastodon.svg new file mode 100644 index 0000000000..9ecf4ba0e1 --- /dev/null +++ b/images/platforms/black/mastodon.svg @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/mastodon.svg.license b/images/platforms/black/mastodon.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/mastodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/mbin.svg b/images/platforms/black/mbin.svg new file mode 100644 index 0000000000..70b51b4f7d --- /dev/null +++ b/images/platforms/black/mbin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/mbin.svg.license b/images/platforms/black/mbin.svg.license new file mode 100644 index 0000000000..aa9aa09b5c --- /dev/null +++ b/images/platforms/black/mbin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: grumpyDev https://github.com/mbinOrg/mbin?tab=readme-ov-file#credits +SPDX-License-Identifier: Zlib diff --git a/images/platforms/black/misskey.svg b/images/platforms/black/misskey.svg new file mode 100644 index 0000000000..02cb7288b9 --- /dev/null +++ b/images/platforms/black/misskey.svg @@ -0,0 +1 @@ + diff --git a/images/platforms/black/misskey.svg.license b/images/platforms/black/misskey.svg.license new file mode 100644 index 0000000000..fc85a362b6 --- /dev/null +++ b/images/platforms/black/misskey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: kakkokari-gtyih https://commons.wikimedia.org/wiki/File:Misskey_Mi_icon.svg +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/black/mobilizon.svg b/images/platforms/black/mobilizon.svg new file mode 100644 index 0000000000..a6caf78a59 --- /dev/null +++ b/images/platforms/black/mobilizon.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/images/platforms/black/mobilizon.svg.license b/images/platforms/black/mobilizon.svg.license new file mode 100644 index 0000000000..690c5f7c1d --- /dev/null +++ b/images/platforms/black/mobilizon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2017 - 2024 Developed with ♥ by Framasoft +SPDX-License-Identifier: AGPL-3.0-only diff --git a/images/platforms/black/peertube.svg b/images/platforms/black/peertube.svg new file mode 100644 index 0000000000..554ca8d262 --- /dev/null +++ b/images/platforms/black/peertube.svg @@ -0,0 +1,7 @@ + + + PeerTube + + + + \ No newline at end of file diff --git a/images/platforms/black/peertube.svg.license b/images/platforms/black/peertube.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/black/peertube.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/black/pixelfed.svg b/images/platforms/black/pixelfed.svg new file mode 100644 index 0000000000..214dbab31b --- /dev/null +++ b/images/platforms/black/pixelfed.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/pixelfed.svg.license b/images/platforms/black/pixelfed.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/pixelfed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/pleroma.svg b/images/platforms/black/pleroma.svg new file mode 100644 index 0000000000..d03da50d2d --- /dev/null +++ b/images/platforms/black/pleroma.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/pleroma.svg.license b/images/platforms/black/pleroma.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/pleroma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/plume.svg b/images/platforms/black/plume.svg new file mode 100644 index 0000000000..741aeee32c --- /dev/null +++ b/images/platforms/black/plume.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/images/platforms/black/plume.svg.license b/images/platforms/black/plume.svg.license new file mode 100644 index 0000000000..d15e28f3ac --- /dev/null +++ b/images/platforms/black/plume.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://github.com/Plume-org/Plume +SPDX-License-Identifier: AGPL-3.0-only diff --git a/images/platforms/black/pump-io.svg b/images/platforms/black/pump-io.svg new file mode 100644 index 0000000000..e4e4fc3533 --- /dev/null +++ b/images/platforms/black/pump-io.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/images/platforms/black/pump-io.svg.license b/images/platforms/black/pump-io.svg.license new file mode 100644 index 0000000000..b3db2b09ce --- /dev/null +++ b/images/platforms/black/pump-io.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: MathiasGebbe https://commons.wikimedia.org/wiki/File:Pump.io_Logo.svg +SPDX-License-Identifier: CC-BY-SA-3.0 diff --git a/images/platforms/black/rss.svg b/images/platforms/black/rss.svg new file mode 100644 index 0000000000..9fe37b87a6 --- /dev/null +++ b/images/platforms/black/rss.svg @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/rss.svg.license b/images/platforms/black/rss.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/rss.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/black/sharkey.svg b/images/platforms/black/sharkey.svg new file mode 100644 index 0000000000..4fd2f3fd09 --- /dev/null +++ b/images/platforms/black/sharkey.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/black/sharkey.svg.license b/images/platforms/black/sharkey.svg.license new file mode 100644 index 0000000000..aa007dea4a --- /dev/null +++ b/images/platforms/black/sharkey.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: https://activitypub.software/TransFem-org/Sharkey +SPDX-License-Identifier: AGPL-3.0-only diff --git a/images/platforms/black/threads.svg b/images/platforms/black/threads.svg new file mode 100644 index 0000000000..ae0ec86c42 --- /dev/null +++ b/images/platforms/black/threads.svg @@ -0,0 +1 @@ + diff --git a/images/platforms/black/threads.svg.license b/images/platforms/black/threads.svg.license new file mode 100644 index 0000000000..4c063fb3eb --- /dev/null +++ b/images/platforms/black/threads.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Meta Platforms, Inc. https://commons.wikimedia.org/wiki/File:Threads_(app)_logo.svg +SPDX-License-Identifier: CC-PDDC diff --git a/images/platforms/black/tumblr.svg b/images/platforms/black/tumblr.svg new file mode 100644 index 0000000000..2fe91e709e --- /dev/null +++ b/images/platforms/black/tumblr.svg @@ -0,0 +1,19 @@ + + + + + tumblr [#181] + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/black/tumblr.svg.license b/images/platforms/black/tumblr.svg.license new file mode 100644 index 0000000000..4c8c4b8e5d --- /dev/null +++ b/images/platforms/black/tumblr.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: bypeople https://www.svgrepo.com/svg/513007/tumblr-181 +SPDX-License-Identifier: CC-PDDC diff --git a/images/platforms/black/wordpress.svg b/images/platforms/black/wordpress.svg new file mode 100644 index 0000000000..7c00c85c2d --- /dev/null +++ b/images/platforms/black/wordpress.svg @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/images/platforms/black/wordpress.svg.license b/images/platforms/black/wordpress.svg.license new file mode 100644 index 0000000000..33acc29726 --- /dev/null +++ b/images/platforms/black/wordpress.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Matthias Pfefferle https://github.com/pfefferle/openwebicons?ref=svgrepo.com +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/color/activitypub.svg b/images/platforms/color/activitypub.svg new file mode 100644 index 0000000000..f56d428fbc --- /dev/null +++ b/images/platforms/color/activitypub.svg @@ -0,0 +1,288 @@ + + + + + ActivityPub logo + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + ActivityPub logo + + 2017-04-15 + + + Robert Martinez + + + + + ActivityPub + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/platforms/color/activitypub.svg.license b/images/platforms/color/activitypub.svg.license new file mode 100644 index 0000000000..acef685eed --- /dev/null +++ b/images/platforms/color/activitypub.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: mray https://commons.wikimedia.org/wiki/File:ActivityPub-logo-symbol.svg +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/color/akkoma.svg b/images/platforms/color/akkoma.svg new file mode 100644 index 0000000000..96dc8d8ce8 --- /dev/null +++ b/images/platforms/color/akkoma.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/images/platforms/color/akkoma.svg.license b/images/platforms/color/akkoma.svg.license new file mode 100644 index 0000000000..f3816d7841 --- /dev/null +++ b/images/platforms/color/akkoma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: floatingghost https://commons.wikimedia.org/wiki/File:Akkoma_logo.svg +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/color/bluesky.svg b/images/platforms/color/bluesky.svg new file mode 100644 index 0000000000..c71e2018a6 --- /dev/null +++ b/images/platforms/color/bluesky.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/color/bluesky.svg.license b/images/platforms/color/bluesky.svg.license new file mode 100644 index 0000000000..0a78ba51da --- /dev/null +++ b/images/platforms/color/bluesky.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Eric Bailey https://commons.wikimedia.org/wiki/File:Bluesky_Logo.svg +SPDX-License-Identifier: CC-PDDC diff --git a/images/platforms/color/discourse.svg b/images/platforms/color/discourse.svg new file mode 100644 index 0000000000..4cbb8c87b3 --- /dev/null +++ b/images/platforms/color/discourse.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/discourse.svg.license b/images/platforms/color/discourse.svg.license new file mode 100644 index 0000000000..5c569fb582 --- /dev/null +++ b/images/platforms/color/discourse.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Discourse team https://commons.wikimedia.org/wiki/File:Discourse_icon.svg +SPDX-License-Identifier: GPL-2.0-only diff --git a/images/platforms/color/firefish.svg b/images/platforms/color/firefish.svg new file mode 100644 index 0000000000..7b36f4d77e --- /dev/null +++ b/images/platforms/color/firefish.svg @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/images/platforms/color/firefish.svg.license b/images/platforms/color/firefish.svg.license new file mode 100644 index 0000000000..93e1b24be1 --- /dev/null +++ b/images/platforms/color/firefish.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Kainoa Kanter https://commons.wikimedia.org/wiki/File:Firefish_animated.svg +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/color/flipboard.svg b/images/platforms/color/flipboard.svg new file mode 100644 index 0000000000..6f42ee490f --- /dev/null +++ b/images/platforms/color/flipboard.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/images/platforms/color/flipboard.svg.license b/images/platforms/color/flipboard.svg.license new file mode 100644 index 0000000000..92f3811c81 --- /dev/null +++ b/images/platforms/color/flipboard.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Flipboard, Inc. - Moving Brands https://commons.wikimedia.org/wiki/File:Flipboard_logo.svg +SPDX-License-Identifier: CC-PDDC diff --git a/images/platforms/color/friendica.svg b/images/platforms/color/friendica.svg new file mode 100644 index 0000000000..efbb051cd8 --- /dev/null +++ b/images/platforms/color/friendica.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/friendica.svg.license b/images/platforms/color/friendica.svg.license new file mode 100644 index 0000000000..7aaeaba96e --- /dev/null +++ b/images/platforms/color/friendica.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2010-2024 the Friendica project +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/color/gnusocial.svg b/images/platforms/color/gnusocial.svg new file mode 100644 index 0000000000..ba61f345c7 --- /dev/null +++ b/images/platforms/color/gnusocial.svg @@ -0,0 +1,99 @@ + + + + + GNU Social Image Logo + + + + + + image/svg+xml + + GNU Social Image Logo + + + + + + + + + + + + + diff --git a/images/platforms/color/gnusocial.svg.license b/images/platforms/color/gnusocial.svg.license new file mode 100644 index 0000000000..bdcd7aa795 --- /dev/null +++ b/images/platforms/color/gnusocial.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jonas Laugs, with lettering by Steven DuBois https://commons.wikimedia.org/wiki/File:GNU_Social_Image_Logo.svg +SPDX-License-Identifier: CC0-1.0 diff --git a/images/platforms/color/mastodon.svg b/images/platforms/color/mastodon.svg new file mode 100644 index 0000000000..a20e7981f6 --- /dev/null +++ b/images/platforms/color/mastodon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/mastodon.svg.license b/images/platforms/color/mastodon.svg.license new file mode 100644 index 0000000000..cd758551b8 --- /dev/null +++ b/images/platforms/color/mastodon.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Eugen Rochko & other Mastodon contributors https://commons.wikimedia.org/wiki/File:Mastodon_logotype_(simple)_new_hue.svg +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/color/peertube.svg b/images/platforms/color/peertube.svg new file mode 100644 index 0000000000..0e6e228e61 --- /dev/null +++ b/images/platforms/color/peertube.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/peertube.svg.license b/images/platforms/color/peertube.svg.license new file mode 100644 index 0000000000..13cba9b2e3 --- /dev/null +++ b/images/platforms/color/peertube.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: PeerTube contributors https://commons.wikimedia.org/wiki/File:Logo_de_PeerTube.svg +SPDX-License-Identifier: CC-PDDC diff --git a/images/platforms/color/pixelfed.svg b/images/platforms/color/pixelfed.svg new file mode 100644 index 0000000000..dfaf03fbea --- /dev/null +++ b/images/platforms/color/pixelfed.svg @@ -0,0 +1,101 @@ + + + + icon/color/svg/pixelfed-icon-color + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/pixelfed.svg.license b/images/platforms/color/pixelfed.svg.license new file mode 100644 index 0000000000..a8129c266b --- /dev/null +++ b/images/platforms/color/pixelfed.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Mark Wilson & other Pixelfed contributors https://commons.wikimedia.org/wiki/File:Pixelfed_logo_multicolor_(September_2018).svg +SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/images/platforms/color/pleroma.svg b/images/platforms/color/pleroma.svg new file mode 100644 index 0000000000..2696052279 --- /dev/null +++ b/images/platforms/color/pleroma.svg @@ -0,0 +1,75 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/images/platforms/color/pleroma.svg.license b/images/platforms/color/pleroma.svg.license new file mode 100644 index 0000000000..a5c1aa75f2 --- /dev/null +++ b/images/platforms/color/pleroma.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Henry Jameson https://commons.wikimedia.org/wiki/File:Smaller_Pleroma_logo.svg +SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/images/platforms/color/rss.svg b/images/platforms/color/rss.svg new file mode 100644 index 0000000000..a7f9cf196c --- /dev/null +++ b/images/platforms/color/rss.svg @@ -0,0 +1,18 @@ + + + + RSS feed icon + + + + + + + + + \ No newline at end of file diff --git a/images/platforms/color/rss.svg.license b/images/platforms/color/rss.svg.license new file mode 100644 index 0000000000..59f909d7b6 --- /dev/null +++ b/images/platforms/color/rss.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Jahoe https://commons.wikimedia.org/wiki/File:Generic_Feed-icon.svg +SPDX-License-Identifier: GPL-2.0-or-later diff --git a/images/platforms/color/tumblr.svg b/images/platforms/color/tumblr.svg new file mode 100644 index 0000000000..d4f4d6d4df --- /dev/null +++ b/images/platforms/color/tumblr.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + diff --git a/images/platforms/color/tumblr.svg.license b/images/platforms/color/tumblr.svg.license new file mode 100644 index 0000000000..39a4f64c06 --- /dev/null +++ b/images/platforms/color/tumblr.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: ZyMOS https://commons.wikimedia.org/wiki/File:Tumblr.svg +SPDX-License-Identifier: CC-PDDC diff --git a/images/platforms/color/wordpress.svg b/images/platforms/color/wordpress.svg new file mode 100644 index 0000000000..7182535973 --- /dev/null +++ b/images/platforms/color/wordpress.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/images/platforms/color/wordpress.svg.license b/images/platforms/color/wordpress.svg.license new file mode 100644 index 0000000000..1fea8f7f81 --- /dev/null +++ b/images/platforms/color/wordpress.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: WordPress https://commons.wikimedia.org/wiki/File:WordPress_blue_logo.svg +SPDX-License-Identifier: GPL-2.0-or-later diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 52cc980fc3..9d72e78528 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -202,13 +202,33 @@ class ContactSelector Protocol::BLUESKY => 'circle', /// @todo ]; - $platform_icons = ['diaspora' => 'diaspora', 'friendica' => 'friendica', 'friendika' => 'friendica', - 'GNU Social' => 'gnu-social', 'gnusocial' => 'gnu-social', 'hubzilla' => 'hubzilla', - 'mastodon' => 'mastodon', 'hometown' => 'mastodon', 'peertube' => 'peertube', 'pixelfed' => 'pixelfed', - 'pleroma' => 'pleroma', 'akkoma' => 'pleroma', 'red' => 'hubzilla', 'redmatrix' => 'hubzilla', - 'socialhome' => 'social-home', 'wordpress' => 'wordpress', 'lemmy' => 'users', - 'plume' => 'plume', 'funkwhale' => 'funkwhale', 'nextcloud' => 'nextcloud', 'drupal' => 'drupal', - 'firefish' => 'fire', 'calckey' => 'calculator', 'kbin' => 'check', 'threads' => 'instagram']; + $platform_icons = [ + 'diaspora' => 'diaspora', + 'friendica' => 'friendica', + 'friendika' => 'friendica', + 'GNU Social' => 'gnu-social', + 'gnusocial' => 'gnu-social', + 'hubzilla' => 'hubzilla', + 'mastodon' => 'mastodon', + 'hometown' => 'mastodon', + 'peertube' => 'peertube', + 'pixelfed' => 'pixelfed', + 'pleroma' => 'pleroma', + 'akkoma' => 'pleroma', + 'red' => 'hubzilla', + 'redmatrix' => 'hubzilla', + 'socialhome' => 'social-home', + 'wordpress' => 'wordpress', + 'lemmy' => 'users', + 'plume' => 'plume', + 'funkwhale' => 'funkwhale', + 'nextcloud' => 'nextcloud', + 'drupal' => 'drupal', + 'firefish' => 'fire', + 'calckey' => 'calculator', + 'kbin' => 'check', + 'threads' => 'instagram' + ]; $search = array_keys($nets); $replace = array_values($nets); @@ -231,4 +251,87 @@ class ContactSelector return $network_icon; } + + public static function networkToSVG(string $network, string $profile = "", int $gsid = null, string $platform = '', int $uid = 0): string + { + $nets = [ + Protocol::ACTIVITYPUB => 'activitypub', // https://commons.wikimedia.org/wiki/File:ActivityPub-logo-symbol.svg + Protocol::BLUESKY => 'bluesky', // https://commons.wikimedia.org/wiki/File:Bluesky_Logo.svg + Protocol::DFRN => 'friendica', + Protocol::DIASPORA => 'diaspora', // https://www.svgrepo.com/svg/362315/diaspora + Protocol::DIASPORA2 => 'diaspora', // https://www.svgrepo.com/svg/362315/diaspora + Protocol::DISCOURSE => 'discourse', // https://commons.wikimedia.org/wiki/File:Discourse_icon.svg + Protocol::FEED => 'rss', // https://commons.wikimedia.org/wiki/File:Generic_Feed-icon.svg + Protocol::MAIL => 'email', // https://www.svgrepo.com/svg/501173/email + Protocol::OSTATUS => '', + Protocol::PNUT => '', + Protocol::PUMPIO => 'pump-io', // https://commons.wikimedia.org/wiki/File:Pump.io_Logo.svg + Protocol::STATUSNET => '', + Protocol::TUMBLR => 'tumblr', // https://commons.wikimedia.org/wiki/File:Tumblr.svg + Protocol::TWITTER => '', + Protocol::ZOT => 'hubzilla', // https://www.svgrepo.com/svg/362219/hubzilla + ]; + + $svg = [ + 'akkoma', // https://commons.wikimedia.org/wiki/File:Akkoma_logo.svg + 'calckey', // https://commons.wikimedia.org/wiki/File:Calckey_Logomark.svg + 'diaspora', // https://www.svgrepo.com/svg/362315/diaspora + 'firefish', // https://commons.wikimedia.org/wiki/File:Firefish_animated.svg + 'flipboard', // https://commons.wikimedia.org/wiki/File:Flipboard_logo.svg + 'friendica', + 'glitchsoc', // https://iconography.fediverse.info/black/glitch-soc.svg + 'gnusocial', // https://commons.wikimedia.org/wiki/File:GNU_Social_Image_Logo.svg + 'gotosocial', // https://iconography.fediverse.info/black/gotosocial.svg + 'hometown', // https://iconography.fediverse.info/black/hometown.svg + 'hubzilla', // https://www.svgrepo.com/svg/362219/hubzilla + 'iceshrimp', // https://iconography.fediverse.info/black/iceshrimp.svg + 'lemmy', // https://commons.wikimedia.org/wiki/File:Lemmy_logo.svg + 'mastodon', // https://commons.wikimedia.org/wiki/File:Mastodon_logotype_(simple)_new_hue.svg + 'mbin', // https://iconography.fediverse.info/black/mbin.svg + 'misskey', // https://commons.wikimedia.org/wiki/File:Misskey_Mi_icon.svg + 'mobilizon', // https://www.svgrepo.com/svg/517896/mobilizon + 'peertube', // https://commons.wikimedia.org/wiki/File:Logo_de_PeerTube.svg + 'pixelfed', // https://commons.wikimedia.org/wiki/File:Pixelfed_logo_multicolor_(September_2018).svg + 'pleroma', // https://commons.wikimedia.org/wiki/File:Smaller_Pleroma_logo.svg + 'plume', // https://commons.wikimedia.org/wiki/File:Plume.svg + 'sharkey', // https://iconography.fediverse.info/black/sharky.svg + 'threads', // https://commons.wikimedia.org/wiki/File:Threads_(app)_logo.svg + 'wordpress', // https://commons.wikimedia.org/wiki/File:WordPress_blue_logo.svg + ]; + + $search = array_keys($nets); + $replace = array_values($nets); + + $network_svg = str_replace($search, $replace, $network); + + if (in_array($network, Protocol::FEDERATED)) { + if (!empty($gsid) && !empty(self::$serverdata[$gsid])) { + $gserver = self::$serverdata[$gsid]; + } elseif (!empty($gsid)) { + $gserver = DBA::selectFirst('gserver', ['platform', 'network'], ['id' => $gsid]); + self::$serverdata[$gsid] = $gserver; + } elseif (!empty($platform)) { + $gserver = ['platform' => $platform]; + } elseif ($profile != "") { + $gserver = self::getServerForProfile($profile); + } + if (!empty($gserver['platform'])) { + $network_svg = in_array($gserver['platform'], $svg) ? $gserver['platform'] : $network_svg; + } + } + + if (empty($network_svg)) { + return ''; + } + + $color = ['activitypub', 'akkoma', 'bluesky', 'discourse', 'firefish', 'flipboard', + 'friendica', 'gnusocial', 'mastodon', 'peertube', 'pixelfed', 'pleroma', + 'rss', 'tumblr', 'wordpress']; + + if (($uid && DI::pConfig()->get($uid, 'accessibility', 'black_platform_icons')) || !in_array($network_svg, $color)) { + return 'images/platforms/black/' . $network_svg . '.svg'; + } else { + return 'images/platforms/color/' . $network_svg . '.svg'; + } + } } diff --git a/src/Content/Conversation.php b/src/Content/Conversation.php index 807fb6c0b1..07d2b6fb8e 100644 --- a/src/Content/Conversation.php +++ b/src/Content/Conversation.php @@ -1518,6 +1518,7 @@ class Conversation 'network' => $item['network'], 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network'], $item['author-gsid']), 'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link'], $item['author-gsid']), + 'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-link'], $item['author-gsid'], '', $this->session->getLocalUserId()), 'linktitle' => $this->l10n->t('View %s\'s profile @ %s', $profile_name, $item['author-link']), 'profile_url' => $profile_link, 'item_photo_menu_html' => $this->item->photoMenu($item, $formSecurityToken), diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php index 2eb4e62f16..f1c9cadf7f 100644 --- a/src/Content/Text/BBCode.php +++ b/src/Content/Text/BBCode.php @@ -932,6 +932,7 @@ class BBCode '$guid' => $attributes['guid'], '$network_name' => ContactSelector::networkToName($network, $attributes['profile']), '$network_icon' => ContactSelector::networkToIcon($network, $attributes['profile']), + '$network_svg' => ContactSelector::networkToSVG($network, $attributes['profile']), '$content' => self::TOP_ANCHOR . self::setMentions(trim($content), 0, $network) . self::BOTTOM_ANCHOR, ]); break; diff --git a/src/Content/Widget/VCard.php b/src/Content/Widget/VCard.php index 3ccdaeb421..be98e93afa 100644 --- a/src/Content/Widget/VCard.php +++ b/src/Content/Widget/VCard.php @@ -43,9 +43,11 @@ class VCard if ($contact['network'] != '') { $network_link = Strings::formatNetworkName($contact['network'], $contact_url); $network_avatar = ContactSelector::networkToIcon($contact['network'], $contact_url); + $network_svg = ContactSelector::networkToSVG($contact['network'], $contact_url, 0, '', DI::userSession()->getLocalUserId()); } else { $network_link = ''; $network_avatar = ''; + $network_svg = ''; } $follow_link = ''; @@ -113,6 +115,7 @@ class VCard '$location' => DI::l10n()->t('Location:'), '$network_link' => $network_link, '$network_avatar' => $network_avatar, + '$network_svg' => $network_svg, '$network' => DI::l10n()->t('Network:'), '$account_type' => Contact::getAccountType($contact['contact-type']), '$follow' => DI::l10n()->t('Follow'), diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php index 8270400025..1294050ab7 100644 --- a/src/Core/Protocol.php +++ b/src/Core/Protocol.php @@ -33,26 +33,26 @@ class Protocol const SUPPORT_PRIVATE = [self::DFRN, self::DIASPORA, self::MAIL, self::ACTIVITYPUB, self::PUMPIO]; // Supported through a connector - const DIASPORA2 = 'dspc'; // Diaspora connector - const PUMPIO = 'pump'; // pump.io - const TWITTER = 'twit'; // Twitter - const DISCOURSE = 'dscs'; // Discourse - const TUMBLR = 'tmbl'; // Tumblr const BLUESKY = 'bsky'; // Bluesky + const DIASPORA2 = 'dspc'; // Diaspora connector + const DISCOURSE = 'dscs'; // Discourse + const PNUT = 'pnut'; // pnut.io + const PUMPIO = 'pump'; // pump.io + const TUMBLR = 'tmbl'; // Tumblr + const TWITTER = 'twit'; // Twitter // Dead protocols - const OSTATUS = 'stat'; // GNU Social and other OStatus implementations - const STATUSNET = 'stac'; // Statusnet connector const APPNET = 'apdn'; // app.net - Dead protocol const FACEBOOK = 'face'; // Facebook API - Not working anymore, API is closed const GPLUS = 'goog'; // Google+ - Dead in 2019 + const OSTATUS = 'stat'; // GNU Social and other OStatus implementations + const STATUSNET = 'stac'; // Statusnet connector // Currently unsupported const ICALENDAR = 'ical'; // iCalendar - const MYSPACE = 'mysp'; // MySpace const LINKEDIN = 'lnkd'; // LinkedIn + const MYSPACE = 'mysp'; // MySpace const NEWS = 'nntp'; // Network News Transfer Protocol - const PNUT = 'pnut'; // pnut.io const XMPP = 'xmpp'; // XMPP const ZOT = 'zot!'; // Zot! diff --git a/src/Model/GServer.php b/src/Model/GServer.php index bda394cc84..73d7d1df08 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -753,6 +753,10 @@ class GServer $serverdata = self::detectNetworkViaContacts($url, $serverdata); } + if ($serverdata['platform'] == 'mastodon') { + $serverdata = self::detectMastodonForks($serverdata); + } + if (($serverdata['network'] == Protocol::PHANTOM) && in_array($serverdata['detection-method'], [self::DETECT_MANUAL, self::DETECT_BODY])) { self::setFailureByUrl($url); return false; @@ -1792,6 +1796,23 @@ class GServer return $serverdata; } + private static function detectMastodonForks(array $serverdata): array + { + if (strpos($serverdata['version'], 'glitch') !== false) { + $serverdata['platform'] = 'glitchsoc'; + } + + if (strpos($serverdata['version'], 'chuckya') !== false) { + $serverdata['platform'] = 'chuckya'; + } + + if (strpos($serverdata['version'], 'sakura') !== false) { + $serverdata['platform'] = 'sakura'; + } + + return $serverdata; + } + /** * Checks if the given server does have a '/poco' endpoint. * This is used for the 'PortableContact' functionality, diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index 99942e7c7a..7ca747d3e3 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -8,6 +8,7 @@ namespace Friendica\Module\Admin; use Friendica\App; +use Friendica\Content\ContactSelector; use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; @@ -36,6 +37,7 @@ class Federation extends BaseAdmin 'foundkey' => ['name' => 'Foundkey', 'color' => '#609926'], // Some random color from the repository 'funkwhale' => ['name' => 'Funkwhale', 'color' => '#4082B4'], // From the homepage 'gancio' => ['name' => 'Gancio', 'color' => '#7253ed'], // Fontcolor from the page + 'glitchsoc' => ['name' => 'Mastodon Glitch Edition', 'color' => '#82dcb9'], // Color from their site 'gnusocial' => ['name' => 'GNU Social/Statusnet', 'color' => '#a22430'], // dark red from the logo 'gotosocial' => ['name' => 'GoToSocial', 'color' => '#df8958'], // Some color from their mascot 'hometown' => ['name' => 'Hometown', 'color' => '#1f70c1'], // Color from the Patreon page @@ -128,6 +130,10 @@ class Federation extends BaseAdmin $platform = 'nomad'; } elseif(stristr($platform, 'pleroma')) { $platform = 'pleroma'; + } elseif(stristr($platform, 'glitchsoc')) { + $platform = 'glitchsoc'; + } elseif(stristr($platform, 'iceshrimp.net')) { + $platform = 'iceshrimp'; } elseif(stristr($platform, 'statusnet')) { $platform = 'gnusocial'; } elseif(stristr($platform, 'nextcloud')) { @@ -176,6 +182,7 @@ class Federation extends BaseAdmin } $gserver['platform'] = $systems[$platform]['name']; + $gserver['svg'] = ContactSelector::networkToSVG($gserver['network'], '', null, $platform, DI::userSession()->getLocalUserId()); $gserver['totallbl'] = DI::l10n()->tt('%2$s total system' , '%2$s total systems' , $gserver['total'], number_format($gserver['total'])); $gserver['monthlbl'] = DI::l10n()->tt('%2$s active user last month' , '%2$s active users last month' , $gserver['month'] ?? 0, number_format($gserver['month'] ?? 0)); $gserver['halfyearlbl'] = DI::l10n()->tt('%2$s active user last six months' , '%2$s active users last six months' , $gserver['halfyear'] ?? 0, number_format($gserver['halfyear'] ?? 0)); diff --git a/src/Module/Moderation/Blocklist/Server/Add.php b/src/Module/Moderation/Blocklist/Server/Add.php index f98a3ec716..aa80d47361 100644 --- a/src/Module/Moderation/Blocklist/Server/Add.php +++ b/src/Module/Moderation/Blocklist/Server/Add.php @@ -97,6 +97,7 @@ class Add extends BaseModeration array_walk($gservers, function (array &$gserver) { $gserver['domain'] = (new Uri($gserver['url']))->getHost(); $gserver['network_icon'] = ContactSelector::networkToIcon($gserver['network']); + $gserver['network_svg'] = ContactSelector::networkToSVG($gserver['network']); $gserver['network_name'] = ContactSelector::networkToName($gserver['network']); }); diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 8b3160fce5..6e9cb02718 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -95,6 +95,7 @@ class Display extends BaseSettings $stay_local = (bool)$request['stay_local']; $hide_empty_descriptions = (bool)$request['hide_empty_descriptions']; $hide_custom_emojis = (bool)$request['hide_custom_emojis']; + $black_platform_icons = (bool)$request['black_platform_icons']; $show_page_drop = (bool)$request['show_page_drop']; $display_eventlist = (bool)$request['display_eventlist']; $preview_mode = (int)$request['preview_mode']; @@ -156,6 +157,7 @@ class Display extends BaseSettings $this->pConfig->set($uid, 'accessibility', 'hide_empty_descriptions', $hide_empty_descriptions); $this->pConfig->set($uid, 'accessibility', 'hide_custom_emojis' , $hide_custom_emojis); + $this->pConfig->set($uid, 'accessibility', 'black_platform_icons' , $black_platform_icons); $this->pConfig->set($uid, 'calendar', 'first_day_of_week' , $first_day_of_week); $this->pConfig->set($uid, 'calendar', 'default_view' , $calendar_default_view); @@ -248,6 +250,7 @@ class Display extends BaseSettings $hide_empty_descriptions = $this->pConfig->get($uid, 'accessibility', 'hide_empty_descriptions', false); $hide_custom_emojis = $this->pConfig->get($uid, 'accessibility', 'hide_custom_emojis', false); + $black_platform_icons = $this->pConfig->get($uid, 'accessibility', 'black_platform_icons', false); $preview_mode = $this->pConfig->get($uid, 'system', 'preview_mode', BBCode::PREVIEW_LARGE); $preview_modes = [ @@ -330,6 +333,7 @@ class Display extends BaseSettings '$preview_mode' => ['preview_mode' , $this->t('Link preview mode'), $preview_mode, $this->t('Appearance of the link preview that is added to each post with a link.'), $preview_modes, false], '$hide_empty_descriptions' => ['hide_empty_descriptions' , $this->t('Hide pictures with empty alternative text'), $hide_empty_descriptions, $this->t("Don't display pictures that are missing the alternative text.")], '$hide_custom_emojis' => ['hide_custom_emojis' , $this->t('Hide custom emojis'), $hide_custom_emojis, $this->t("Don't display custom emojis.")], + '$black_platform_icons' => ['black_platform_icons' , $this->t('Black platform Icons'), $black_platform_icons, $this->t("Use black platform icons instead of colored ones.")], '$timeline_label' => $this->t('Label'), '$timeline_descriptiom' => $this->t('Description'), diff --git a/src/Object/Post.php b/src/Object/Post.php index dfc98a6d14..1c9ef6ca8b 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -608,6 +608,7 @@ class Post 'network' => $item['network'], 'network_name' => ContactSelector::networkToName($item['author-network'], $item['author-link'], $item['network'], $item['author-gsid']), 'network_icon' => ContactSelector::networkToIcon($item['network'], $item['author-link'], $item['author-gsid']), + 'network_svg' => ContactSelector::networkToSVG($item['network'], $item['author-link'], $item['author-gsid'], '', DI::userSession()->getLocalUserId()), 'received' => $item['received'], 'commented' => $item['commented'], 'created_date' => $item['created'], diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index dafd67761c..de514387b9 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2024.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-10-29 07:00+0000\n" +"POT-Creation-Date: 2024-11-08 08:13+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,7 +68,7 @@ msgstr "" #: src/Module/Settings/Account.php:36 src/Module/Settings/Account.php:377 #: src/Module/Settings/Channels.php:52 src/Module/Settings/Channels.php:127 #: src/Module/Settings/Delegation.php:76 src/Module/Settings/Display.php:76 -#: src/Module/Settings/Display.php:188 +#: src/Module/Settings/Display.php:190 #: src/Module/Settings/Profile/Photo/Crop.php:151 #: src/Module/Settings/Profile/Photo/Index.php:96 #: src/Module/Settings/RemoveMe.php:105 src/Module/Settings/UserExport.php:64 @@ -281,7 +281,7 @@ msgid "Insert web link" msgstr "" #: mod/message.php:188 mod/message.php:344 mod/photos.php:1255 -#: src/Content/Conversation.php:386 src/Content/Conversation.php:1562 +#: src/Content/Conversation.php:386 src/Content/Conversation.php:1563 #: src/Module/Item/Compose.php:199 src/Module/Post/Edit.php:131 #: src/Object/Post.php:604 msgid "Please wait" @@ -295,8 +295,8 @@ msgstr "" #: src/Module/Debug/ActivityPubConversion.php:132 #: src/Module/Debug/Babel.php:307 src/Module/Debug/Localtime.php:50 #: src/Module/Debug/Probe.php:40 src/Module/Debug/WebFinger.php:37 -#: src/Module/FriendSuggest.php:131 src/Module/Install.php:220 -#: src/Module/Install.php:260 src/Module/Install.php:295 +#: src/Module/FriendSuggest.php:131 src/Module/Install.php:221 +#: src/Module/Install.php:261 src/Module/Install.php:296 #: src/Module/Invite.php:164 src/Module/Item/Compose.php:182 #: src/Module/Moderation/Item/Source.php:71 #: src/Module/Moderation/Report/Create.php:154 @@ -305,7 +305,7 @@ msgstr "" #: src/Module/Moderation/Report/Create.php:249 #: src/Module/Profile/Profile.php:262 src/Module/Settings/Profile/Index.php:248 #: src/Module/Settings/Server/Action.php:65 src/Module/User/Delegation.php:175 -#: src/Object/Post.php:1145 view/theme/duepuntozero/config.php:73 +#: src/Object/Post.php:1146 view/theme/duepuntozero/config.php:73 #: view/theme/frio/config.php:138 view/theme/quattro/config.php:75 #: view/theme/vier/config.php:123 msgid "Submit" @@ -588,25 +588,25 @@ msgstr "" #: mod/photos.php:1093 mod/photos.php:1149 mod/photos.php:1229 #: src/Module/Contact.php:600 src/Module/Item/Compose.php:181 -#: src/Object/Post.php:1142 +#: src/Object/Post.php:1143 msgid "This is you" msgstr "" #: mod/photos.php:1095 mod/photos.php:1151 mod/photos.php:1231 #: src/Module/Moderation/Reports.php:102 src/Object/Post.php:598 -#: src/Object/Post.php:1144 +#: src/Object/Post.php:1145 msgid "Comment" msgstr "" #: mod/photos.php:1097 mod/photos.php:1153 mod/photos.php:1233 #: src/Content/Conversation.php:400 src/Module/Calendar/Event/Form.php:234 #: src/Module/Item/Compose.php:194 src/Module/Post/Edit.php:151 -#: src/Object/Post.php:1158 +#: src/Object/Post.php:1159 msgid "Preview" msgstr "" #: mod/photos.php:1098 src/Content/Conversation.php:354 -#: src/Module/Post/Edit.php:116 src/Object/Post.php:1146 +#: src/Module/Post/Edit.php:116 src/Object/Post.php:1147 msgid "Loading..." msgstr "" @@ -1228,7 +1228,7 @@ msgid "Visible to everybody" msgstr "" #: src/Content/Conversation.php:324 src/Module/Item/Compose.php:193 -#: src/Object/Post.php:1157 +#: src/Object/Post.php:1158 msgid "Please enter a image/video/audio/webpage URL:" msgstr "" @@ -1273,52 +1273,52 @@ msgid "attach file" msgstr "" #: src/Content/Conversation.php:359 src/Module/Item/Compose.php:183 -#: src/Module/Post/Edit.php:157 src/Object/Post.php:1147 +#: src/Module/Post/Edit.php:157 src/Object/Post.php:1148 msgid "Bold" msgstr "" #: src/Content/Conversation.php:360 src/Module/Item/Compose.php:184 -#: src/Module/Post/Edit.php:158 src/Object/Post.php:1148 +#: src/Module/Post/Edit.php:158 src/Object/Post.php:1149 msgid "Italic" msgstr "" #: src/Content/Conversation.php:361 src/Module/Item/Compose.php:185 -#: src/Module/Post/Edit.php:159 src/Object/Post.php:1149 +#: src/Module/Post/Edit.php:159 src/Object/Post.php:1150 msgid "Underline" msgstr "" #: src/Content/Conversation.php:362 src/Module/Item/Compose.php:186 -#: src/Module/Post/Edit.php:160 src/Object/Post.php:1151 +#: src/Module/Post/Edit.php:160 src/Object/Post.php:1152 msgid "Quote" msgstr "" #: src/Content/Conversation.php:363 src/Module/Item/Compose.php:187 -#: src/Module/Post/Edit.php:161 src/Object/Post.php:1152 +#: src/Module/Post/Edit.php:161 src/Object/Post.php:1153 msgid "Add emojis" msgstr "" #: src/Content/Conversation.php:364 src/Module/Item/Compose.php:188 -#: src/Object/Post.php:1150 +#: src/Object/Post.php:1151 msgid "Content Warning" msgstr "" #: src/Content/Conversation.php:365 src/Module/Item/Compose.php:189 -#: src/Module/Post/Edit.php:162 src/Object/Post.php:1153 +#: src/Module/Post/Edit.php:162 src/Object/Post.php:1154 msgid "Code" msgstr "" #: src/Content/Conversation.php:366 src/Module/Item/Compose.php:190 -#: src/Object/Post.php:1154 +#: src/Object/Post.php:1155 msgid "Image" msgstr "" #: src/Content/Conversation.php:367 src/Module/Item/Compose.php:191 -#: src/Module/Post/Edit.php:163 src/Object/Post.php:1155 +#: src/Module/Post/Edit.php:163 src/Object/Post.php:1156 msgid "Link" msgstr "" #: src/Content/Conversation.php:368 src/Module/Item/Compose.php:192 -#: src/Module/Post/Edit.php:164 src/Object/Post.php:1156 +#: src/Module/Post/Edit.php:164 src/Object/Post.php:1157 msgid "Link or Media" msgstr "" @@ -1365,7 +1365,7 @@ msgstr "" msgid "Public post" msgstr "" -#: src/Content/Conversation.php:410 src/Content/Widget/VCard.php:122 +#: src/Content/Conversation.php:410 src/Content/Widget/VCard.php:125 #: src/Model/Profile.php:462 src/Module/Admin/Logs/View.php:80 #: src/Module/Post/Edit.php:167 msgid "Message" @@ -1478,26 +1478,26 @@ msgstr "" msgid "Pinned item" msgstr "" -#: src/Content/Conversation.php:1521 src/Object/Post.php:541 +#: src/Content/Conversation.php:1522 src/Object/Post.php:541 #: src/Object/Post.php:542 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: src/Content/Conversation.php:1535 src/Object/Post.php:529 +#: src/Content/Conversation.php:1536 src/Object/Post.php:529 msgid "Categories:" msgstr "" -#: src/Content/Conversation.php:1536 src/Object/Post.php:530 +#: src/Content/Conversation.php:1537 src/Object/Post.php:530 msgid "Filed under:" msgstr "" -#: src/Content/Conversation.php:1544 src/Object/Post.php:556 +#: src/Content/Conversation.php:1545 src/Object/Post.php:556 #, php-format msgid "%s from %s" msgstr "" -#: src/Content/Conversation.php:1560 +#: src/Content/Conversation.php:1561 msgid "View in context" msgstr "" @@ -1741,7 +1741,7 @@ msgstr "" #: src/Content/Feature.php:120 src/Content/Widget.php:607 #: src/Module/Admin/Site.php:464 src/Module/BaseSettings.php:111 -#: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:309 +#: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:312 msgid "Channels" msgstr "" @@ -2000,7 +2000,7 @@ msgstr "" #: src/Content/Nav.php:219 src/Content/Nav.php:279 #: src/Module/BaseProfile.php:71 src/Module/BaseProfile.php:74 #: src/Module/BaseProfile.php:82 src/Module/BaseProfile.php:85 -#: src/Module/Settings/Display.php:310 view/theme/frio/theme.php:227 +#: src/Module/Settings/Display.php:313 view/theme/frio/theme.php:227 #: view/theme/frio/theme.php:231 msgid "Calendar" msgstr "" @@ -2195,7 +2195,7 @@ msgstr "" #: src/Content/Nav.php:321 src/Module/BaseModeration.php:114 #: src/Module/Moderation/Blocklist/Contact.php:96 -#: src/Module/Moderation/Blocklist/Server/Add.php:107 +#: src/Module/Moderation/Blocklist/Server/Add.php:108 #: src/Module/Moderation/Blocklist/Server/Import.php:102 #: src/Module/Moderation/Blocklist/Server/Index.php:81 #: src/Module/Moderation/Item/Delete.php:47 @@ -2245,23 +2245,23 @@ msgstr "" msgid "Link to source" msgstr "" -#: src/Content/Text/BBCode.php:1744 src/Content/Text/HTML.php:892 +#: src/Content/Text/BBCode.php:1745 src/Content/Text/HTML.php:892 msgid "Click to open/close" msgstr "" -#: src/Content/Text/BBCode.php:1799 +#: src/Content/Text/BBCode.php:1800 msgid "$1 wrote:" msgstr "" -#: src/Content/Text/BBCode.php:1873 src/Content/Text/BBCode.php:1874 +#: src/Content/Text/BBCode.php:1874 src/Content/Text/BBCode.php:1875 msgid "Encrypted content" msgstr "" -#: src/Content/Text/BBCode.php:2206 +#: src/Content/Text/BBCode.php:2207 msgid "Invalid source protocol" msgstr "" -#: src/Content/Text/BBCode.php:2225 +#: src/Content/Text/BBCode.php:2226 msgid "Invalid link protocol" msgstr "" @@ -2273,7 +2273,7 @@ msgstr "" msgid "The end" msgstr "" -#: src/Content/Text/HTML.php:847 src/Content/Widget/VCard.php:118 +#: src/Content/Text/HTML.php:847 src/Content/Widget/VCard.php:121 #: src/Model/Profile.php:456 src/Module/Contact/Profile.php:484 msgid "Follow" msgstr "" @@ -2446,27 +2446,27 @@ msgstr[1] "" msgid "More Trending Tags" msgstr "" -#: src/Content/Widget/VCard.php:96 src/Model/Contact.php:1207 +#: src/Content/Widget/VCard.php:98 src/Model/Contact.php:1207 #: src/Model/Profile.php:441 msgid "Post to group" msgstr "" -#: src/Content/Widget/VCard.php:101 src/Model/Contact.php:1211 +#: src/Content/Widget/VCard.php:103 src/Model/Contact.php:1211 #: src/Model/Profile.php:445 src/Module/Moderation/Item/Source.php:77 msgid "Mention" msgstr "" -#: src/Content/Widget/VCard.php:111 src/Model/Profile.php:360 +#: src/Content/Widget/VCard.php:113 src/Model/Profile.php:360 #: src/Module/Contact/Profile.php:420 src/Module/Profile/Profile.php:187 msgid "XMPP:" msgstr "" -#: src/Content/Widget/VCard.php:112 src/Model/Profile.php:361 +#: src/Content/Widget/VCard.php:114 src/Model/Profile.php:361 #: src/Module/Contact/Profile.php:422 src/Module/Profile/Profile.php:191 msgid "Matrix:" msgstr "" -#: src/Content/Widget/VCard.php:113 src/Model/Event.php:68 +#: src/Content/Widget/VCard.php:115 src/Model/Event.php:68 #: src/Model/Event.php:95 src/Model/Event.php:457 src/Model/Event.php:946 #: src/Model/Profile.php:355 src/Module/Contact/Profile.php:418 #: src/Module/Directory.php:134 src/Module/Notifications/Introductions.php:179 @@ -2474,18 +2474,18 @@ msgstr "" msgid "Location:" msgstr "" -#: src/Content/Widget/VCard.php:116 src/Model/Profile.php:469 +#: src/Content/Widget/VCard.php:119 src/Model/Profile.php:469 #: src/Module/Notifications/Introductions.php:193 msgid "Network:" msgstr "" -#: src/Content/Widget/VCard.php:120 src/Model/Contact.php:1239 +#: src/Content/Widget/VCard.php:123 src/Model/Contact.php:1239 #: src/Model/Contact.php:1251 src/Model/Profile.php:458 #: src/Module/Contact/Profile.php:476 msgid "Unfollow" msgstr "" -#: src/Content/Widget/VCard.php:126 src/Model/Contact.php:1209 +#: src/Content/Widget/VCard.php:129 src/Model/Contact.php:1209 #: src/Model/Profile.php:443 msgid "View group" msgstr "" @@ -2552,8 +2552,8 @@ msgstr "" msgid "You may need to import the file \"database.sql\" manually using phpmyadmin or mysql." msgstr "" -#: src/Core/Installer.php:184 src/Module/Install.php:193 -#: src/Module/Install.php:336 +#: src/Core/Installer.php:184 src/Module/Install.php:194 +#: src/Module/Install.php:337 msgid "Please see the file \"doc/INSTALL.md\"." msgstr "" @@ -2839,37 +2839,37 @@ msgid "%s (%s)" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:416 -#: src/Module/Settings/Display.php:278 +#: src/Module/Settings/Display.php:281 msgid "Monday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:417 -#: src/Module/Settings/Display.php:279 +#: src/Module/Settings/Display.php:282 msgid "Tuesday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:418 -#: src/Module/Settings/Display.php:280 +#: src/Module/Settings/Display.php:283 msgid "Wednesday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:419 -#: src/Module/Settings/Display.php:281 +#: src/Module/Settings/Display.php:284 msgid "Thursday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:420 -#: src/Module/Settings/Display.php:282 +#: src/Module/Settings/Display.php:285 msgid "Friday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:421 -#: src/Module/Settings/Display.php:283 +#: src/Module/Settings/Display.php:286 msgid "Saturday" msgstr "" #: src/Core/L10n.php:485 src/Model/Event.php:415 -#: src/Module/Settings/Display.php:277 +#: src/Module/Settings/Display.php:280 msgid "Sunday" msgstr "" @@ -3298,17 +3298,17 @@ msgid "today" msgstr "" #: src/Model/Event.php:449 src/Module/Calendar/Show.php:115 -#: src/Module/Settings/Display.php:288 src/Util/Temporal.php:339 +#: src/Module/Settings/Display.php:291 src/Util/Temporal.php:339 msgid "month" msgstr "" #: src/Model/Event.php:450 src/Module/Calendar/Show.php:116 -#: src/Module/Settings/Display.php:289 src/Util/Temporal.php:340 +#: src/Module/Settings/Display.php:292 src/Util/Temporal.php:340 msgid "week" msgstr "" #: src/Model/Event.php:451 src/Module/Calendar/Show.php:117 -#: src/Module/Settings/Display.php:290 src/Util/Temporal.php:341 +#: src/Module/Settings/Display.php:293 src/Util/Temporal.php:341 msgid "day" msgstr "" @@ -3873,12 +3873,12 @@ msgid "Disable" msgstr "" #: src/Module/Admin/Addons/Details.php:77 -#: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:336 +#: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:340 msgid "Enable" msgstr "" #: src/Module/Admin/Addons/Details.php:97 src/Module/Admin/Addons/Index.php:59 -#: src/Module/Admin/Federation.php:206 src/Module/Admin/Logs/Settings.php:74 +#: src/Module/Admin/Federation.php:213 src/Module/Admin/Logs/Settings.php:74 #: src/Module/Admin/Logs/View.php:71 src/Module/Admin/Queue.php:59 #: src/Module/Admin/Site.php:447 src/Module/Admin/Storage.php:124 #: src/Module/Admin/Summary.php:175 src/Module/Admin/Themes/Details.php:82 @@ -3923,7 +3923,7 @@ msgstr "" #: src/Module/Settings/Account.php:549 src/Module/Settings/Addons.php:64 #: src/Module/Settings/Connectors.php:149 #: src/Module/Settings/Connectors.php:235 -#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:303 +#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:306 #: src/Module/Settings/Features.php:61 msgid "Save Settings" msgstr "" @@ -4017,74 +4017,74 @@ msgstr "" msgid "Manage Additional Features" msgstr "" -#: src/Module/Admin/Federation.php:68 +#: src/Module/Admin/Federation.php:70 #: src/Module/Moderation/Report/Create.php:177 #: src/Module/Moderation/Report/Create.php:302 msgid "Other" msgstr "" -#: src/Module/Admin/Federation.php:146 src/Module/Admin/Federation.php:394 +#: src/Module/Admin/Federation.php:152 src/Module/Admin/Federation.php:401 msgid "unknown" msgstr "" -#: src/Module/Admin/Federation.php:179 +#: src/Module/Admin/Federation.php:186 #, php-format msgid "%2$s total system" msgid_plural "%2$s total systems" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:180 +#: src/Module/Admin/Federation.php:187 #, php-format msgid "%2$s active user last month" msgid_plural "%2$s active users last month" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:181 +#: src/Module/Admin/Federation.php:188 #, php-format msgid "%2$s active user last six months" msgid_plural "%2$s active users last six months" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:182 +#: src/Module/Admin/Federation.php:189 #, php-format msgid "%2$s registered user" msgid_plural "%2$s registered users" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:183 +#: src/Module/Admin/Federation.php:190 #, php-format msgid "%2$s locally created post or comment" msgid_plural "%2$s locally created posts and comments" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:186 +#: src/Module/Admin/Federation.php:193 #, php-format msgid "%2$s post per user" msgid_plural "%2$s posts per user" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:191 +#: src/Module/Admin/Federation.php:198 #, php-format msgid "%2$s user per system" msgid_plural "%2$s users per system" msgstr[0] "" msgstr[1] "" -#: src/Module/Admin/Federation.php:201 +#: src/Module/Admin/Federation.php:208 msgid "This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of." msgstr "" -#: src/Module/Admin/Federation.php:207 src/Module/BaseAdmin.php:73 +#: src/Module/Admin/Federation.php:214 src/Module/BaseAdmin.php:73 msgid "Federation Statistics" msgstr "" -#: src/Module/Admin/Federation.php:210 +#: src/Module/Admin/Federation.php:217 #, php-format msgid "Currently this node is aware of %2$s node (%3$s active users last month, %4$s active users last six months, %5$s registered users in total) from the following platforms:" msgid_plural "Currently this node is aware of %2$s nodes (%3$s active users last month, %4$s active users last six months, %5$s registered users in total) from the following platforms:" @@ -4278,11 +4278,11 @@ msgstr "" msgid "%s is no valid input for maximum image size" msgstr "" -#: src/Module/Admin/Site.php:362 src/Module/Settings/Display.php:206 +#: src/Module/Admin/Site.php:362 src/Module/Settings/Display.php:208 msgid "No special theme for mobile devices" msgstr "" -#: src/Module/Admin/Site.php:379 src/Module/Settings/Display.php:216 +#: src/Module/Admin/Site.php:379 src/Module/Settings/Display.php:218 #, php-format msgid "%s - (Experimental)" msgstr "" @@ -5826,14 +5826,14 @@ msgstr "" #: src/Module/Calendar/Event/Form.php:195 #: src/Module/Calendar/Event/Form.php:223 src/Module/Debug/Probe.php:45 -#: src/Module/Install.php:187 src/Module/Install.php:213 -#: src/Module/Install.php:218 src/Module/Install.php:232 -#: src/Module/Install.php:241 src/Module/Install.php:246 -#: src/Module/Install.php:252 src/Module/Install.php:257 -#: src/Module/Install.php:271 src/Module/Install.php:284 -#: src/Module/Install.php:311 -#: src/Module/Moderation/Blocklist/Server/Add.php:122 -#: src/Module/Moderation/Blocklist/Server/Add.php:124 +#: src/Module/Install.php:188 src/Module/Install.php:214 +#: src/Module/Install.php:219 src/Module/Install.php:233 +#: src/Module/Install.php:242 src/Module/Install.php:247 +#: src/Module/Install.php:253 src/Module/Install.php:258 +#: src/Module/Install.php:272 src/Module/Install.php:285 +#: src/Module/Install.php:312 +#: src/Module/Moderation/Blocklist/Server/Add.php:123 +#: src/Module/Moderation/Blocklist/Server/Add.php:125 #: src/Module/Moderation/Blocklist/Server/Import.php:113 #: src/Module/Moderation/Blocklist/Server/Index.php:72 #: src/Module/Moderation/Blocklist/Server/Index.php:73 @@ -5903,7 +5903,7 @@ msgstr "" msgid "Create New Event" msgstr "" -#: src/Module/Calendar/Show.php:118 src/Module/Settings/Display.php:291 +#: src/Module/Calendar/Show.php:118 src/Module/Settings/Display.php:294 msgid "list" msgstr "" @@ -7098,132 +7098,132 @@ msgstr "" msgid "Welcome to %s" msgstr "" -#: src/Module/Install.php:175 +#: src/Module/Install.php:176 msgid "Friendica Communications Server - Setup" msgstr "" -#: src/Module/Install.php:186 +#: src/Module/Install.php:187 msgid "System check" msgstr "" -#: src/Module/Install.php:188 src/Module/Install.php:233 -#: src/Module/Install.php:312 +#: src/Module/Install.php:189 src/Module/Install.php:234 +#: src/Module/Install.php:313 msgid "Requirement not satisfied" msgstr "" -#: src/Module/Install.php:189 +#: src/Module/Install.php:190 msgid "Optional requirement not satisfied" msgstr "" -#: src/Module/Install.php:190 +#: src/Module/Install.php:191 msgid "OK" msgstr "" -#: src/Module/Install.php:194 +#: src/Module/Install.php:195 msgid "Next" msgstr "" -#: src/Module/Install.php:195 +#: src/Module/Install.php:196 msgid "Check again" msgstr "" -#: src/Module/Install.php:208 +#: src/Module/Install.php:209 msgid "Base settings" msgstr "" -#: src/Module/Install.php:210 +#: src/Module/Install.php:211 msgid "Base path to installation" msgstr "" -#: src/Module/Install.php:212 +#: src/Module/Install.php:213 msgid "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot." msgstr "" -#: src/Module/Install.php:215 +#: src/Module/Install.php:216 msgid "The Friendica system URL" msgstr "" -#: src/Module/Install.php:217 +#: src/Module/Install.php:218 msgid "Overwrite this field in case the system URL determination isn't right, otherwise leave it as is." msgstr "" -#: src/Module/Install.php:228 +#: src/Module/Install.php:229 msgid "Database connection" msgstr "" -#: src/Module/Install.php:229 +#: src/Module/Install.php:230 msgid "In order to install Friendica we need to know how to connect to your database." msgstr "" -#: src/Module/Install.php:230 +#: src/Module/Install.php:231 msgid "Please contact your hosting provider or site administrator if you have questions about these settings." msgstr "" -#: src/Module/Install.php:231 +#: src/Module/Install.php:232 msgid "The database you specify below should already exist. If it does not, please create it before continuing." msgstr "" -#: src/Module/Install.php:238 +#: src/Module/Install.php:239 msgid "Database Server Name" msgstr "" -#: src/Module/Install.php:243 +#: src/Module/Install.php:244 msgid "Database Login Name" msgstr "" -#: src/Module/Install.php:249 +#: src/Module/Install.php:250 msgid "Database Login Password" msgstr "" -#: src/Module/Install.php:251 +#: src/Module/Install.php:252 msgid "For security reasons the password must not be empty" msgstr "" -#: src/Module/Install.php:254 +#: src/Module/Install.php:255 msgid "Database Name" msgstr "" -#: src/Module/Install.php:258 src/Module/Install.php:286 +#: src/Module/Install.php:259 src/Module/Install.php:287 msgid "Please select a default timezone for your website" msgstr "" -#: src/Module/Install.php:273 +#: src/Module/Install.php:274 msgid "Site settings" msgstr "" -#: src/Module/Install.php:281 +#: src/Module/Install.php:282 msgid "Site administrator email address" msgstr "" -#: src/Module/Install.php:283 +#: src/Module/Install.php:284 msgid "Your account email address must match this in order to use the web admin panel." msgstr "" -#: src/Module/Install.php:290 +#: src/Module/Install.php:291 msgid "System Language:" msgstr "" -#: src/Module/Install.php:292 +#: src/Module/Install.php:293 msgid "Set the default language for your Friendica installation interface and to send emails." msgstr "" -#: src/Module/Install.php:304 +#: src/Module/Install.php:305 msgid "Your Friendica site database has been installed." msgstr "" -#: src/Module/Install.php:314 +#: src/Module/Install.php:315 msgid "Installation finished" msgstr "" -#: src/Module/Install.php:334 +#: src/Module/Install.php:335 msgid "

What next

" msgstr "" -#: src/Module/Install.php:335 +#: src/Module/Install.php:336 msgid "IMPORTANT: You will need to [manually] setup a scheduled task for the worker." msgstr "" -#: src/Module/Install.php:338 +#: src/Module/Install.php:339 #, php-format msgid "Go to your new Friendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel." msgstr "" @@ -7575,16 +7575,16 @@ msgid_plural "%s servers scheduled to be purged." msgstr[0] "" msgstr[1] "" -#: src/Module/Moderation/Blocklist/Server/Add.php:106 +#: src/Module/Moderation/Blocklist/Server/Add.php:107 #: src/Module/Moderation/Blocklist/Server/Import.php:101 msgid "← Return to the list" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:108 +#: src/Module/Moderation/Blocklist/Server/Add.php:109 msgid "Block A New Server Domain Pattern" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:109 +#: src/Module/Moderation/Blocklist/Server/Add.php:110 #: src/Module/Moderation/Blocklist/Server/Index.php:85 msgid "" "

The server domain pattern syntax is case-insensitive shell wildcard, comprising the following special characters:

\n" @@ -7594,65 +7594,65 @@ msgid "" "" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:114 +#: src/Module/Moderation/Blocklist/Server/Add.php:115 #: src/Module/Moderation/Blocklist/Server/Index.php:93 msgid "Check pattern" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:115 +#: src/Module/Moderation/Blocklist/Server/Add.php:116 msgid "Matching known servers" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:116 +#: src/Module/Moderation/Blocklist/Server/Add.php:117 #: src/Module/Settings/Server/Action.php:62 #: src/Module/Settings/Server/Index.php:92 msgid "Server Name" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:117 +#: src/Module/Moderation/Blocklist/Server/Add.php:118 msgid "Server Domain" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:118 +#: src/Module/Moderation/Blocklist/Server/Add.php:119 msgid "Known Contacts" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:119 +#: src/Module/Moderation/Blocklist/Server/Add.php:120 #, php-format msgid "%d known server" msgid_plural "%d known servers" msgstr[0] "" msgstr[1] "" -#: src/Module/Moderation/Blocklist/Server/Add.php:120 +#: src/Module/Moderation/Blocklist/Server/Add.php:121 msgid "Add pattern to the blocklist" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:122 +#: src/Module/Moderation/Blocklist/Server/Add.php:123 #: src/Module/Moderation/Blocklist/Server/Index.php:102 msgid "Server Domain Pattern" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:122 +#: src/Module/Moderation/Blocklist/Server/Add.php:123 #: src/Module/Moderation/Blocklist/Server/Index.php:102 msgid "The domain pattern of the new server to add to the blocklist. Do not include the protocol." msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:123 +#: src/Module/Moderation/Blocklist/Server/Add.php:124 msgid "Purge server" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:123 +#: src/Module/Moderation/Blocklist/Server/Add.php:124 msgid "Also purges all the locally stored content authored by the known contacts registered on that server. Keeps the contacts and the server records. This action cannot be undone." msgid_plural "Also purges all the locally stored content authored by the known contacts registered on these servers. Keeps the contacts and the servers records. This action cannot be undone." msgstr[0] "" msgstr[1] "" -#: src/Module/Moderation/Blocklist/Server/Add.php:124 +#: src/Module/Moderation/Blocklist/Server/Add.php:125 msgid "Block reason" msgstr "" -#: src/Module/Moderation/Blocklist/Server/Add.php:124 +#: src/Module/Moderation/Blocklist/Server/Add.php:125 msgid "The reason why you blocked this server domain pattern. This reason will be shown publicly in the server information page." msgstr "" @@ -9554,12 +9554,12 @@ msgid "When selected, the channel results are reshared. This only works for publ msgstr "" #: src/Module/Settings/Channels.php:176 src/Module/Settings/Channels.php:197 -#: src/Module/Settings/Display.php:334 +#: src/Module/Settings/Display.php:338 msgid "Label" msgstr "" #: src/Module/Settings/Channels.php:177 src/Module/Settings/Channels.php:198 -#: src/Module/Settings/Display.php:335 +#: src/Module/Settings/Display.php:339 #: src/Module/Settings/TwoFactor/AppSpecific.php:124 msgid "Description" msgstr "" @@ -9918,194 +9918,202 @@ msgstr "" msgid "No entries." msgstr "" -#: src/Module/Settings/Display.php:174 +#: src/Module/Settings/Display.php:176 msgid "The theme you chose isn't available." msgstr "" -#: src/Module/Settings/Display.php:214 +#: src/Module/Settings/Display.php:216 #, php-format msgid "%s - (Unsupported)" msgstr "" -#: src/Module/Settings/Display.php:254 +#: src/Module/Settings/Display.php:257 msgid "No preview" msgstr "" -#: src/Module/Settings/Display.php:255 +#: src/Module/Settings/Display.php:258 msgid "No image" msgstr "" -#: src/Module/Settings/Display.php:256 +#: src/Module/Settings/Display.php:259 msgid "Small Image" msgstr "" -#: src/Module/Settings/Display.php:257 +#: src/Module/Settings/Display.php:260 msgid "Large Image" msgstr "" -#: src/Module/Settings/Display.php:302 +#: src/Module/Settings/Display.php:305 msgid "Display Settings" msgstr "" -#: src/Module/Settings/Display.php:304 +#: src/Module/Settings/Display.php:307 msgid "General Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:305 +#: src/Module/Settings/Display.php:308 msgid "Custom Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:306 +#: src/Module/Settings/Display.php:309 msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:307 view/theme/duepuntozero/config.php:74 +#: src/Module/Settings/Display.php:310 view/theme/duepuntozero/config.php:74 #: view/theme/frio/config.php:139 view/theme/quattro/config.php:76 #: view/theme/vier/config.php:124 msgid "Theme settings" msgstr "" -#: src/Module/Settings/Display.php:308 +#: src/Module/Settings/Display.php:311 msgid "Timelines" msgstr "" -#: src/Module/Settings/Display.php:315 +#: src/Module/Settings/Display.php:318 msgid "Display Theme:" msgstr "" -#: src/Module/Settings/Display.php:316 +#: src/Module/Settings/Display.php:319 msgid "Mobile Theme:" msgstr "" -#: src/Module/Settings/Display.php:319 +#: src/Module/Settings/Display.php:322 msgid "Number of items to display per page:" msgstr "" -#: src/Module/Settings/Display.php:319 src/Module/Settings/Display.php:320 +#: src/Module/Settings/Display.php:322 src/Module/Settings/Display.php:323 msgid "Maximum of 100 items" msgstr "" -#: src/Module/Settings/Display.php:320 +#: src/Module/Settings/Display.php:323 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: src/Module/Settings/Display.php:321 +#: src/Module/Settings/Display.php:324 msgid "Update browser every xx seconds" msgstr "" -#: src/Module/Settings/Display.php:321 +#: src/Module/Settings/Display.php:324 msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" -#: src/Module/Settings/Display.php:322 +#: src/Module/Settings/Display.php:325 msgid "Display emoticons" msgstr "" -#: src/Module/Settings/Display.php:322 +#: src/Module/Settings/Display.php:325 msgid "When enabled, emoticons are replaced with matching symbols." msgstr "" -#: src/Module/Settings/Display.php:323 +#: src/Module/Settings/Display.php:326 msgid "Infinite scroll" msgstr "" -#: src/Module/Settings/Display.php:323 +#: src/Module/Settings/Display.php:326 msgid "Automatic fetch new items when reaching the page end." msgstr "" -#: src/Module/Settings/Display.php:324 +#: src/Module/Settings/Display.php:327 msgid "Enable Smart Threading" msgstr "" -#: src/Module/Settings/Display.php:324 +#: src/Module/Settings/Display.php:327 msgid "Enable the automatic suppression of extraneous thread indentation." msgstr "" -#: src/Module/Settings/Display.php:325 +#: src/Module/Settings/Display.php:328 msgid "Display the Dislike feature" msgstr "" -#: src/Module/Settings/Display.php:325 +#: src/Module/Settings/Display.php:328 msgid "Display the Dislike button and dislike reactions on posts and comments." msgstr "" -#: src/Module/Settings/Display.php:326 +#: src/Module/Settings/Display.php:329 msgid "Display the resharer" msgstr "" -#: src/Module/Settings/Display.php:326 +#: src/Module/Settings/Display.php:329 msgid "Display the first resharer as icon and text on a reshared item." msgstr "" -#: src/Module/Settings/Display.php:327 +#: src/Module/Settings/Display.php:330 msgid "Stay local" msgstr "" -#: src/Module/Settings/Display.php:327 +#: src/Module/Settings/Display.php:330 msgid "Don't go to a remote system when following a contact link." msgstr "" -#: src/Module/Settings/Display.php:328 +#: src/Module/Settings/Display.php:331 msgid "Show the post deletion checkbox" msgstr "" -#: src/Module/Settings/Display.php:328 +#: src/Module/Settings/Display.php:331 msgid "Display the checkbox for the post deletion on the network page." msgstr "" -#: src/Module/Settings/Display.php:329 +#: src/Module/Settings/Display.php:332 msgid "DIsplay the event list" msgstr "" -#: src/Module/Settings/Display.php:329 +#: src/Module/Settings/Display.php:332 msgid "Display the birthday reminder and event list on the network page." msgstr "" -#: src/Module/Settings/Display.php:330 +#: src/Module/Settings/Display.php:333 msgid "Link preview mode" msgstr "" -#: src/Module/Settings/Display.php:330 +#: src/Module/Settings/Display.php:333 msgid "Appearance of the link preview that is added to each post with a link." msgstr "" -#: src/Module/Settings/Display.php:331 +#: src/Module/Settings/Display.php:334 msgid "Hide pictures with empty alternative text" msgstr "" -#: src/Module/Settings/Display.php:331 +#: src/Module/Settings/Display.php:334 msgid "Don't display pictures that are missing the alternative text." msgstr "" -#: src/Module/Settings/Display.php:332 +#: src/Module/Settings/Display.php:335 msgid "Hide custom emojis" msgstr "" -#: src/Module/Settings/Display.php:332 +#: src/Module/Settings/Display.php:335 msgid "Don't display custom emojis." msgstr "" -#: src/Module/Settings/Display.php:337 +#: src/Module/Settings/Display.php:336 +msgid "Black platform Icons" +msgstr "" + +#: src/Module/Settings/Display.php:336 +msgid "Use black platform icons instead of colored ones." +msgstr "" + +#: src/Module/Settings/Display.php:341 msgid "Bookmark" msgstr "" -#: src/Module/Settings/Display.php:339 +#: src/Module/Settings/Display.php:343 msgid "Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu." msgstr "" -#: src/Module/Settings/Display.php:341 +#: src/Module/Settings/Display.php:345 msgid "Channel languages:" msgstr "" -#: src/Module/Settings/Display.php:341 +#: src/Module/Settings/Display.php:345 msgid "Select all languages that you want to see in your channels." msgstr "" -#: src/Module/Settings/Display.php:343 +#: src/Module/Settings/Display.php:347 msgid "Beginning of week:" msgstr "" -#: src/Module/Settings/Display.php:344 +#: src/Module/Settings/Display.php:348 msgid "Default calendar view:" msgstr "" @@ -11615,92 +11623,92 @@ msgstr "" msgid "More" msgstr "" -#: src/Object/Post.php:621 +#: src/Object/Post.php:622 msgid "Notifier task is pending" msgstr "" -#: src/Object/Post.php:622 +#: src/Object/Post.php:623 msgid "Delivery to remote servers is pending" msgstr "" -#: src/Object/Post.php:623 +#: src/Object/Post.php:624 msgid "Delivery to remote servers is underway" msgstr "" -#: src/Object/Post.php:624 +#: src/Object/Post.php:625 msgid "Delivery to remote servers is mostly done" msgstr "" -#: src/Object/Post.php:625 +#: src/Object/Post.php:626 msgid "Delivery to remote servers is done" msgstr "" -#: src/Object/Post.php:647 +#: src/Object/Post.php:648 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: src/Object/Post.php:648 +#: src/Object/Post.php:649 msgid "Show more" msgstr "" -#: src/Object/Post.php:649 +#: src/Object/Post.php:650 msgid "Show fewer" msgstr "" -#: src/Object/Post.php:686 +#: src/Object/Post.php:687 #, php-format msgid "Reshared by: %s" msgstr "" -#: src/Object/Post.php:691 +#: src/Object/Post.php:692 #, php-format msgid "Viewed by: %s" msgstr "" -#: src/Object/Post.php:696 +#: src/Object/Post.php:697 #, php-format msgid "Read by: %s" msgstr "" -#: src/Object/Post.php:701 +#: src/Object/Post.php:702 #, php-format msgid "Liked by: %s" msgstr "" -#: src/Object/Post.php:706 +#: src/Object/Post.php:707 #, php-format msgid "Disliked by: %s" msgstr "" -#: src/Object/Post.php:711 +#: src/Object/Post.php:712 #, php-format msgid "Attended by: %s" msgstr "" -#: src/Object/Post.php:716 +#: src/Object/Post.php:717 #, php-format msgid "Maybe attended by: %s" msgstr "" -#: src/Object/Post.php:721 +#: src/Object/Post.php:722 #, php-format msgid "Not attended by: %s" msgstr "" -#: src/Object/Post.php:726 +#: src/Object/Post.php:727 #, php-format msgid "Commented by: %s" msgstr "" -#: src/Object/Post.php:731 +#: src/Object/Post.php:732 #, php-format msgid "Reacted with %s by: %s" msgstr "" -#: src/Object/Post.php:754 +#: src/Object/Post.php:755 #, php-format msgid "Quote shared by: %s" msgstr "" diff --git a/view/templates/admin/federation.tpl b/view/templates/admin/federation.tpl index 5a78a6d165..ec366b7abd 100644 --- a/view/templates/admin/federation.tpl +++ b/view/templates/admin/federation.tpl @@ -57,17 +57,18 @@ } }); - +
{{foreach $counts as $c}} {{if $c[0]['total'] > 0}} + - -
{{if $c[0]['svg']}}{{/if}} {{$c[0]['platform']}} {{$c[0]['total']}} {{$c[0]['network']}}
+
    {{if $c[0]['total']}}
  • {{$c[0]['totallbl']}}
    • {{/if}} {{if $c[0]['month']}}
  • {{$c[0]['monthlbl']}}
    • {{/if}} @@ -80,7 +81,7 @@
+