diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 486d992c..00000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 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 General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is 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. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - 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. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - 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 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. Use with the GNU Affero General Public License. - - 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 Affero 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 special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 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 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 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. - - howto - Copyright (C) 2017 disroot - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU 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 General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - howto Copyright (C) 2017 disroot - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - 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 GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/docs.es.md b/docs.es.md deleted file mode 100644 index 2acb2ac6..00000000 --- a/docs.es.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 'GDPR - Auto exportar tus datos personales' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: false - ---- - -En Disroot, la mayoría de la información que guardamos es la que provees cuando utilizas los servicios (almacenamos tus archivos porque elegiste guardarlos en nuestra nube). No tenemos interés en obtener ni recopilar ninguna información adicional o procesarla para venderla a empresas de publicidad y tampoco utilizarla en ninguna forma para generar ganancias. Por lo tanto, la mayorí­a de los servicios que proveemos te brindan alguna manera de auto exportar tus datos. Este capí­tulo abarcará tutoriales que te ayudarán a obtener toda tu información almacenada por los servicios provistos por Disroot y conectados a tu cuenta. - -## ͍ndice -- [Nextcloud](Nextcloud) - - [Nextcloud - Archivos](Nextcloud/Files) - - [Nextcloud - Contactos](Nextcloud/Contacts) - - [Nextcloud - Calendarios](Nextcloud/Calendar) - - [Nextcloud - Noticias](Nextcloud/News) - - [Nextcloud - Marcadores](Nextcloud/Bookmarks) - - [Nextcloud - Notas](Nextcloud/Files) -- [Diaspora](Diaspora) -- [Foro / Discourse](Discourse) -- [Tablero / Taiga](Taiga) -- [Hubzilla](Hubzilla) diff --git a/pages/00.basics/docs.en.md b/pages/00.basics/docs.en.md new file mode 100644 index 00000000..42cedf8f --- /dev/null +++ b/pages/00.basics/docs.en.md @@ -0,0 +1,23 @@ +--- +title: H2: Disroot How-tos +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Welcome to **Disroot's How-to site** + +The main goal of this site is to help you find your way around the various Disroot services. + +To cover all the services, with all it's Disroot's provided features, for all platforms and/or Operating Systems it's a very ambitious and time consuming project that requires a lot of work. We think it could be beneficial not only for our users (disrooters) but the entire Open Source and Free Software community running the same or similar software. + +In order to do so, any help from disrooters is always needed and welcome. So, if you think there's a missing tutorial, the information is not accurate or could be improve, please contact us or (even better) start writing a how-to yourself.
+ +We use **[git](https://en.wikipedia.org/wiki/Git)**, so you could just submit a "pull request" to our repository. If you're not familiar with this tool, you can submit changes or suggestions via etherpad or email. [**Here**](/contribute) there's a very simple git how-to.
+ +In addition, we're building a glossary to help everyone not familiar with some terms and concepts. You can find it [here](/glossary). + +Let's start... diff --git a/pages/01.basics/GDPR/docs.en.md b/pages/01.basics/GDPR/docs.en.md deleted file mode 100755 index ba0f938b..00000000 --- a/pages/01.basics/GDPR/docs.en.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: 'GDPR - Self-exporting your personal data' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: false - ---- - -At Disroot pretty much all data is the one you provide when using services (we store your files because you choose to store files on our cloud). We have no interest in acquiring and collecting any extra data nor we process it to sell to advertisement companies or in any way use to monetize on it. Therefor most of the services provide you with a way to self export your data. This chapter will cover tutorials that will help you get all the data stored on services provided by disroot and connected to your account. - -## Table of contents -- [Nextcloud](Nextcloud) - - [Nextcloud - Files](Nextcloud/Files) - - [Nextcloud - Contacts](Nextcloud/Contacts) - - [Nextcloud - Calendars](Nextcloud/Calendar) - - [Nextcloud - News](Nextcloud/News) - - [Nextcloud - Bookmarks](Nextcloud/Bookmarks) - - [Nextcloud - Notes](Nextcloud/Files) -- [Diaspora](Diaspora) -- [Forum / Discourse](Discourse) -- [Board / Taiga](Taiga) -- [Hubzilla](Hubzilla) diff --git a/pages/01.basics/docs.en.md b/pages/01.basics/docs.en.md deleted file mode 100755 index 3f024adf..00000000 --- a/pages/01.basics/docs.en.md +++ /dev/null @@ -1,23 +0,0 @@ ---- -title: Basics -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -# Welcome to **Disroot** Howto pages. - -This site is dedicated to Howtos and tutorials to help you find your way around the various Disroot services. - -Our idea is to cover all the services with all it's features provided by disroot, for all platforms and Operating System out there. It's very ambitious project that requires a lot of work. However we believe it will benefit not only disrooters but entire Open Source community that runs same or similar software. - -In order to cover all the aspects of each service and constantly keep it up to date, we need help of all disrooters. So if you feel you are missing a tutorial, or that the information is not accurate- please feel free to -contact us or write a revision yourself. As you probably noticed, we use **git** so just submit pull request to our repository. -If you are not familiar with git, you can submit changes via etherpad or email. Soon we will produce a simple git howto on git (or at least link to one) to get all the interested people onboard. - - - -![](en/disroot_logo.png) diff --git a/pages/01.basics/how-to-change-your-disroot-user-password/docs.en.md b/pages/01.basics/how-to-change-your-disroot-user-password/docs.en.md deleted file mode 100755 index bdfc187b..00000000 --- a/pages/01.basics/how-to-change-your-disroot-user-password/docs.en.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -title: 'How to change your disroot user password' -published: true -taxonomy: - category: - - docs -visible: true ---- - -First you need to log in to the **Self Service Center** at https://user.disroot.org and choose to **change password**. - -Once you changed your password in the Self Service Center you will need to make sure to change your encryption key in **Nextcloud**, since all your files in ownCloud are encrypted with a key that is generated from your password. -1. Go to https://cloud.disroot.org and log in with your new password. -You will see a yellow message on top of the page: -`Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.` -2. Click on your name in the top right corner and select **Personal** from the menu. -3. Scroll down to **Nextcloud basic encryption module** and type in your old password and your new password and click **Update Private Key Password**. -4. Log out of Nextcloud and log back in and that's it - you're all set and can view your file again. - -TIP: If you lose your password, you won't be able to retrieve your files on Nextcloud as they are encrypted so that even the server administrators can't see their content. If you want to be sure you won't lose your data check the **Enable password recovery** box in your Personal settings. This will allow the server administrators to retrieve your data upon request. diff --git a/pages/01.basics/how-to-delete-account/docs.en.md b/pages/01.basics/how-to-delete-account/docs.en.md deleted file mode 100755 index 84ca861f..00000000 --- a/pages/01.basics/how-to-delete-account/docs.en.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: 'How to delete your disroot account' -published: true -visible: true -taxonomy: - category: - - docs - ---- - -To delete your Disroot navigate to https://user.disroot.org and log in with your Disroot credentials. - -Select the 'Delete my Account' box and continue as instructed. - -Please notice: This process is irreversible! Once confirmed you will not be able to log in to your account or ask to restore it later. All your remaining data will be deleted within 48 hours, and your current user name will not be available when creating a new account. diff --git a/pages/01.basics/how-to-request-aliases/docs.en.md b/pages/01.basics/how-to-request-aliases/docs.en.md deleted file mode 100755 index 511e3919..00000000 --- a/pages/01.basics/how-to-request-aliases/docs.en.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: How to request email Alias -published: true -visible: true -taxonomy: - category: - - docs - ---- - -Aliases are available for regular supporters. By regular supporters we mean those who "buy" us at least one cup of coffee a month. -It is not that we are promoting coffee, coffee is actually a very handy symbol for [exploitation and inequality](http://thesourcefilm.com/)(http://www.foodispower.org/coffee/). And we thought that is a good way to let people measure themselves how much they can give. -Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the Disroot platform running and make sure it is available for free for other people with less means. - -We found this [list](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) of coffee cup prices around the world, it might not be very accurate, but it gives a good indication of the different fares. - -To request aliases you need to fill in this [form](https://disroot.org/forms/alias-request-form). diff --git a/pages/01.start/docs.en.md b/pages/01.start/docs.en.md new file mode 100755 index 00000000..19b56ead --- /dev/null +++ b/pages/01.start/docs.en.md @@ -0,0 +1,39 @@ +--- +title: List of Services +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|[**User**
![](icons/user.png)](/user/)|[**Cloud**
![](icons/cloud.png)](/cloud/)| +|:--:|:--:| +|01.[Account & Password Management](/user/account_password/)
02.[Personal data](/user/gdpr/)|**WEB**:
01.[General overview](/cloud/introduction/)
02.[Files management](/cloud/files_management)
03.[Applications](/cloud/apps/)

**DESKTOP**:
[Clients](/cloud/clients/desktop)

**MOBILE**:
[Clients](/cloud/clients/mobile)| +
+ +|**COMMUNICATION TOOLS**| +|:--:| + +|[**Mail**
![](icons/email.png)](/communication/email/)|[**Chat**
![](icons/chat.png)](/communication/chat/)|[**Forum**
![](icons/forum.png)](/communication/forum/)| +|:--:|:--:|:--:| +|01.[Email settings](/communication/email/clients)
02.[Setting aliases](/communication/email/alias)
03.[Setting filters](email/filters)

**WEB**:
[Webmail](/communication/email/webmail)

**DESKTOP**:
[Clients](/communication/email/clients/desktop)

**MOBILE**:
[Clients](/communication/email/clients/mobile)|**WEB**:
[Webchat](/communication/chat/webchat)

**DESKTOP**:
[Clients](/communication/chat/desktop)

**MOBILE**:
[Clients](/communication/chat/mobile)|[Discourse](/communication/forum/)| +
+ +|[**SOCIAL**
![](icons/social.png)](/social/)| +|:--:| +|**WEB:**
[**DisHub**: Disroot's Hubzilla instance](/social/dishub)

**MOBILE**:
[**Nomad**: Disroot's Hubzilla mobile app](/social/nomad)| +
+ +|PROJECTS AND COLLABORATIVE TOOLS| +|:--:| + +|[**Project Board**
![](icons/project.png)](/projects_office/taiga/)|[**Collaboratory**
![](icons/collaborative.png)](/projects_office/)| +|:--:|:--:| +|[Project Management](/projects_office/taiga/)|**WEB**:
01.[Pads](/projects_office/pads/)
02.[Pastebin](/projects_office/bin)
03.[Polls](/projects_office/polls/)
04.[File Sharing](/projects_office/lufi/)

**MOBILE**:
01.[DisApp](/projects_office/disapp)
02.[Padland](/projects_office/padland)| +
+ +|[How2 Glossary](glosary)|[How2 contribute](contribute)|[How2 License](licensing)| +|:--:|:--:|:--:| +|Basic terms and concepts used throughout the How2s|Ways to collaborate improving this site|The How2 documents license| diff --git a/pages/01.basics/docs.es.md b/pages/01.start/docs.es.md similarity index 100% rename from pages/01.basics/docs.es.md rename to pages/01.start/docs.es.md diff --git a/pages/01.basics/docs.fr.md b/pages/01.start/docs.fr.md similarity index 100% rename from pages/01.basics/docs.fr.md rename to pages/01.start/docs.fr.md diff --git a/pages/01.basics/docs.hu.md b/pages/01.start/docs.hu.md similarity index 100% rename from pages/01.basics/docs.hu.md rename to pages/01.start/docs.hu.md diff --git a/pages/01.basics/docs.it.md b/pages/01.start/docs.it.md similarity index 100% rename from pages/01.basics/docs.it.md rename to pages/01.start/docs.it.md diff --git a/pages/01.basics/docs.pl.md b/pages/01.start/docs.pl.md similarity index 100% rename from pages/01.basics/docs.pl.md rename to pages/01.start/docs.pl.md diff --git a/pages/01.basics/docs.pt.md b/pages/01.start/docs.pt.md similarity index 100% rename from pages/01.basics/docs.pt.md rename to pages/01.start/docs.pt.md diff --git a/pages/01.basics/en/disroot_logo.png b/pages/01.start/en/disroot_logo.png similarity index 100% rename from pages/01.basics/en/disroot_logo.png rename to pages/01.start/en/disroot_logo.png diff --git a/pages/01.start/icons/chat.png b/pages/01.start/icons/chat.png new file mode 100644 index 00000000..b51efc8e Binary files /dev/null and b/pages/01.start/icons/chat.png differ diff --git a/pages/01.start/icons/cloud.png b/pages/01.start/icons/cloud.png new file mode 100644 index 00000000..da3251f5 Binary files /dev/null and b/pages/01.start/icons/cloud.png differ diff --git a/pages/01.start/icons/collaborative.png b/pages/01.start/icons/collaborative.png new file mode 100644 index 00000000..1ce35e4f Binary files /dev/null and b/pages/01.start/icons/collaborative.png differ diff --git a/pages/01.start/icons/conversations.png b/pages/01.start/icons/conversations.png new file mode 100644 index 00000000..68938c24 Binary files /dev/null and b/pages/01.start/icons/conversations.png differ diff --git a/pages/01.start/icons/disapp.png b/pages/01.start/icons/disapp.png new file mode 100644 index 00000000..c1511092 Binary files /dev/null and b/pages/01.start/icons/disapp.png differ diff --git a/pages/01.start/icons/discourse.png b/pages/01.start/icons/discourse.png new file mode 100644 index 00000000..66f77270 Binary files /dev/null and b/pages/01.start/icons/discourse.png differ diff --git a/pages/01.start/icons/email.png b/pages/01.start/icons/email.png new file mode 100644 index 00000000..f076a606 Binary files /dev/null and b/pages/01.start/icons/email.png differ diff --git a/pages/01.start/icons/ethercalc.png b/pages/01.start/icons/ethercalc.png new file mode 100644 index 00000000..886e3936 Binary files /dev/null and b/pages/01.start/icons/ethercalc.png differ diff --git a/pages/01.start/icons/etherpad.png b/pages/01.start/icons/etherpad.png new file mode 100644 index 00000000..862a3de4 Binary files /dev/null and b/pages/01.start/icons/etherpad.png differ diff --git a/pages/01.start/icons/forum.png b/pages/01.start/icons/forum.png new file mode 100644 index 00000000..afe4cd01 Binary files /dev/null and b/pages/01.start/icons/forum.png differ diff --git a/pages/01.start/icons/gajim.png b/pages/01.start/icons/gajim.png new file mode 100644 index 00000000..cd8f608f Binary files /dev/null and b/pages/01.start/icons/gajim.png differ diff --git a/pages/01.start/icons/gnu_linux.png b/pages/01.start/icons/gnu_linux.png new file mode 100644 index 00000000..d4a21355 Binary files /dev/null and b/pages/01.start/icons/gnu_linux.png differ diff --git a/pages/01.start/icons/lufi.png b/pages/01.start/icons/lufi.png new file mode 100644 index 00000000..fab263a6 Binary files /dev/null and b/pages/01.start/icons/lufi.png differ diff --git a/pages/01.start/icons/nc_logo.png b/pages/01.start/icons/nc_logo.png new file mode 100644 index 00000000..a59c0257 Binary files /dev/null and b/pages/01.start/icons/nc_logo.png differ diff --git a/pages/01.start/icons/nomad.png b/pages/01.start/icons/nomad.png new file mode 100644 index 00000000..10fcde01 Binary files /dev/null and b/pages/01.start/icons/nomad.png differ diff --git a/pages/01.start/icons/padland.png b/pages/01.start/icons/padland.png new file mode 100644 index 00000000..639afda9 Binary files /dev/null and b/pages/01.start/icons/padland.png differ diff --git a/pages/01.start/icons/pidgin.png b/pages/01.start/icons/pidgin.png new file mode 100644 index 00000000..9011f304 Binary files /dev/null and b/pages/01.start/icons/pidgin.png differ diff --git a/pages/01.start/icons/privatebin.png b/pages/01.start/icons/privatebin.png new file mode 100644 index 00000000..d5a67e44 Binary files /dev/null and b/pages/01.start/icons/privatebin.png differ diff --git a/pages/01.start/icons/project.png b/pages/01.start/icons/project.png new file mode 100644 index 00000000..31cf860c Binary files /dev/null and b/pages/01.start/icons/project.png differ diff --git a/pages/01.start/icons/social.png b/pages/01.start/icons/social.png new file mode 100644 index 00000000..73f4fad7 Binary files /dev/null and b/pages/01.start/icons/social.png differ diff --git a/pages/01.start/icons/taiga.png b/pages/01.start/icons/taiga.png new file mode 100644 index 00000000..0fe56de0 Binary files /dev/null and b/pages/01.start/icons/taiga.png differ diff --git a/pages/01.start/icons/thunderbird.png b/pages/01.start/icons/thunderbird.png new file mode 100644 index 00000000..f11ae788 Binary files /dev/null and b/pages/01.start/icons/thunderbird.png differ diff --git a/pages/01.start/icons/user.png b/pages/01.start/icons/user.png new file mode 100644 index 00000000..a8e85adf Binary files /dev/null and b/pages/01.start/icons/user.png differ diff --git a/pages/01.basics/pl/disroot_logo.jpg b/pages/01.start/pl/disroot_logo.jpg similarity index 100% rename from pages/01.basics/pl/disroot_logo.jpg rename to pages/01.start/pl/disroot_logo.jpg diff --git a/pages/02.User/01.Account_Password/01.Password-Change/docs.en.md b/pages/02.User/01.Account_Password/01.Password-Change/docs.en.md new file mode 100755 index 00000000..a94c8533 --- /dev/null +++ b/pages/02.User/01.Account_Password/01.Password-Change/docs.en.md @@ -0,0 +1,27 @@ +--- +title: 'How2 change your Disroot user password' +published: true +taxonomy: + category: + - docs +visible: true +--- + +First you need to log in to the **Self Service Center** at https://user.disroot.org and choose to **change password**. + +|![](en/user.png)| +|:--:| +|![](en/change.png)| + +Once you changed your password in the Self Service Center you will need to make sure to change your encryption key in **Nextcloud**, since all your files in Nextcloud are encrypted with a key that is generated from your password. +1. Go to **[https://cloud.disroot.org](https://cloud.disroot.org)** and log in with your new password. +You will see a yellow message on top of the page:
+`Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.` +2. Click on your name in the top right corner and select **Personal** from the menu. +3. Scroll down to **Nextcloud basic encryption module** and type in your old password and your new password and click **Update Private Key Password**. +4. Log out of Nextcloud and log back in and that's it, you're all set and can view your file again. + +|![](en/note.png) **NOTE**| +|:--:| +|If you lose your password, you won't be able to retrieve your files on the cloud as they're encrypted, so even the server administrators can't see their content.
If you want to be sure you won't lose your data, check the **Enable password recovery** box in your Personal settings. This will allow the server administrators to retrieve your data upon request.| +|![](en/bemodule.png)| diff --git a/pages/01.basics/how-to-change-your-disroot-user-password/docs.es.md b/pages/02.User/01.Account_Password/01.Password-Change/docs.es.md similarity index 100% rename from pages/01.basics/how-to-change-your-disroot-user-password/docs.es.md rename to pages/02.User/01.Account_Password/01.Password-Change/docs.es.md diff --git a/pages/01.basics/how-to-change-your-disroot-user-password/docs.fr.md b/pages/02.User/01.Account_Password/01.Password-Change/docs.fr.md similarity index 100% rename from pages/01.basics/how-to-change-your-disroot-user-password/docs.fr.md rename to pages/02.User/01.Account_Password/01.Password-Change/docs.fr.md diff --git a/pages/01.basics/how-to-change-your-disroot-user-password/docs.hu.md b/pages/02.User/01.Account_Password/01.Password-Change/docs.hu.md similarity index 100% rename from pages/01.basics/how-to-change-your-disroot-user-password/docs.hu.md rename to pages/02.User/01.Account_Password/01.Password-Change/docs.hu.md diff --git a/pages/01.basics/how-to-change-your-disroot-user-password/docs.it.md b/pages/02.User/01.Account_Password/01.Password-Change/docs.it.md similarity index 100% rename from pages/01.basics/how-to-change-your-disroot-user-password/docs.it.md rename to pages/02.User/01.Account_Password/01.Password-Change/docs.it.md diff --git a/pages/01.basics/how-to-change-your-disroot-user-password/docs.pt.md b/pages/02.User/01.Account_Password/01.Password-Change/docs.pt.md similarity index 100% rename from pages/01.basics/how-to-change-your-disroot-user-password/docs.pt.md rename to pages/02.User/01.Account_Password/01.Password-Change/docs.pt.md diff --git a/pages/02.User/01.Account_Password/01.Password-Change/en/bemodule.png b/pages/02.User/01.Account_Password/01.Password-Change/en/bemodule.png new file mode 100644 index 00000000..11cb7eff Binary files /dev/null and b/pages/02.User/01.Account_Password/01.Password-Change/en/bemodule.png differ diff --git a/pages/02.User/01.Account_Password/01.Password-Change/en/change.png b/pages/02.User/01.Account_Password/01.Password-Change/en/change.png new file mode 100644 index 00000000..d549be22 Binary files /dev/null and b/pages/02.User/01.Account_Password/01.Password-Change/en/change.png differ diff --git a/pages/02.User/01.Account_Password/01.Password-Change/en/note.png b/pages/02.User/01.Account_Password/01.Password-Change/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/02.User/01.Account_Password/01.Password-Change/en/note.png differ diff --git a/pages/02.User/01.Account_Password/01.Password-Change/en/user.png b/pages/02.User/01.Account_Password/01.Password-Change/en/user.png new file mode 100644 index 00000000..914d21a8 Binary files /dev/null and b/pages/02.User/01.Account_Password/01.Password-Change/en/user.png differ diff --git a/pages/02.User/01.Account_Password/02.Alias-Request/docs.en.md b/pages/02.User/01.Account_Password/02.Alias-Request/docs.en.md new file mode 100755 index 00000000..5847c10d --- /dev/null +++ b/pages/02.User/01.Account_Password/02.Alias-Request/docs.en.md @@ -0,0 +1,17 @@ +--- +title: How2 request an email alias +published: true +visible: true +taxonomy: + category: + - docs + +--- + +Aliases are available for regular supporters. By regular supporters we mean those who "buy" us at least one cup of coffee a month. +It is not that we are promoting coffee, coffee is actually a very handy symbol for [exploitation and inequality](http://thesourcefilm.com/)(http://www.foodispower.org/coffee/). And we thought that is a good way to let people measure themselves how much they can give. +Please take time to consider your contribution. If you can 'buy' us one cup of Rio De Janeiro coffee a month that's OK, but If you can afford a Double Decaf Soy Frappuccino With An Extra Shot And Cream a month, then you can really help us keep the Disroot platform running and make sure it is available for free for other people with less means. + +We found this [list](https://www.caffesociety.co.uk/blog/the-cheapest-cities-in-the-world-for-a-cup-of-coffee) of coffee cup prices around the world, it might not be very accurate, but it gives a good indication of the different fares. + +To request aliases you need to fill in this [form](https://disroot.org/forms/alias-request-form). diff --git a/pages/01.basics/how-to-request-aliases/docs.es.md b/pages/02.User/01.Account_Password/02.Alias-Request/docs.es.md similarity index 100% rename from pages/01.basics/how-to-request-aliases/docs.es.md rename to pages/02.User/01.Account_Password/02.Alias-Request/docs.es.md diff --git a/pages/01.basics/how-to-request-aliases/docs.fr.md b/pages/02.User/01.Account_Password/02.Alias-Request/docs.fr.md similarity index 100% rename from pages/01.basics/how-to-request-aliases/docs.fr.md rename to pages/02.User/01.Account_Password/02.Alias-Request/docs.fr.md diff --git a/pages/01.basics/how-to-request-aliases/docs.hu.md b/pages/02.User/01.Account_Password/02.Alias-Request/docs.hu.md similarity index 100% rename from pages/01.basics/how-to-request-aliases/docs.hu.md rename to pages/02.User/01.Account_Password/02.Alias-Request/docs.hu.md diff --git a/pages/01.basics/how-to-request-aliases/docs.it.md b/pages/02.User/01.Account_Password/02.Alias-Request/docs.it.md similarity index 100% rename from pages/01.basics/how-to-request-aliases/docs.it.md rename to pages/02.User/01.Account_Password/02.Alias-Request/docs.it.md diff --git a/pages/01.basics/how-to-request-aliases/docs.pt.md b/pages/02.User/01.Account_Password/02.Alias-Request/docs.pt.md similarity index 100% rename from pages/01.basics/how-to-request-aliases/docs.pt.md rename to pages/02.User/01.Account_Password/02.Alias-Request/docs.pt.md diff --git a/pages/02.User/01.Account_Password/03.Account-Deletion/docs.en.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.en.md new file mode 100755 index 00000000..dd06152c --- /dev/null +++ b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.en.md @@ -0,0 +1,15 @@ +--- +title: 'How2 delete your Disroot account' +published: true +visible: true +taxonomy: + category: + - docs + +--- + +To delete your Disroot navigate to https://user.disroot.org and log in with your Disroot credentials. + +Select the 'Delete my Account' box and continue as instructed. + +Please notice: This process is irreversible! Once confirmed you will not be able to log in to your account or ask to restore it later. All your remaining data will be deleted within 48 hours, and your current user name will not be available when creating a new account. diff --git a/pages/01.basics/how-to-delete-account/docs.es.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.es.md similarity index 100% rename from pages/01.basics/how-to-delete-account/docs.es.md rename to pages/02.User/01.Account_Password/03.Account-Deletion/docs.es.md diff --git a/pages/01.basics/how-to-delete-account/docs.fr.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.fr.md similarity index 100% rename from pages/01.basics/how-to-delete-account/docs.fr.md rename to pages/02.User/01.Account_Password/03.Account-Deletion/docs.fr.md diff --git a/pages/01.basics/how-to-delete-account/docs.hu.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.hu.md similarity index 100% rename from pages/01.basics/how-to-delete-account/docs.hu.md rename to pages/02.User/01.Account_Password/03.Account-Deletion/docs.hu.md diff --git a/pages/01.basics/how-to-delete-account/docs.it.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.it.md similarity index 100% rename from pages/01.basics/how-to-delete-account/docs.it.md rename to pages/02.User/01.Account_Password/03.Account-Deletion/docs.it.md diff --git a/pages/01.basics/how-to-delete-account/docs.nl.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.nl.md similarity index 100% rename from pages/01.basics/how-to-delete-account/docs.nl.md rename to pages/02.User/01.Account_Password/03.Account-Deletion/docs.nl.md diff --git a/pages/01.basics/how-to-delete-account/docs.pt.md b/pages/02.User/01.Account_Password/03.Account-Deletion/docs.pt.md similarity index 100% rename from pages/01.basics/how-to-delete-account/docs.pt.md rename to pages/02.User/01.Account_Password/03.Account-Deletion/docs.pt.md diff --git a/pages/02.User/01.Account_Password/docs.en.md b/pages/02.User/01.Account_Password/docs.en.md new file mode 100644 index 00000000..da4f853a --- /dev/null +++ b/pages/02.User/01.Account_Password/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Account & Password Management +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|**How2:**| +|:--:| + +|**[Change your password](password-change)**|**[Request email Alias](alias-request)**|**[Delete your Account](account-deletion)**| +|:--:|:--:|:--| diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/docs.en.md b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/docs.en.md rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/docs.en.md diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/docs.es.md b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/docs.es.md rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/docs.es.md diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/docs.pt.md b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/docs.pt.md rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/docs.pt.md diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/en/export.gif b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/en/export.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/en/export.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/en/export.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/en/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/en/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/en/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/en/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/es/.gitkeep b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/es/.gitkeep similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/es/.gitkeep rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/es/.gitkeep diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/es/export.gif b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/es/export.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/es/export.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/es/export.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/es/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/es/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/es/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/es/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/pt/export.gif b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/pt/export.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/pt/export.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/pt/export.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Bookmarks/pt/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/pt/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Bookmarks/pt/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Bookmarks/pt/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/docs.en.md b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/docs.en.md rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/docs.en.md diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/docs.es.md b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/docs.es.md rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/docs.es.md diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/docs.pt.md b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/docs.pt.md rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/docs.pt.md diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/en/export-calendar.gif b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/en/export-calendar.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/en/export-calendar.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/en/export-calendar.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/en/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/en/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/en/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/en/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/es/.gitkeep b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/es/.gitkeep similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/es/.gitkeep rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/es/.gitkeep diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/es/export-calendar.gif b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/es/export-calendar.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/es/export-calendar.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/es/export-calendar.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/es/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/es/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/es/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/es/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/pt/export_calendar.gif b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/pt/export_calendar.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/pt/export_calendar.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/pt/export_calendar.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Calendar/pt/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Calendar/pt/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Calendar/pt/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Calendar/pt/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/docs.en.md b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/docs.en.md rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/docs.en.md diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/docs.es.md b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/docs.es.md rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/docs.es.md diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/docs.pt.md b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/docs.pt.md rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/docs.pt.md diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/en/export_data.gif b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/en/export_data.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/en/export_data.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/en/export_data.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/en/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/en/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/en/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/en/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/es/.gitkeep b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/es/.gitkeep similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/es/.gitkeep rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/es/.gitkeep diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/es/export_data.gif b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/es/export_data.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/es/export_data.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/es/export_data.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/es/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/es/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/es/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/es/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/pt/export_data.gif b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/pt/export_data.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/pt/export_data.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/pt/export_data.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Contacts/pt/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Contacts/pt/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Contacts/pt/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Contacts/pt/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Files/docs.en.md b/pages/02.User/02.GDPR/01.Nextcloud/Files/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Files/docs.en.md rename to pages/02.User/02.GDPR/01.Nextcloud/Files/docs.en.md diff --git a/pages/01.basics/GDPR/Nextcloud/Files/docs.es.md b/pages/02.User/02.GDPR/01.Nextcloud/Files/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Files/docs.es.md rename to pages/02.User/02.GDPR/01.Nextcloud/Files/docs.es.md diff --git a/pages/01.basics/GDPR/Nextcloud/Files/docs.pt.md b/pages/02.User/02.GDPR/01.Nextcloud/Files/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Files/docs.pt.md rename to pages/02.User/02.GDPR/01.Nextcloud/Files/docs.pt.md diff --git a/pages/01.basics/GDPR/Nextcloud/Files/en/files_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Files/en/files_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Files/en/files_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Files/en/files_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Files/es/files_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Files/es/files_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Files/es/files_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Files/es/files_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/Files/pt/files_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/Files/pt/files_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/Files/pt/files_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/Files/pt/files_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/News/docs.en.md b/pages/02.User/02.GDPR/01.Nextcloud/News/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/docs.en.md rename to pages/02.User/02.GDPR/01.Nextcloud/News/docs.en.md diff --git a/pages/01.basics/GDPR/Nextcloud/News/docs.es.md b/pages/02.User/02.GDPR/01.Nextcloud/News/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/docs.es.md rename to pages/02.User/02.GDPR/01.Nextcloud/News/docs.es.md diff --git a/pages/01.basics/GDPR/Nextcloud/News/docs.pt.md b/pages/02.User/02.GDPR/01.Nextcloud/News/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/docs.pt.md rename to pages/02.User/02.GDPR/01.Nextcloud/News/docs.pt.md diff --git a/pages/01.basics/GDPR/Nextcloud/News/en/export.gif b/pages/02.User/02.GDPR/01.Nextcloud/News/en/export.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/en/export.gif rename to pages/02.User/02.GDPR/01.Nextcloud/News/en/export.gif diff --git a/pages/01.basics/GDPR/Nextcloud/News/en/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/News/en/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/en/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/News/en/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/News/es/export.gif b/pages/02.User/02.GDPR/01.Nextcloud/News/es/export.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/es/export.gif rename to pages/02.User/02.GDPR/01.Nextcloud/News/es/export.gif diff --git a/pages/01.basics/GDPR/Nextcloud/News/es/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/News/es/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/es/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/News/es/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/News/pt/export.gif b/pages/02.User/02.GDPR/01.Nextcloud/News/pt/export.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/pt/export.gif rename to pages/02.User/02.GDPR/01.Nextcloud/News/pt/export.gif diff --git a/pages/01.basics/GDPR/Nextcloud/News/pt/select_app.gif b/pages/02.User/02.GDPR/01.Nextcloud/News/pt/select_app.gif similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/News/pt/select_app.gif rename to pages/02.User/02.GDPR/01.Nextcloud/News/pt/select_app.gif diff --git a/pages/01.basics/GDPR/Nextcloud/docs.en.md b/pages/02.User/02.GDPR/01.Nextcloud/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Nextcloud/docs.en.md rename to pages/02.User/02.GDPR/01.Nextcloud/docs.en.md diff --git a/pages/01.basics/GDPR/Diaspora/docs.en.md b/pages/02.User/02.GDPR/02.Diaspora/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Diaspora/docs.en.md rename to pages/02.User/02.GDPR/02.Diaspora/docs.en.md diff --git a/pages/01.basics/GDPR/Diaspora/docs.es.md b/pages/02.User/02.GDPR/02.Diaspora/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Diaspora/docs.es.md rename to pages/02.User/02.GDPR/02.Diaspora/docs.es.md diff --git a/pages/01.basics/GDPR/Diaspora/docs.pt.md b/pages/02.User/02.GDPR/02.Diaspora/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Diaspora/docs.pt.md rename to pages/02.User/02.GDPR/02.Diaspora/docs.pt.md diff --git a/pages/01.basics/GDPR/Diaspora/en/data-download.png b/pages/02.User/02.GDPR/02.Diaspora/en/data-download.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/en/data-download.png rename to pages/02.User/02.GDPR/02.Diaspora/en/data-download.png diff --git a/pages/01.basics/GDPR/Diaspora/en/request.gif b/pages/02.User/02.GDPR/02.Diaspora/en/request.gif similarity index 100% rename from pages/01.basics/GDPR/Diaspora/en/request.gif rename to pages/02.User/02.GDPR/02.Diaspora/en/request.gif diff --git a/pages/01.basics/GDPR/Diaspora/en/settings.gif b/pages/02.User/02.GDPR/02.Diaspora/en/settings.gif similarity index 100% rename from pages/01.basics/GDPR/Diaspora/en/settings.gif rename to pages/02.User/02.GDPR/02.Diaspora/en/settings.gif diff --git a/pages/01.basics/GDPR/Diaspora/en/wait-request.png b/pages/02.User/02.GDPR/02.Diaspora/en/wait-request.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/en/wait-request.png rename to pages/02.User/02.GDPR/02.Diaspora/en/wait-request.png diff --git a/pages/01.basics/GDPR/Diaspora/es/data-download.png b/pages/02.User/02.GDPR/02.Diaspora/es/data-download.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/es/data-download.png rename to pages/02.User/02.GDPR/02.Diaspora/es/data-download.png diff --git a/pages/01.basics/GDPR/Diaspora/es/request.png b/pages/02.User/02.GDPR/02.Diaspora/es/request.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/es/request.png rename to pages/02.User/02.GDPR/02.Diaspora/es/request.png diff --git a/pages/01.basics/GDPR/Diaspora/es/settings.gif b/pages/02.User/02.GDPR/02.Diaspora/es/settings.gif similarity index 100% rename from pages/01.basics/GDPR/Diaspora/es/settings.gif rename to pages/02.User/02.GDPR/02.Diaspora/es/settings.gif diff --git a/pages/01.basics/GDPR/Diaspora/es/wait-request.png b/pages/02.User/02.GDPR/02.Diaspora/es/wait-request.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/es/wait-request.png rename to pages/02.User/02.GDPR/02.Diaspora/es/wait-request.png diff --git a/pages/01.basics/GDPR/Diaspora/pt/data-download.png b/pages/02.User/02.GDPR/02.Diaspora/pt/data-download.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/pt/data-download.png rename to pages/02.User/02.GDPR/02.Diaspora/pt/data-download.png diff --git a/pages/01.basics/GDPR/Diaspora/pt/request.gif b/pages/02.User/02.GDPR/02.Diaspora/pt/request.gif similarity index 100% rename from pages/01.basics/GDPR/Diaspora/pt/request.gif rename to pages/02.User/02.GDPR/02.Diaspora/pt/request.gif diff --git a/pages/01.basics/GDPR/Diaspora/pt/settings.gif b/pages/02.User/02.GDPR/02.Diaspora/pt/settings.gif similarity index 100% rename from pages/01.basics/GDPR/Diaspora/pt/settings.gif rename to pages/02.User/02.GDPR/02.Diaspora/pt/settings.gif diff --git a/pages/01.basics/GDPR/Diaspora/pt/wait-request.png b/pages/02.User/02.GDPR/02.Diaspora/pt/wait-request.png similarity index 100% rename from pages/01.basics/GDPR/Diaspora/pt/wait-request.png rename to pages/02.User/02.GDPR/02.Diaspora/pt/wait-request.png diff --git a/pages/01.basics/GDPR/Discourse/docs.en.md b/pages/02.User/02.GDPR/03.Discourse/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Discourse/docs.en.md rename to pages/02.User/02.GDPR/03.Discourse/docs.en.md diff --git a/pages/01.basics/GDPR/Discourse/docs.es.md b/pages/02.User/02.GDPR/03.Discourse/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Discourse/docs.es.md rename to pages/02.User/02.GDPR/03.Discourse/docs.es.md diff --git a/pages/01.basics/GDPR/Discourse/docs.pt.md b/pages/02.User/02.GDPR/03.Discourse/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Discourse/docs.pt.md rename to pages/02.User/02.GDPR/03.Discourse/docs.pt.md diff --git a/pages/01.basics/GDPR/Discourse/en/export_data_discourse_01.gif b/pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_01.gif similarity index 100% rename from pages/01.basics/GDPR/Discourse/en/export_data_discourse_01.gif rename to pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_01.gif diff --git a/pages/01.basics/GDPR/Discourse/en/export_data_discourse_01.png b/pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_01.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/en/export_data_discourse_01.png rename to pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_01.png diff --git a/pages/01.basics/GDPR/Discourse/en/export_data_discourse_02.png b/pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_02.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/en/export_data_discourse_02.png rename to pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_02.png diff --git a/pages/01.basics/GDPR/Discourse/en/export_data_discourse_03.png b/pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_03.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/en/export_data_discourse_03.png rename to pages/02.User/02.GDPR/03.Discourse/en/export_data_discourse_03.png diff --git a/pages/01.basics/GDPR/Discourse/es/export_data_discourse_01.gif b/pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_01.gif similarity index 100% rename from pages/01.basics/GDPR/Discourse/es/export_data_discourse_01.gif rename to pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_01.gif diff --git a/pages/01.basics/GDPR/Discourse/es/export_data_discourse_01.png b/pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_01.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/es/export_data_discourse_01.png rename to pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_01.png diff --git a/pages/01.basics/GDPR/Discourse/es/export_data_discourse_02.png b/pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_02.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/es/export_data_discourse_02.png rename to pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_02.png diff --git a/pages/01.basics/GDPR/Discourse/es/export_data_discourse_03.png b/pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_03.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/es/export_data_discourse_03.png rename to pages/02.User/02.GDPR/03.Discourse/es/export_data_discourse_03.png diff --git a/pages/01.basics/GDPR/Discourse/pt/export_data_discourse_01.gif b/pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.gif similarity index 100% rename from pages/01.basics/GDPR/Discourse/pt/export_data_discourse_01.gif rename to pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.gif diff --git a/pages/01.basics/GDPR/Discourse/pt/export_data_discourse_01.png b/pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/pt/export_data_discourse_01.png rename to pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_01.png diff --git a/pages/01.basics/GDPR/Discourse/pt/export_data_discourse_02.png b/pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_02.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/pt/export_data_discourse_02.png rename to pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_02.png diff --git a/pages/01.basics/GDPR/Discourse/pt/export_data_discourse_03.png b/pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_03.png similarity index 100% rename from pages/01.basics/GDPR/Discourse/pt/export_data_discourse_03.png rename to pages/02.User/02.GDPR/03.Discourse/pt/export_data_discourse_03.png diff --git a/pages/01.basics/GDPR/Taiga/docs.en.md b/pages/02.User/02.GDPR/04.Taiga/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Taiga/docs.en.md rename to pages/02.User/02.GDPR/04.Taiga/docs.en.md diff --git a/pages/01.basics/GDPR/Taiga/docs.es.md b/pages/02.User/02.GDPR/04.Taiga/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Taiga/docs.es.md rename to pages/02.User/02.GDPR/04.Taiga/docs.es.md diff --git a/pages/01.basics/GDPR/Taiga/docs.pt.md b/pages/02.User/02.GDPR/04.Taiga/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Taiga/docs.pt.md rename to pages/02.User/02.GDPR/04.Taiga/docs.pt.md diff --git a/pages/01.basics/GDPR/Taiga/en/export.png b/pages/02.User/02.GDPR/04.Taiga/en/export.png similarity index 100% rename from pages/01.basics/GDPR/Taiga/en/export.png rename to pages/02.User/02.GDPR/04.Taiga/en/export.png diff --git a/pages/01.basics/GDPR/Taiga/en/export_button.png b/pages/02.User/02.GDPR/04.Taiga/en/export_button.png similarity index 100% rename from pages/01.basics/GDPR/Taiga/en/export_button.png rename to pages/02.User/02.GDPR/04.Taiga/en/export_button.png diff --git a/pages/01.basics/GDPR/Taiga/en/settings.png b/pages/02.User/02.GDPR/04.Taiga/en/settings.png similarity index 100% rename from pages/01.basics/GDPR/Taiga/en/settings.png rename to pages/02.User/02.GDPR/04.Taiga/en/settings.png diff --git a/pages/01.basics/GDPR/Taiga/es/.gitkeep b/pages/02.User/02.GDPR/04.Taiga/es/.gitkeep similarity index 100% rename from pages/01.basics/GDPR/Taiga/es/.gitkeep rename to pages/02.User/02.GDPR/04.Taiga/es/.gitkeep diff --git a/pages/01.basics/GDPR/Taiga/es/export.gif b/pages/02.User/02.GDPR/04.Taiga/es/export.gif similarity index 100% rename from pages/01.basics/GDPR/Taiga/es/export.gif rename to pages/02.User/02.GDPR/04.Taiga/es/export.gif diff --git a/pages/01.basics/GDPR/Taiga/es/export_button.png b/pages/02.User/02.GDPR/04.Taiga/es/export_button.png similarity index 100% rename from pages/01.basics/GDPR/Taiga/es/export_button.png rename to pages/02.User/02.GDPR/04.Taiga/es/export_button.png diff --git a/pages/01.basics/GDPR/Taiga/es/settings.gif b/pages/02.User/02.GDPR/04.Taiga/es/settings.gif similarity index 100% rename from pages/01.basics/GDPR/Taiga/es/settings.gif rename to pages/02.User/02.GDPR/04.Taiga/es/settings.gif diff --git a/pages/01.basics/GDPR/Taiga/pt/export_button.png b/pages/02.User/02.GDPR/04.Taiga/pt/export_button.png similarity index 100% rename from pages/01.basics/GDPR/Taiga/pt/export_button.png rename to pages/02.User/02.GDPR/04.Taiga/pt/export_button.png diff --git a/pages/01.basics/GDPR/Taiga/pt/export_taiga1.gif b/pages/02.User/02.GDPR/04.Taiga/pt/export_taiga1.gif similarity index 100% rename from pages/01.basics/GDPR/Taiga/pt/export_taiga1.gif rename to pages/02.User/02.GDPR/04.Taiga/pt/export_taiga1.gif diff --git a/pages/01.basics/GDPR/Taiga/pt/export_taiga2.gif b/pages/02.User/02.GDPR/04.Taiga/pt/export_taiga2.gif similarity index 100% rename from pages/01.basics/GDPR/Taiga/pt/export_taiga2.gif rename to pages/02.User/02.GDPR/04.Taiga/pt/export_taiga2.gif diff --git a/pages/01.basics/GDPR/Hubzilla/docs.en.md b/pages/02.User/02.GDPR/05.Hubzilla/docs.en.md similarity index 100% rename from pages/01.basics/GDPR/Hubzilla/docs.en.md rename to pages/02.User/02.GDPR/05.Hubzilla/docs.en.md diff --git a/pages/01.basics/GDPR/Hubzilla/docs.es.md b/pages/02.User/02.GDPR/05.Hubzilla/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/Hubzilla/docs.es.md rename to pages/02.User/02.GDPR/05.Hubzilla/docs.es.md diff --git a/pages/01.basics/GDPR/Hubzilla/docs.pt.md b/pages/02.User/02.GDPR/05.Hubzilla/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/Hubzilla/docs.pt.md rename to pages/02.User/02.GDPR/05.Hubzilla/docs.pt.md diff --git a/pages/02.User/02.GDPR/docs.en.md b/pages/02.User/02.GDPR/docs.en.md new file mode 100755 index 00000000..f245956c --- /dev/null +++ b/pages/02.User/02.GDPR/docs.en.md @@ -0,0 +1,27 @@ +--- +title: 'GDPR Compliance' +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: false + +--- +# How2 Self-export your personal data + +At Disroot pretty much all data is the one you provide when using services (we store your files because you choose to store files on our cloud). We have no interest in acquiring and collecting any extra data nor we process it to sell to advertisement companies or in any way use to monetize on it. Therefor most of the services provide you with a way to self export your data. This chapter will cover tutorials that will help you get all the data stored on services provided by Disroot and connected to your account. + +## Table of contents +- [Nextcloud](Nextcloud) + - [Nextcloud - Files](Nextcloud/Files) + - [Nextcloud - Contacts](Nextcloud/Contacts) + - [Nextcloud - Calendars](Nextcloud/Calendar) + - [Nextcloud - News](Nextcloud/News) + - [Nextcloud - Bookmarks](Nextcloud/Bookmarks) + - [Nextcloud - Notes](Nextcloud/Files) +- [Diaspora](Diaspora) +- [Forum / Discourse](Discourse) +- [Board / Taiga](Taiga) +- [Hubzilla](Hubzilla) diff --git a/pages/01.basics/GDPR/docs.es.md b/pages/02.User/02.GDPR/docs.es.md similarity index 100% rename from pages/01.basics/GDPR/docs.es.md rename to pages/02.User/02.GDPR/docs.es.md diff --git a/pages/01.basics/GDPR/docs.pt.md b/pages/02.User/02.GDPR/docs.pt.md similarity index 100% rename from pages/01.basics/GDPR/docs.pt.md rename to pages/02.User/02.GDPR/docs.pt.md diff --git a/pages/02.User/docs.en.md b/pages/02.User/docs.en.md new file mode 100644 index 00000000..d7cc6f95 --- /dev/null +++ b/pages/02.User/docs.en.md @@ -0,0 +1,15 @@ +--- +title: User +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +# Account & Password Management + + +|**Account Administration**|**Personal Data**| +|:--:|:--:| +|01.[Change your password](/user/account_password/password-change/)
02.[Request email Alias](/user/account_password/alias-request)
03.[Delete your Account](/user/account_password/account-deletion)|[Export your personal data](gdpr)
(GDPR Compliance) diff --git a/pages/02.nextcloud/01.introduction/docs.en.md b/pages/02.nextcloud/01.introduction/docs.en.md deleted file mode 100755 index 0acdbed1..00000000 --- a/pages/02.nextcloud/01.introduction/docs.en.md +++ /dev/null @@ -1,174 +0,0 @@ ---- -title: 'User Interface basics' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: true ---- - -Nextcloud is disroot's core service and the main user interface we try to integrate with most of the apps we offer. In this little howto we would like to go through the basics of the interface explaining the main UI (User interface) concept, as well as some basic actions on files and personal settings. -
-
-
-![](en/main1.png) - ----------- - -# General UI - -The user experience across the entire cloud webapp is consistent and straight forward. - -For the purpose of this howto we will name some of the blocks of the interface to help identify them later on: - - - **Top bar** - is the bar on top with links to all the apps, your personal settings, currently launched and notifications. - - **Left side-bar** - is where you can find Options, Filters, Settings etc. - - **Main window** - the main application window - - **Right side-bar** - pop-up screen that opens when certain actions are triggered (file information, advanced calendar event creation, etc) - -To navigate to different apps, you simply click an icon on the topbar. - - ----------- - -# Personal Settings -Lets start from looking at what can you setup and customize on your cloud account. Click on your avatar in top right corner and choose **"Personal"** settings (if you did not set avatar yet it's the 'gear' icon in top right cornet of the topbar). - -![](en/main_personal.gif) - -The settings are divided into sections. You can use quick links on the *left-sidebar* to get to them easily. - -## Personal Info -Personal Info is the place where you can add various information about yourself, which then you can choose to share with others. You can additionally choose the access level you want this information to be "shared". - -![](en/personal_info1.gif) - -And so: - - - **Private** - You are the only person that can see this information - - **Local** - means this information will be view able by other disroot accounts (only if they know your username) - - **Contacts** - means pretty much the same as Local but with the addition to have this information shared when sharing data with users on other nextcloud instances - - **Public** - means the data will be sent to global address book (it can be viewed by anyone) - -You should pay extra attention when filling up this information *(which is optional)* and decide how much information about yourself you want to reveal to the world - -### Groups and language -Below you can see to which **groups** you belong to (if any). By default disroot accounts are not associated with any group. -You you can also change your preferred language. - -## Security -Security is the place where you can review, set (additional) and revoke security settings. - -### Devices & sessions -Here you can see how many devices are currently connected to your account. If you see devices connected to your account that shouldn't be listed, it might mean your account has been compromised and you should proceed to change your password. *(Keep in mind every browser, mobile, computer etc. will be shown as separate device each time you change your network for example, so do not freak out at first, and really double check everything, before you go full on paranoid mode)*. - -#### App passwords -When you have two-factor enabled, third party applications like your email, notes or news clients will not be able to login anymore with just your user credentials. For these devices you can create a specific password for that app. - -### Two-factor authentication -Two-factor authentication can be used if you want have a more secure login (https://en.wikipedia.org/wiki/Multi-factor_authentication). When enabled, you will be asked not only for your login name and password, but also for an extra authentication like a one-time-password (OTP) or verification via a hardware device. Disroot offers two types of two-factor authentication: TOTP (Time-based One-Time-Password) and U2F (Universal 2nd factor). - -![](en/TOTP_authentication.png) - -TOTP is like Google Authenticator. This is an app you can run on your phone and will generate a time based password. You can also use open source authenticators like "andOTP" located on F-droid. - -U2F uses a hardware device like a USB dongle by Yubico. You plug the device into your laptop and press the device button to authorize. After adding the browser will communicated with the U2F device to authorize you to log in. - -You can add as many devices as you like. It is recommended to give each device a distinct name. Chrome is the only browser that supports U2F devices by default. You need to install the "U2F Support Add-on" on Firefox to use U2F. - -### Two-factor backup codes -It is very advisable to download backup codes when you have enabled two-factor. If, for some reason, your OTP app does not work (you lost your phone!), you still want to be able to login. You keep these backup codes in a safe place (not your phone!) and each code allows you to login once. Once you are in you can reconfigure you OTP or disable two-factor. - -### Basic encryption module -Here you can decide whether or not an administrator will be able to recover your files in case you loose your password. This option is disabled by default as it enables admins of disroot to decrypt and view your files. **Enabling this option after your password was lost will not recover your files!** You need to make this decision beforehand. **We strongly encourage you to never loose your password in the first place and keep it stored safe.** This is the best way to keep your files and your account safe. We really don't want to have access to it. - -![](en/personal_encryption1.png) - -## Activity -In activity section you can decide how you want to be informed about events going on on your cloud. You can choose between getting mail notification and / or being notified in the Activity stream, or even choose not to get notified at all. You can decide to have your email notifications sent to you on: **Hourly**, **Daily** or **weekly** basis. - -![](en/personal_activity.png) - -## Sharing - -### Federated cloud -What is federated cloud? Just like emails that can be send between users on different servers (gmail, riseup, disroot etc) also nextcloud gives you opportunity to share files, contacts, calendars etc. with people outside of disroot that also use similar cloud solution (owncloud and / or nextcloud). This gives the freedom to the users to use platform of their choice while being able to collaborate with each other. In this section you can see your federation ID. You can share it with others by just sending a link or via predefined platforms (to which you can add your preferred ones that are not included of course). - -![](en/personal_federated.png) - -## Spreed video calls -Unless you have access to your personal TURN Server, you should **leave this fields blank**. This option is for setting up a service that helps determine you IP address when you are using "calls" app for audio/video conferencing in disroot. By default all disroot accounts are using disroot's TURN Server. - - ----------- - - -# FILES - - -The main task of the cloud is managing files. You can easily upload, download, share and comment. - -The *left-sidebar* let's you filter files based on certain criteria. *Main window* is your file-browser. You should be familiar with it if you ever used computer before :P. - -![](en/main_files.png) - -## Create new file or directories -To create new file, just click on **"+"** button and choose the type of file from the list. You can create directories as well as text files and pads. - -![](en/main_filles_add.gif) - -## Upload files -There are two ways to upload files. -You can either do that by simply dragging files form your "computer" (file browser) onto the cloud webbrowser window. -The other way is to use **"+"** icon and select "**Upload a file**" option. - -![](en/main_files_upload.png) - -## File Sharing -Sharing files and directories is an essential part of any cloud storage service. You you can choose to share files with other disroot users, your entire group, but also with other users using owncloud/nextcloud on different platforms. You can also share with anyone out there via the public link option. - -To share a file or directory just click "*share icon*" right next to the name of the item you wish to share. A right-bar popup will show up with all the sharing options for you to choose from. - -![](en/main_files_sharing_menu.png) - -You can decide to share with other users, groups, or users on different cloud server using the federation address, by typing their entire username (**we do not provide autocompletion for privacy reasons**). When sharing with other users or groups you can decide if the users have right to edit/modify content of the share (delete files, upload, edit), and if they can re-share it further to other users. - -![](en/main_files_sharing_menu2.png) - -On top of sharing with other users, you can share your data with anyone using "Share link" that you can copy/paste to anyone you want. Anyone who knows the address (url) will be able to access the files. The person does not need to have valid account. Share link gives you extra option to protect your share with password and expiry date. - -![](en/main_files_sharing_menu_publink.png) - -## Comments, Activities, Version -As you noticed when setting up sharing, there is more options in the right-sidebar. - -![](en/main_files_comments1.png) - - - **Activities** - gives you an overview of all events with the file. The time it was created, when it was shared, edited, commented on etc. - - **Comments** - are very useful when working on the file with other users. Everyone you share the file with can read and add comments. - - **Versions** - lets you view all changes done to the file. You can download previous revisions of the file as well as restore to previous revision (deleting all changes done after). - -## Other file operations -Clicking **"Three dot"** icon next to the filename or directory gives you extra options. Those options are self explanatory. You can "Rename", "Move", "Download" or delete the file or directory. - -![](en/main_files_other_menu.png) - - ----------- - -#Activities -![](en/main_activities_icon.png) - -When your account is getting busy, you start collaborating with many other users and groups, you might find **"Activities"** app very useful. Here you have the general overview on all the events happening within your cloud account (file changes, comments, shares, contacts, todos, calendars etc). - -![](en/main_activities_main.png) - -Main window gives you a timeline with all events, and left-sidebar let's you filter the information based on criteria. - -Additionally you can create RSS feed of your activities (Press "settings button" in the bottom left-sidebar), which you can follow using your favorite rss reader, share it with someone or integrate it in your application or website (add the feed to your matrix room for example). -![](en/main_activities_rss.png) - - ----------- diff --git a/pages/02.nextcloud/01.introduction/en/main1.png b/pages/02.nextcloud/01.introduction/en/main1.png deleted file mode 100755 index aee1a608..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main1.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_activities_main.png b/pages/02.nextcloud/01.introduction/en/main_activities_main.png deleted file mode 100755 index 0d232529..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_activities_main.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_activities_rss.png b/pages/02.nextcloud/01.introduction/en/main_activities_rss.png deleted file mode 100755 index a3e9f2b7..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_activities_rss.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files_comments1.png b/pages/02.nextcloud/01.introduction/en/main_files_comments1.png deleted file mode 100755 index 312e2480..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_files_comments1.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files_other_menu.png b/pages/02.nextcloud/01.introduction/en/main_files_other_menu.png deleted file mode 100755 index 5ba2542b..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_files_other_menu.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu.png b/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu.png deleted file mode 100755 index 1a5eecc2..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu2.png b/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu2.png deleted file mode 100755 index 3fad497a..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu2.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu_publink.png b/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu_publink.png deleted file mode 100755 index 545ea2a4..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_files_sharing_menu_publink.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files_upload.png b/pages/02.nextcloud/01.introduction/en/main_files_upload.png deleted file mode 100755 index 6072c36f..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_files_upload.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/main_filles_add.gif b/pages/02.nextcloud/01.introduction/en/main_filles_add.gif deleted file mode 100755 index 10dac2a9..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/main_filles_add.gif and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/personal_activity.png b/pages/02.nextcloud/01.introduction/en/personal_activity.png deleted file mode 100755 index 06ae805a..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/personal_activity.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/personal_encryption1.png b/pages/02.nextcloud/01.introduction/en/personal_encryption1.png deleted file mode 100755 index 34e2f225..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/personal_encryption1.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/en/personal_info1.gif b/pages/02.nextcloud/01.introduction/en/personal_info1.gif deleted file mode 100755 index a3634043..00000000 Binary files a/pages/02.nextcloud/01.introduction/en/personal_info1.gif and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_share_icon.png b/pages/02.nextcloud/01.introduction/pt/main_files_share_icon.png deleted file mode 100755 index 30fe5c06..00000000 Binary files a/pages/02.nextcloud/01.introduction/pt/main_files_share_icon.png and /dev/null differ diff --git a/pages/02.nextcloud/01.introduction/pt/main_personal.gif b/pages/02.nextcloud/01.introduction/pt/main_personal.gif deleted file mode 100755 index 7dd2e55d..00000000 Binary files a/pages/02.nextcloud/01.introduction/pt/main_personal.gif and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/Calendar/docs.en.md b/pages/02.nextcloud/02.Apps/Calendar/docs.en.md deleted file mode 100755 index 6065d3ca..00000000 --- a/pages/02.nextcloud/02.Apps/Calendar/docs.en.md +++ /dev/null @@ -1,138 +0,0 @@ ---- -title: 'Calendar App' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: true ---- - ------------- -# Using Calendar app - -You can access your calendar app by pressing the ![](en/calendar_top_icon.png) icon in the top bar. -*Left-bar* in the calendar window gives you an overview of your calendars, their options and general settings. - -![](en/calendar_main.png) - --------------- -## Create Calendar -To create a new calendar in this options panel press "*create calendar*" -A small prompt will appear where you can type the name you want to give to this new calendar and select a color for it. -Then press "*create*". - -![](en/calendar_add_new.png) - -You can create multiple calendars for different purposes (work, activism, etc.) by repeating this process. If you do that, you can use different colors to set them apart (last icon is the color picker which allows you to choose any color you want![](en/calendar_colorpick_icon.png)). - -![](en/calendar_list.png) - ------------------------ -## Delete, edit, Download calendar. -On the left panel, you will see your calendars listed. To the right of each calendar you will find a "more" button where you can: - -- rename your calendar, -- download it -- get a url link to sync it with other devices -- delete your calendar. - -![](en/calendar_edit1.png) - -------------------------- -## Create an event -You can create a new event in your calendar by clicking in the calendars *main window* simply on the day of the event. A panel will appear on the right side, where you can fill with the information of the event. - -![](en/calendar_edit_menu.png) - -In this panel you can specify: - - - event title - - start and end date - - start and end time - - if it's full day event or not - - event location - - event description - -![](en/calendar_edit_menu2.png) - -If you have multiple calendars, in your disroot calendar app, you need to select to which calendar the event goes to. You can do that below the event title field. - -![](en/calendar_edit_menu3.png) - -You can set a reminder for the event by pressing "Reminders" and "Add" - -![](en/calendar_edit_menu4.png) - -You can select what type of reminder you want: - -* audio -* email -* pop up - -And set the time for it. - -Just press the reminder you added and the options will show up. - -![](en/calendar_edit_menu5.png) - -You can also set if this is a repeating event or not. Just check *repeating* options. - -![](en/calendar_edit_menu6.png) - -------------------------------- -## Invite people to events - -You can also invite people to your event via email by: - -* pressing "Attendees" -* Filing the field with the persons email address -* press enter - -![](en/calendar_edit_menu7.png) - -The people you invite will receive an automaticly generated email with the invitation. Any changes you make to the event will be automatically sent by email to the person you've added. - -When you're done with everything, just press create at the end of the panel, and your event will appear on the screen - ----------------------------- -## Edit or delete events -To edit or delete an event you've created, just click the event on your screen, edit it and then press "update". -To delete it, you will find the big red button. - -![](en/calendar_edit_menu8.png) - ----------------------------- -## Share calendars -You can share your calendars, either with another disroot user, via email, or public link. - -To share with another Disroot user: - -* press the the share button on the right of your calendar name -* type the username of the Disroot user that you want to share the calender with -* press enter. - -![](en/calendar_share_menu1.png) - -To share calendars via email or public link: - -* go to the same "shared" option -* select "Share link" -* fill the email address field with the email of the person you want to share your calendar with -* press enter -* to just get the link press the chain symbol next to the mail envelope symbol - -![](en/calendar_share_menu2.png) - ------------------------------- -## Import calendars -If you have a ICS file with a calendar to import, go to disroot calendar app then go to "Settings & Import" on the lower left corner of the screen. - -![](en/calendar_import_menu1.png) - -And select import calendar option. - -![](en/calendar_import_menu2.png) - ----------------------------------------- diff --git a/pages/02.nextcloud/02.Apps/Contacts/docs.en.md b/pages/02.nextcloud/02.Apps/Contacts/docs.en.md deleted file mode 100755 index 6d6b45d6..00000000 --- a/pages/02.nextcloud/02.Apps/Contacts/docs.en.md +++ /dev/null @@ -1,85 +0,0 @@ ---- -title: 'Contacts App' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: true ---- - -# Contacts -You can access the contacts app by by pressing the contacts icon ![](en/contacts_top_icon.png?resize=20,20) on the top bar, in nexcloud. - ----------------------- -## Create a contact - -In the contacts app select "*New contact*" - -![](en/contacts_add1.png) - -You will prompted with a form on the "*right-bar*" side to create the new contact. - -![](en/contacts_add2.png) - -Just type the information you want/have in the fields. If you need, you can just add more fields at the bottom of the form. - -![](en/contacts_add3.png) - ------------------------ -## Delete a contact - -* select the contact -* in the contact form header, select the delete icon - -![](en/contacts_delete.png) - ------------------------ -## Create contact groups -You can create groups to organize your contacts ex: faculty, work, collective, etc. -In the field group you can assign a new contact to an existing group or create a new group. Or assign a contact to multiple groups by typing the several groups. - -![](en/contacts_groups1.png) - -On the left side of the screen in your contacts app, you will see the existing groups. -Selecting them will present all contacts in that respective group. - -![](en/contacts_groups2.png) - ------------------------- -## Share address books - -Go to "settings" on the lower left corner of the screen in the contacts app. - -![](en/contacts_share1.png) - -In settings you can share your address book with other Disroot users by: -selecting share address book -writing the username of the disroot user you want to share the address book with. - -![](en/contacts_share2.png) - -You can also use a link to share your address book via webDAV, to other contact books (thunderbird, mobile, etc,). - -![](en/contacts_share3.png) - -------------------------- -## Import address books - -You can import address books or individual contacts, if you have a vcf file of the contact or the address book. - -* selecting "import". - -![](en/contacts_import1.png) - -Then select the file you want to import, and press ok. - ------------------------------ -## Create a new address book - -Inside settings in the field "Address book name" write the name of the new address book, then press enter. - -![](en/contacts_create1.png) - ------------------------------ diff --git a/pages/02.nextcloud/02.Apps/News/docs.en.md b/pages/02.nextcloud/02.Apps/News/docs.en.md deleted file mode 100755 index 0924977c..00000000 --- a/pages/02.nextcloud/02.Apps/News/docs.en.md +++ /dev/null @@ -1,33 +0,0 @@ ---- -title: 'News App' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: true ---- - -News app is pretty handy tool to keep track of the new articles and posts of all the websites you like to follow in one place. Disroot cloud provides great and simple to use app that does the job for you and syncs it to all your devices. In this tutorial we'll try to cover the basic usage, if you are interested in integrating it with your devices choose your prefered operating system in [this](https://howto.disroot.org/nextcloud/sync-with-your-cloud) section. - - ----------- -# News App on Disroot - -To get into the app from web browser, just click news app icon ![](en/news_top_icon.png?resize=20,20) in the top bar. General idea behind the app is very simple. You add RSS-feed of your favorite sites, get notification on new articles, and read then without the need to go to all those websites, by opening lots of tabs and get distracted half way. - -So let's get things rolling: - -## Add new feeds -Most of the websites provide [RSS](https://en.wikipedia.org/wiki/RSS) or Atom feeds. Once you have the RSS link ready, you can copy it and add it to your news app. -To add the feed simply click on the **"+ Subscribe"** button and fill in the URL of the feed you previously copied. - -![](en/news_add1.png) - -For better overview and sorting you can create folders and assign feeds to them. To create new folder hit **"+ New Folder"** button on the left-side bar. Now you can "drag and drop" feeds you wish to add to folders. - -## Feed options -Every feed can be optimized to your needs. Clicking on **"Three dot"** icon: - -![](en/news_options.png) diff --git a/pages/02.nextcloud/02.Apps/Pads/docs.en.md b/pages/02.nextcloud/02.Apps/Pads/docs.en.md deleted file mode 100755 index f069b262..00000000 --- a/pages/02.nextcloud/02.Apps/Pads/docs.en.md +++ /dev/null @@ -1,41 +0,0 @@ ---- -title: 'Pads' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: true ---- - -Etherpad and Ethercalc are collaborative applications for multi-user real-time document edition. You can reach them directly from your browser at: https://pad.disroot.org and https://calc.disroot.org. No user account is needed to make use of them. However our cloud comes with very handy plugin that helps you keep track of all your pads, just as if they are one of your files. - -**Note!** "Pads" and "calcs" aren't files containing your data but are links to your work stored on either https://pad.disroot.org or https://calc.disroot.org. - -# Idea behind pads -The idea behind this software is very simple. It's a text/spreadsheet editor that lives in the web. Everything you type in gets written to your pad automatically. You can work on a document with multiple people at the same time without a need to save and pass copies of the documents to each other. Once your work is done, you can export the pad to a format of your choice. To read more of the general guide through the interface you can check this page ( page under construction). - -# Usage -Below you can read how to make use of ownpad - a plugin for disroot cloud instance. - -# Creating new pads -Creating new pad works the same as creating new file. Click on "+" icon and choose to create either pad (text editor) or calc (spreadsheet). Once you give it a name a new file with .pad/.calc extension will be created. You can move, share that file just like any other file you have on your cloud account. - -![](en/pads_add.gif) - -# Opening new pad -To open the newly created pad, just click on it's name. The application will open up your pad using pad.disroot.org/calc.disroot.org within the cloud interface. You can now easily work on your document and once you're done, use the red icon on your right to close it. All changes are written the moment you start typing so there is no need to save the file before hand. Since the file lives in the web, you can come back to it any time you want. - -![](en/pads_inapp_name.gif) - -# Sharing - -Sharing pads with other disroot users is the same as sharing normal files. Click on "sharing" icon and select with whom you want to share the file with. Note: Using public link will not work as easy since these are not normal files. - -![](en/pads_inapp_name2.gif) - -In order to share with someone outside disroot cloud, you should share the actual link to the pad. You can do it by opening your pad in the browser and hovering above it's name. You will see the actual link to the pad, which you can then copy and send it to anyone you wish to share the pad with. - -# Deleting pads -It is impossible to delete pads. Once created they stay online. In fact anyone who could guess the url could look it up. That's why disroot cloud's plugin creates links to your pads using random strings instead of the name you specify when creating the file. In that way the links to the pads are impossible to guess making them safe from anyone but you and users you share the pads with. diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/docs.en.md b/pages/02.nextcloud/02.Apps/Spreed-calls/docs.en.md deleted file mode 100755 index 154fff47..00000000 --- a/pages/02.nextcloud/02.Apps/Spreed-calls/docs.en.md +++ /dev/null @@ -1,44 +0,0 @@ ---- -title: 'Calling with Spreed' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -Since January 2017 we've introduced spreed calls to our cloud. It's very simple audio/video conference app you can use to communicate not only with other disroot users but with anyone who has a computer connected to the internet and up to date web browser supporting WebRTC technology. - -![](en/spreed_main.png) - - -The interface of the application is very simple. The left side bar shows you the list of rooms you have created. - - -On the bottom right of the window you will see your avatar and few options where you can: - -![](en/spreed_bottom.png) - - - mute/un-mute your microphone - - switch on/off your camera - - switch on/off fullscreen mode - -That's pretty much it. You should be ready to start your new call - -#Creating Calls -To start calling, you need to create a room. Click on **"Choose person"** to do so. In the popup window you have an option to invite existing disroot account, or create public room. -You will see there is a new room listed on the left sidebar. -When clicking on the options button of the room, you can either: - - invite more people - - create/delete public link - - leave the call/room - -![](en/spreed_create_calls1.png) - -There is no real difference between disroot user rooms and public rooms as in both cases you can either invite disroot users or create/remove public link rooms. - -Once you initiate the call by pressing on the room's name, a notification will be sent to invited disroot user or (in case of public room instance) you will have to wait for at least one other participant to join in. - -Once they join, you can start having your video call. diff --git a/pages/02.nextcloud/02.Apps/Webmail/docs.en.md b/pages/02.nextcloud/02.Apps/Webmail/docs.en.md deleted file mode 100755 index b37bb5b5..00000000 --- a/pages/02.nextcloud/02.Apps/Webmail/docs.en.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: 'Webmail' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: false ---- -# Syncing cloud contacts with webmail -Syncing cloud contacts with Webmail is very easy. It will permit contacts from your webmail and cloud to be in sync. - -First go to your Nexcloud contacts app. Click on the settings icon in the lower left corner. -Select "Show URL" option of the addressbook you would like to sync with webmail, and copy the given link. - -![](en/webmail_import_contacts1.png) - - -Now go to Webmail app, and click on the settings icon (top right in the webmail app) - -![](en/webmail_import_contacts2.png) - -In your settings, on the left side bar select: **Contacts** -When in the contacts menu: - -1. Select Enable remote synchronization -2. In Addressbook URL, place the URL from your Nexcloud contacts addressbook you have saved before. -3. Provide your username -4. Add your password - -![](en/webmail_import_contacts3.png) - -And then refresh both pages. Now your contacts will stay in sync. diff --git a/pages/02.nextcloud/02.Apps/Webmail/docs.es.md b/pages/02.nextcloud/02.Apps/Webmail/docs.es.md deleted file mode 100755 index 9cc0c26b..00000000 --- a/pages/02.nextcloud/02.Apps/Webmail/docs.es.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: 'Webmail' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: false ---- -# Sincronizando los contactos en la nube con el webmail -Sincronizar los contactos en la nube con el webmail es muy sencillo y te permitirá tener ambas libretas actualizadas simultáneamente. - -Primero, ve a tu aplicación de contactos de Nextcloud. Haz click en el ícono de configuraciones en la esquina inferior izquierda. -Selecciona la opción "Mostrar URL" de la libreta de direcciones que te gustaría sincronizar con el webmail, y copia el link. - -![](en/webmail_import_contacts1.png) - - -Ahora, ve a la aplicación de Webmail, y haz click en el ícono de configuraciones (arriba a la derecha en la aplicación). - -![](en/webmail_import_contacts2.png) - -En tus configuraciones, en la barra lateral izquierda, selecciona: **Contactos** -Una vez dentro del menú de contactos: - -1. Selecciona Habilitar sincronización remota -2. En URL de la Libreta de direcciones, pega la URL de tu libreta de contactos de Nextcloud que habías copiado anteriormente. -3. Introduce tu nombre de usuario -4. Agrega tu contraseña - -![](en/webmail_import_contacts3.png) - -Y luego actualiza ambas páginas. Ahora tus contactos permanecerán sincronizados. diff --git a/pages/02.nextcloud/02.Apps/Webmail/docs.fr.md b/pages/02.nextcloud/02.Apps/Webmail/docs.fr.md deleted file mode 100755 index 9e4c0f75..00000000 --- a/pages/02.nextcloud/02.Apps/Webmail/docs.fr.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -title: 'Webmail' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: false ---- -# Synchroniser des contacts cloud avec le webmail -Il est très facile de synchroniser les contacts cloud avec Webmail. Il permettra aux contacts de votre webmail et de votre cloud d'être synchronisés. - -Allez d'abord dans votre application Nexcloud Contacts. Cliquez sur l'icône des paramètres dans le coin inférieur gauche. -Sélectionnez l'option "Afficher URL" du carnet d'adresses que vous souhaitez synchroniser avec le webmail, et copiez le lien donné. - -![](en/webmail_import_contacts1.png) - - -Maintenant allez dans l'application Webmail, et cliquez sur l'icône de paramétrage (en haut à droite dans l'application webmail) - -![](en/webmail_import_contacts2.png) - -Dans vos paramètres, dans la barre de gauche, sélectionnez: **Contacts**. -Dans le menu Contacts: - -1. Sélectionnez Activer la synchronisation à distance -2. Dans l'URL du carnet d'adresses, placez l'URL du carnet d'adresses de contacts Nexcloud que vous avez déjà enregistré. -3. Donnez votre nom d'utilisateur -4. Ajoutez votre mot de passe - -![](en/webmail_import_contacts3.png) - -Puis rafraîchissez les deux pages. Maintenant vos contacts resteront synchronisés. diff --git a/pages/02.nextcloud/02.Apps/Webmail/docs.pt.md b/pages/02.nextcloud/02.Apps/Webmail/docs.pt.md deleted file mode 100755 index 072836f6..00000000 --- a/pages/02.nextcloud/02.Apps/Webmail/docs.pt.md +++ /dev/null @@ -1,35 +0,0 @@ ---- -title: 'Webmail' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: true ---- -# Sincronizar os contactos da cloud com o webmail -Sincronizar os contactos da sua cloud com o webmail é bastante fácil. Permitirá os seus contactos estarem sincronizados entre o serviço de email e a cloud. - -Primeiro vá à aplicação de contactos do Nextcloud. Carregue no botão "Definições", no canto inferior esquerdo. -Selecione "Copy Link" no livro de endereços que quer sincronizar com o seu email. - -![](pt/webmail_import_contacts1.png) - - -Agora vá à aplicação de webmail e carregue no botão definições (no canto superior direito a aplicação de webmail) - -![](pt/webmail_import_contacts2.png) - -Nas suas definições, na barra lateral esquerda selecione: **Contactos** - -Quando estiver no menu de contactos: - -1. Selecione Ativar sincronização remota -2. Em "URL do Livro de endereços" coloque o link URL do livro de endereços que copiou anteriormente do Nextcloud. -3. Adicione o seu nome de utilizador -4. Adicione a sua password - -![](pt/webmail_import_contacts3.png) - -Depois recarregue ambas as páginas. A partir de agora os seus contactos estarão sincronizados. diff --git a/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts1.png b/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts1.png deleted file mode 100755 index 07a27a5a..00000000 Binary files a/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts1.png and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts2.png b/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts2.png deleted file mode 100755 index 3ba7f678..00000000 Binary files a/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts2.png and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts3.png b/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts3.png deleted file mode 100755 index 1b059c32..00000000 Binary files a/pages/02.nextcloud/02.Apps/Webmail/en/webmail_import_contacts3.png and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts1.png b/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts1.png deleted file mode 100755 index d2b207ef..00000000 Binary files a/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts1.png and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts2.png b/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts2.png deleted file mode 100755 index f4429a9c..00000000 Binary files a/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts2.png and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts3.png b/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts3.png deleted file mode 100755 index 156c15d8..00000000 Binary files a/pages/02.nextcloud/02.Apps/Webmail/pt/webmail_import_contacts3.png and /dev/null differ diff --git a/pages/02.nextcloud/02.Apps/docs.en.md b/pages/02.nextcloud/02.Apps/docs.en.md deleted file mode 100755 index 801186d3..00000000 --- a/pages/02.nextcloud/02.Apps/docs.en.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: Nextcloud Apps -published: true -visible: true -taxonomy: - category: - - docs ---- - -In this section we are trying to cover all the apps we supply with out cloud instance. - -**Note:** -This section covers only webapps. If you are looking for ways to integrate them with your device, you should check [this section](https://howto.disroot.org/nextcloud/sync-with-your-cloud) diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/Tux.png b/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/Tux.png deleted file mode 100755 index bdc5b1d7..00000000 Binary files a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/Tux.png and /dev/null differ diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.en.md b/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.en.md deleted file mode 100755 index 3e237a3c..00000000 --- a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.en.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: 'Linux' -taxonomy: - category: - - docs -page-toc: - active: false ---- - - Nextcloud integrates with Linux greatly. Below you can find useful links that will help you get everything up and running. - - ## Table of content - - [Syncing files with desktop client](desktop-sync-client) - - [GNOME - Desktop Integration](gnome-desktop-integration) - - [KDE - Desktop Integration](kde-desktop-integration) - - [News app - Syncing with your desktop](news-app-syncing) - - ![](Tux.png) diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/docs.en.md b/pages/02.nextcloud/03.sync-with-your-cloud/docs.en.md deleted file mode 100755 index 8f6faf49..00000000 --- a/pages/02.nextcloud/03.sync-with-your-cloud/docs.en.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -title: 'Syncing to your device' -taxonomy: - category: - - docs -page-toc: - active: false ---- - -Nextcloud integrates with your device very easily, providing native experience for most devices and operating systems. -Here in disroot we are trying to include and document all of them to make it easy for anyone to get up and running. - -If you would like to help us, your contribution is more then welcome. diff --git a/pages/02.nextcloud/docs.en.md b/pages/02.nextcloud/docs.en.md deleted file mode 100755 index 67dc0d8f..00000000 --- a/pages/02.nextcloud/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Nextcloud -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/03.Cloud/01.Introduction/docs.en.md b/pages/03.Cloud/01.Introduction/docs.en.md new file mode 100755 index 00000000..ec28771a --- /dev/null +++ b/pages/03.Cloud/01.Introduction/docs.en.md @@ -0,0 +1,177 @@ +--- +title: 'Cloud: Nextcloud How2' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: true +--- +---- +# The User Interface (UI) + +|![](en/interface.png)| +|:--:| +|This is the main screen and, as you have noted, is pretty straightforward. Let’s take a closer look at it.| + +After logged in, you'll find three main sections or blocks and some functions buttons: +1. **The apps navigation bar**: here you have the cloud applications available on Disroot, such as Files and Tasks managers, Calendar, Contacts, Notes, Bookmarks and the Activity log. To learn about the apps, check [this section](/cloud/apps). +2. **The apps information section**: when interacting with the apps, related information, options and filters will appear here. +3. **The main apps view**: this sections displays the contents of a selected app. +4. **The settings menu**: by clicking on it, a dropdown menu appears and you can access to the personal and features settings. Some of this settings allows you to change or modify your profile, password, language, manage notifications and connected devices, etc. We’ll see it later on. +5. **The search field**: by clicking on the magnifier icon you can search files. +6. **The notifications**: whether it be a link/file/folder you’ve shared (or that has been shared with you), a modification on a shared file or a message, you’ll be notified by a highlighted point here. +7. **The contacts menu**: here you’ll find your contacts and users on the server. +8. **The view selector**: by clicking on it, you’ll be able to change the way the main apps view section displays your files. You can toggle from grid view to icon view and vice versa. +9. **The navigation button**: this button leads you back to the root folder (the home folder) when you navigate though your files folders. +10. **The “new” button**: it enables you to upload a file and create new folders, text files or pads. + + +---------- + +# Personal Settings +Let's start by looking at what you can setup and customize on your cloud account.
Click on your profile picture on the top right corner and choose **"Settings"** *(if you didn't set a picture yet, you'll see a round avatar with the first letter of your user name inside)*. + +![](en/settings.gif) + +The settings are divided into sections. On the *left-section* you'll find quick links to the different options. Let's see them... + +![](en/settings_window.png) + +|Personal Info| +|:--:| + +|This is the place where you can add information about yourself, which then you can choose to share with others.| +|--| +|By clicking on the "lock" icon right next to information title, you can set the privacy level you want to assign to it. By default, your profile picture, full name and email are set to be visible only to the local users and the servers you trust.| + +![](en/privacy_setting.gif) + +The levels you can choose are: + +- **Private**: You are the only person that can see this information +- **Local**: The information will be visible to other Disroot Cloud users (only if they know your username) +- **Contacts**: Besides other Disroot Cloud users, the information will be shared with users on other Nextcloud instances when you share data or files with them. +- **Public**: The information will be sent to a global address book (which means it can be viewed by anyone) + +|![](en/note.png) **NOTE**| +|:--:| +|You should pay extra attention when filling up this information *(which is optional)* and decide how much information about yourself you want to share and reveal to others.| + +## Other information and settings +Below the profile picture you can see: +- **the groups** you belong to (if any). By default, Disroot accounts are not associated with any group. +- **the quota** of storage space you're using. + +![](en/settings_window_details.png) + +Additionally, you can also change your preferred language. + +![](en/settings_window_language.png) + +----- +# Security +|Security is the place where you can review, set (additional) and revoke security settings.| +|:--:| +|![](en/security_device.png)| + +## Devices & sessions +Here you can see how many devices are currently connected to your account. If you don't recognize one connected device, it might mean your account has been compromised and you should proceed to change your password. + +|![](en/note.png) **NOTE**| +|:--:| +|Keep in mind that every browser, mobile, computer, etc., will be shown as separate devices each time you change your network, for example. So don't freak out at first. Just seriously double check everything, before you go full on paranoid mode| + +### App password +When Two-Factor Authentication is enable, third party applications (like your email, notes or news clients) won't be able to login your account with your user credentials only. For these devices you can create a specific password for the app. + +![](en/app_pass.png) + +## Two-factor authentication + +|What is Two-factor authentication (2FA)?|Is a security process that has a two steps verification: usually, the combination of two factors:
1) something you know (like a password),
2) something you have (could be a security token, a card, a QR code, etc.) or
3) something you are (like your fingerprint).
An example of how it works: when you go to an ATM to extract money you need to use your bank card (something you have) and a PIN (something you know). If the combination fails, you can't extract the money.| +|:--:|--| + +Two-factor authentication can be used if you want have a more secure login (you can read more about it [here](https://en.wikipedia.org/wiki/Multi-factor_authentication)). When enabled, you will be asked not only for your login name and password, but also for an extra authentication like a one-time-password (OTP) or verification via a hardware device.
+ +### Two-factor backup codes +It's highly advisable to download backup codes when you have enabled two-factor. If, for some reason, your OTP app doesn't work (*you lost your phone!*), you still be able to login. You should keep these backup codes in a safe place (*not your phone!*) and each code allows you to login once. Once you are in you can reconfigure you OTP or disable two-factor. + +![](en/2fa_bup.png) + +### TOTP and U2F +Disroot offers two types of two-factor authentication: + +- **TOTP (Time-based One-Time-Password)**: TOTP is like Google Authenticator. This is an app you can run on your phone and generates a time based password. Some open source authenticators are [andOTP](https://f-droid.org/en/packages/org.shadowice.flocke.andotp/) and [FreeOTP](https://f-droid.org/en/packages/org.liberty.android.freeotpplus/). + +- **U2F (Universal 2nd factor)**: U2F uses a hardware device like the [USB key by Yubico](https://en.wikipedia.org/wiki/YubiKey). You plug the device into your laptop and press the device button to authorize. After adding it, the browser will communicate with the U2F device to authorize you to log in. + +![](en/2fa.png) + +|TOTP|U2F| +|:--:|:--:| +|![](en/totp_auth.png)|![](en/u2f.png)| + +You can add as many devices as you like. It is recommended to give each device a distinct name. Chrome is the only browser that supports U2F devices by default. You need to install the "U2F Support Add-on" on Firefox to use U2F. + +### Basic encryption module +Here you can decide whether or not an administrator will be able to recover your files in case you loose your password. This option is disabled by default as it enables admins of Disroot to decrypt and view your files. + +|![](en/note.png) NOTE| +|:--:| +|**Enabling this option after your password was lost will not recover your files!** You need to make this decision beforehand. **We strongly encourage you to never loose your password in the first place and keep it stored safe.**
This is the best way to keep your files and your account safe. We really don't want to have access to it.| + +![](en/basic_encryption.png) + +---- + +# Activity +In the Activity section you can choose how do you want to be informed about what's happening on your cloud. You can get email notifications, being notified in the Activity stream or even not being notified at all. If you choose to get email notifications, you can set the frecuency from "**As soon as posible** to **Hourly**, **Daily** or **Weekly**. + +![](en/activity_window.png) + +---- +# External storages +The External Storage application allows you to mount external storage services and/or devices as secondary Nextcloud storage devices. + +![](en/external_storage.png) + +## Configuring an external storage + +### Authentication +![](en/external_storage_auth.gif) + +- **Username and password**: it requires a manually-defined username and password. These get passed directly to the backend and are specified during the setup of the mount point. + +- **Log-in credentials, save in session**: it uses your Nextcloud login credentials to connect to the storage. These are not stored anywhere on the server, but rather in the user session, giving increased security. The drawbacks are that sharing is disabled when this mechanism is in use, as Nextcloud has no access to the storage credentials, and background file scanning does not work. + +- **Log-in credentials, save in database**: as the previous method, it uses your login credentials to connect to the storage, but these are stored in the database encrypted with the shared secret. This allows to share files from within this mount point. + +- **Global credentials**: it uses the general input field for “Global credentials” in the external storage settings section as source for the credentials instead of individual credentials for a mount point. + +---- +# Mobile & desktop +Here you'll find shortcuts to the mobile and desktop Nextcloud applications. + +![](en/mobile_desktop.png) + +---- +# Accesibility +In this section you can change the default high contrast theme to the dark theme and the default cloud font to the Dyslexia font. + +![](en/accesibility.png) + +---- +# Sharing + +## Federated cloud +What is federated cloud? Just like emails that can be send between users on different servers (gmail, riseup, disroot etc) also nextcloud gives you opportunity to share files, contacts, calendars etc. with people outside of disroot that also use similar cloud solution (owncloud and / or nextcloud). This gives the freedom to the users to use platform of their choice while being able to collaborate with each other. In this section you can see your federation ID. You can share it with others by just sending a link or via predefined platforms (to which you can add your preferred ones that are not included of course). + +![](en/federated_cloud.png) + +------ +# Additional settings + + +---------- diff --git a/pages/02.nextcloud/01.introduction/docs.es.md b/pages/03.Cloud/01.Introduction/docs.es.md similarity index 100% rename from pages/02.nextcloud/01.introduction/docs.es.md rename to pages/03.Cloud/01.Introduction/docs.es.md diff --git a/pages/02.nextcloud/01.introduction/docs.fr.md b/pages/03.Cloud/01.Introduction/docs.fr.md similarity index 100% rename from pages/02.nextcloud/01.introduction/docs.fr.md rename to pages/03.Cloud/01.Introduction/docs.fr.md diff --git a/pages/02.nextcloud/01.introduction/docs.hu.md b/pages/03.Cloud/01.Introduction/docs.hu.md similarity index 100% rename from pages/02.nextcloud/01.introduction/docs.hu.md rename to pages/03.Cloud/01.Introduction/docs.hu.md diff --git a/pages/02.nextcloud/01.introduction/docs.pt.md b/pages/03.Cloud/01.Introduction/docs.pt.md similarity index 100% rename from pages/02.nextcloud/01.introduction/docs.pt.md rename to pages/03.Cloud/01.Introduction/docs.pt.md diff --git a/pages/03.Cloud/01.Introduction/en/2fa.png b/pages/03.Cloud/01.Introduction/en/2fa.png new file mode 100644 index 00000000..928cb969 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/2fa.png differ diff --git a/pages/03.Cloud/01.Introduction/en/2fa_bup.png b/pages/03.Cloud/01.Introduction/en/2fa_bup.png new file mode 100644 index 00000000..ae0a3b2e Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/2fa_bup.png differ diff --git a/pages/03.Cloud/01.Introduction/en/accesibility.png b/pages/03.Cloud/01.Introduction/en/accesibility.png new file mode 100644 index 00000000..1ce45843 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/accesibility.png differ diff --git a/pages/03.Cloud/01.Introduction/en/activity_window.png b/pages/03.Cloud/01.Introduction/en/activity_window.png new file mode 100644 index 00000000..bac976f6 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/activity_window.png differ diff --git a/pages/03.Cloud/01.Introduction/en/app_pass.png b/pages/03.Cloud/01.Introduction/en/app_pass.png new file mode 100644 index 00000000..5999115e Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/app_pass.png differ diff --git a/pages/03.Cloud/01.Introduction/en/basic_encryption.png b/pages/03.Cloud/01.Introduction/en/basic_encryption.png new file mode 100644 index 00000000..426052ae Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/basic_encryption.png differ diff --git a/pages/03.Cloud/01.Introduction/en/external_storage.png b/pages/03.Cloud/01.Introduction/en/external_storage.png new file mode 100644 index 00000000..02a070ea Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/external_storage.png differ diff --git a/pages/03.Cloud/01.Introduction/en/external_storage_auth.gif b/pages/03.Cloud/01.Introduction/en/external_storage_auth.gif new file mode 100644 index 00000000..44fd37c7 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/external_storage_auth.gif differ diff --git a/pages/03.Cloud/01.Introduction/en/federated_cloud.png b/pages/03.Cloud/01.Introduction/en/federated_cloud.png new file mode 100644 index 00000000..9ed956e8 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/federated_cloud.png differ diff --git a/pages/03.Cloud/01.Introduction/en/interface.png b/pages/03.Cloud/01.Introduction/en/interface.png new file mode 100644 index 00000000..78e26616 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/interface.png differ diff --git a/pages/02.nextcloud/01.introduction/en/main_files.png b/pages/03.Cloud/01.Introduction/en/main_files.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_files.png rename to pages/03.Cloud/01.Introduction/en/main_files.png diff --git a/pages/03.Cloud/01.Introduction/en/mobile_desktop.png b/pages/03.Cloud/01.Introduction/en/mobile_desktop.png new file mode 100644 index 00000000..5da15747 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/mobile_desktop.png differ diff --git a/pages/03.Cloud/01.Introduction/en/note.png b/pages/03.Cloud/01.Introduction/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/note.png differ diff --git a/pages/02.nextcloud/01.introduction/en/personal_federated.png b/pages/03.Cloud/01.Introduction/en/personal_federated.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/personal_federated.png rename to pages/03.Cloud/01.Introduction/en/personal_federated.png diff --git a/pages/03.Cloud/01.Introduction/en/privacy_setting.gif b/pages/03.Cloud/01.Introduction/en/privacy_setting.gif new file mode 100644 index 00000000..6eb135ec Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/privacy_setting.gif differ diff --git a/pages/03.Cloud/01.Introduction/en/security_device.png b/pages/03.Cloud/01.Introduction/en/security_device.png new file mode 100644 index 00000000..e4d73c0a Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/security_device.png differ diff --git a/pages/03.Cloud/01.Introduction/en/settings.gif b/pages/03.Cloud/01.Introduction/en/settings.gif new file mode 100644 index 00000000..629ef26f Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/settings.gif differ diff --git a/pages/03.Cloud/01.Introduction/en/settings_window.png b/pages/03.Cloud/01.Introduction/en/settings_window.png new file mode 100644 index 00000000..8beed244 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/settings_window.png differ diff --git a/pages/03.Cloud/01.Introduction/en/settings_window_details.png b/pages/03.Cloud/01.Introduction/en/settings_window_details.png new file mode 100644 index 00000000..65c7da40 Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/settings_window_details.png differ diff --git a/pages/03.Cloud/01.Introduction/en/settings_window_language.png b/pages/03.Cloud/01.Introduction/en/settings_window_language.png new file mode 100644 index 00000000..8fb7714e Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/settings_window_language.png differ diff --git a/pages/02.nextcloud/01.introduction/en/TOTP_authentication.PNG b/pages/03.Cloud/01.Introduction/en/totp_auth.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/TOTP_authentication.PNG rename to pages/03.Cloud/01.Introduction/en/totp_auth.png diff --git a/pages/03.Cloud/01.Introduction/en/u2f.png b/pages/03.Cloud/01.Introduction/en/u2f.png new file mode 100644 index 00000000..cf57762f Binary files /dev/null and b/pages/03.Cloud/01.Introduction/en/u2f.png differ diff --git a/pages/02.nextcloud/01.introduction/es/main1.jpeg b/pages/03.Cloud/01.Introduction/es/main1.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main1.jpeg rename to pages/03.Cloud/01.Introduction/es/main1.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_activities_main.jpeg b/pages/03.Cloud/01.Introduction/es/main_activities_main.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_activities_main.jpeg rename to pages/03.Cloud/01.Introduction/es/main_activities_main.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_activities_rss.jpeg b/pages/03.Cloud/01.Introduction/es/main_activities_rss.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_activities_rss.jpeg rename to pages/03.Cloud/01.Introduction/es/main_activities_rss.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files.jpeg b/pages/03.Cloud/01.Introduction/es/main_files.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files_add.gif b/pages/03.Cloud/01.Introduction/es/main_files_add.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_add.gif rename to pages/03.Cloud/01.Introduction/es/main_files_add.gif diff --git a/pages/02.nextcloud/01.introduction/es/main_files_comments1.jpeg b/pages/03.Cloud/01.Introduction/es/main_files_comments1.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_comments1.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files_comments1.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files_other_menu.jpeg b/pages/03.Cloud/01.Introduction/es/main_files_other_menu.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_other_menu.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files_other_menu.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files_sharing_menu.jpeg b/pages/03.Cloud/01.Introduction/es/main_files_sharing_menu.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_sharing_menu.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files_sharing_menu.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files_sharing_menu2.jpeg b/pages/03.Cloud/01.Introduction/es/main_files_sharing_menu2.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_sharing_menu2.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files_sharing_menu2.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files_sharing_menu_publink.jpeg b/pages/03.Cloud/01.Introduction/es/main_files_sharing_menu_publink.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_sharing_menu_publink.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files_sharing_menu_publink.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_files_upload.jpeg b/pages/03.Cloud/01.Introduction/es/main_files_upload.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_files_upload.jpeg rename to pages/03.Cloud/01.Introduction/es/main_files_upload.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/main_personal.gif b/pages/03.Cloud/01.Introduction/es/main_personal.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/es/main_personal.gif rename to pages/03.Cloud/01.Introduction/es/main_personal.gif diff --git a/pages/02.nextcloud/01.introduction/es/personal_activity.jpeg b/pages/03.Cloud/01.Introduction/es/personal_activity.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/personal_activity.jpeg rename to pages/03.Cloud/01.Introduction/es/personal_activity.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/personal_encryption1.jpeg b/pages/03.Cloud/01.Introduction/es/personal_encryption1.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/personal_encryption1.jpeg rename to pages/03.Cloud/01.Introduction/es/personal_encryption1.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/personal_federated.jpeg b/pages/03.Cloud/01.Introduction/es/personal_federated.jpeg similarity index 100% rename from pages/02.nextcloud/01.introduction/es/personal_federated.jpeg rename to pages/03.Cloud/01.Introduction/es/personal_federated.jpeg diff --git a/pages/02.nextcloud/01.introduction/es/personal_info1.gif b/pages/03.Cloud/01.Introduction/es/personal_info1.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/es/personal_info1.gif rename to pages/03.Cloud/01.Introduction/es/personal_info1.gif diff --git a/pages/02.nextcloud/01.introduction/fr/main1.png b/pages/03.Cloud/01.Introduction/fr/main1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main1.png rename to pages/03.Cloud/01.Introduction/fr/main1.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_activities_main.png b/pages/03.Cloud/01.Introduction/fr/main_activities_main.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_activities_main.png rename to pages/03.Cloud/01.Introduction/fr/main_activities_main.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_activities_rss.png b/pages/03.Cloud/01.Introduction/fr/main_activities_rss.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_activities_rss.png rename to pages/03.Cloud/01.Introduction/fr/main_activities_rss.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files.png b/pages/03.Cloud/01.Introduction/fr/main_files.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files.png rename to pages/03.Cloud/01.Introduction/fr/main_files.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files_comments1.png b/pages/03.Cloud/01.Introduction/fr/main_files_comments1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files_comments1.png rename to pages/03.Cloud/01.Introduction/fr/main_files_comments1.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files_other_menu.png b/pages/03.Cloud/01.Introduction/fr/main_files_other_menu.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files_other_menu.png rename to pages/03.Cloud/01.Introduction/fr/main_files_other_menu.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files_sharing_menu.png b/pages/03.Cloud/01.Introduction/fr/main_files_sharing_menu.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files_sharing_menu.png rename to pages/03.Cloud/01.Introduction/fr/main_files_sharing_menu.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files_sharing_menu2.png b/pages/03.Cloud/01.Introduction/fr/main_files_sharing_menu2.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files_sharing_menu2.png rename to pages/03.Cloud/01.Introduction/fr/main_files_sharing_menu2.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files_sharing_menu_publink.png b/pages/03.Cloud/01.Introduction/fr/main_files_sharing_menu_publink.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files_sharing_menu_publink.png rename to pages/03.Cloud/01.Introduction/fr/main_files_sharing_menu_publink.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_files_upload.png b/pages/03.Cloud/01.Introduction/fr/main_files_upload.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_files_upload.png rename to pages/03.Cloud/01.Introduction/fr/main_files_upload.png diff --git a/pages/02.nextcloud/01.introduction/fr/main_filles_add.gif b/pages/03.Cloud/01.Introduction/fr/main_filles_add.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/main_filles_add.gif rename to pages/03.Cloud/01.Introduction/fr/main_filles_add.gif diff --git a/pages/02.nextcloud/01.introduction/fr/personal_activity.png b/pages/03.Cloud/01.Introduction/fr/personal_activity.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/personal_activity.png rename to pages/03.Cloud/01.Introduction/fr/personal_activity.png diff --git a/pages/02.nextcloud/01.introduction/fr/personal_encryption1.png b/pages/03.Cloud/01.Introduction/fr/personal_encryption1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/personal_encryption1.png rename to pages/03.Cloud/01.Introduction/fr/personal_encryption1.png diff --git a/pages/02.nextcloud/01.introduction/fr/personal_federated.png b/pages/03.Cloud/01.Introduction/fr/personal_federated.png similarity index 100% rename from pages/02.nextcloud/01.introduction/fr/personal_federated.png rename to pages/03.Cloud/01.Introduction/fr/personal_federated.png diff --git a/pages/02.nextcloud/01.introduction/it/main1.png b/pages/03.Cloud/01.Introduction/it/main1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/it/main1.png rename to pages/03.Cloud/01.Introduction/it/main1.png diff --git a/pages/02.nextcloud/01.introduction/pt/main1.png b/pages/03.Cloud/01.Introduction/pt/main1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main1.png rename to pages/03.Cloud/01.Introduction/pt/main1.png diff --git a/pages/02.nextcloud/01.introduction/en/main_activities_icon.png b/pages/03.Cloud/01.Introduction/pt/main_activities_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_activities_icon.png rename to pages/03.Cloud/01.Introduction/pt/main_activities_icon.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_activities_main.png b/pages/03.Cloud/01.Introduction/pt/main_activities_main.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_activities_main.png rename to pages/03.Cloud/01.Introduction/pt/main_activities_main.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_activities_rss.png b/pages/03.Cloud/01.Introduction/pt/main_activities_rss.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_activities_rss.png rename to pages/03.Cloud/01.Introduction/pt/main_activities_rss.png diff --git a/pages/02.nextcloud/01.introduction/en/main_activities_settings_icon.png b/pages/03.Cloud/01.Introduction/pt/main_activities_settings_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_activities_settings_icon.png rename to pages/03.Cloud/01.Introduction/pt/main_activities_settings_icon.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files.png b/pages/03.Cloud/01.Introduction/pt/main_files.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files.png rename to pages/03.Cloud/01.Introduction/pt/main_files.png diff --git a/pages/02.nextcloud/01.introduction/en/main_files_add.png b/pages/03.Cloud/01.Introduction/pt/main_files_add.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_files_add.png rename to pages/03.Cloud/01.Introduction/pt/main_files_add.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_comments1.png b/pages/03.Cloud/01.Introduction/pt/main_files_comments1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_comments1.png rename to pages/03.Cloud/01.Introduction/pt/main_files_comments1.png diff --git a/pages/02.nextcloud/01.introduction/en/main_files_icon.png b/pages/03.Cloud/01.Introduction/pt/main_files_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_files_icon.png rename to pages/03.Cloud/01.Introduction/pt/main_files_icon.png diff --git a/pages/02.nextcloud/01.introduction/en/main_files_other.png b/pages/03.Cloud/01.Introduction/pt/main_files_other.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_files_other.png rename to pages/03.Cloud/01.Introduction/pt/main_files_other.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_other_menu.png b/pages/03.Cloud/01.Introduction/pt/main_files_other_menu.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_other_menu.png rename to pages/03.Cloud/01.Introduction/pt/main_files_other_menu.png diff --git a/pages/02.nextcloud/01.introduction/en/main_files_share_icon.png b/pages/03.Cloud/01.Introduction/pt/main_files_share_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_files_share_icon.png rename to pages/03.Cloud/01.Introduction/pt/main_files_share_icon.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_sharing_menu.png b/pages/03.Cloud/01.Introduction/pt/main_files_sharing_menu.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_sharing_menu.png rename to pages/03.Cloud/01.Introduction/pt/main_files_sharing_menu.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_sharing_menu2.png b/pages/03.Cloud/01.Introduction/pt/main_files_sharing_menu2.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_sharing_menu2.png rename to pages/03.Cloud/01.Introduction/pt/main_files_sharing_menu2.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_sharing_menu_publink.png b/pages/03.Cloud/01.Introduction/pt/main_files_sharing_menu_publink.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_sharing_menu_publink.png rename to pages/03.Cloud/01.Introduction/pt/main_files_sharing_menu_publink.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_upload.png b/pages/03.Cloud/01.Introduction/pt/main_files_upload.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_upload.png rename to pages/03.Cloud/01.Introduction/pt/main_files_upload.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_filles_add.gif b/pages/03.Cloud/01.Introduction/pt/main_filles_add.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_filles_add.gif rename to pages/03.Cloud/01.Introduction/pt/main_filles_add.gif diff --git a/pages/02.nextcloud/01.introduction/en/main_personal.gif b/pages/03.Cloud/01.Introduction/pt/main_personal.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/en/main_personal.gif rename to pages/03.Cloud/01.Introduction/pt/main_personal.gif diff --git a/pages/02.nextcloud/01.introduction/pt/personal_activity.png b/pages/03.Cloud/01.Introduction/pt/personal_activity.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/personal_activity.png rename to pages/03.Cloud/01.Introduction/pt/personal_activity.png diff --git a/pages/02.nextcloud/01.introduction/pt/personal_encryption1.png b/pages/03.Cloud/01.Introduction/pt/personal_encryption1.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/personal_encryption1.png rename to pages/03.Cloud/01.Introduction/pt/personal_encryption1.png diff --git a/pages/02.nextcloud/01.introduction/pt/personal_federated.png b/pages/03.Cloud/01.Introduction/pt/personal_federated.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/personal_federated.png rename to pages/03.Cloud/01.Introduction/pt/personal_federated.png diff --git a/pages/02.nextcloud/01.introduction/pt/personal_info1.gif b/pages/03.Cloud/01.Introduction/pt/personal_info1.gif similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/personal_info1.gif rename to pages/03.Cloud/01.Introduction/pt/personal_info1.gif diff --git a/pages/03.Cloud/02.Files_management/docs.en.md b/pages/03.Cloud/02.Files_management/docs.en.md new file mode 100644 index 00000000..e5e15606 --- /dev/null +++ b/pages/03.Cloud/02.Files_management/docs.en.md @@ -0,0 +1,97 @@ +--- +title: Cloud: Files management +published: true +taxonomy: + category: + - docs +page-toc: + active: true +--- +# Files + +The main task of the cloud is managing files. You can easily upload, download, share and comment them. + +|![](en/main.png)| +|:--:| +|The *left-sidebar* let's you filter files based on certain criteria (recents, favorites, shared, by tags).
The *Main window* is your file-browser (you should be familiar with it if you ever used a computer before... ![](en/p.png)).| + +## Creating new files or directories +To create a new file, just click on **"+"** button and choose the type of file from the list. The same procedure aplies to create directories and pads. + +![](en/file_creation.gif) + +## Uploading files +There are two ways to upload files: + +|By dragging files from your "computer" (file browser) onto the cloud web browser window.| +|:--:| +|![](en/dragging_files.gif)| + +|By using the **"+"** icon and selecting the "**Upload a file**" option.| +|:--:| +|![](en/uploading_files.gif)| + +## File / Directory operations menu +By clicking on the **"three dots"** icon next to the filename or directory you can access to some extra options. Those options are self explanatory. You can "Add to favorites", see the "Details", "Rename", "Move or copy", "Download" or "Delete" the file or directory. + +![](en/file_menu.png) + + +## File Sharing +Sharing files and directories is an essential part of any cloud storage service. You can choose to share files with other Disroot users, an entire group or even with other users using OwnCloud/Nextcloud on different platforms. You can also share with anyone out there through the public link option. + +To share a file or directory just click the "*share icon*" (![](en/share_icon.png)) right next to the name of the item you want to share. A right-bar popup will show up with all the sharing options for you to choose from. + +![](en/file_sharing_menu.png) + +You might share with other users, groups, or users on different cloud servers using the federation address. To do so, you will have to type their entire usernames because **we don't provide autocompletion for privacy reasons**.
+ +![](en/sharing_options.png) + +When sharing with other users or groups, you can choose if they have rights to edit and/or re-share the shared file. You can also set an expiration date for it and send a note to the recipients. + +![](en/edit_options.png) + +You can also share a file or directory with anyone by using the ![](en/sharing_icon.png) option. It allows you to copy/paste a link and share it. Any person who knows the address (url) will be able to access the file. They don't need to have an account. This option enables you to set editing permissions, protect the link with a password, hide the download and set an expiration date. + +![](en/share_link_options.png) + +## Additional file operations + +![](en/other_ops.png) + +As you may have noticed when setting up sharing, there are more options in the right-sidebar. +They are: + +|**Chat**
![](en/chat_opt.png)| +|:--:| +|You can start a call or chat with the users you've shared a file or directory.| + +|**Activity**
![](en/activity_opt.png)| +|:--:| +|It gives you an overview of all events with the file. The time it was created, when it was shared, removed, edited, commented on, etc.| + +|**Comments**
![](en/comment_01.png)| +|:--:| +|This is a very useful feature when you're working on a file with other users. Everyone you've shared the file with can read and add comments. By clicking on the three dots icons right next to your username, you can edit your comment.| +|![](en/comment_edit.png)| + +|**Versions**
![](en/versions_opt.png)| +|:--:| +|It lets you view all the changes done to a file. You can download previous revisions of a file as well as restore it to previous revision (deleting all changes done after).| + +---------- + +# Activity ![](en/main_activities_icon.png) + +If your account start getting busy, let's say, for example, you start collaborating with (many) other users and groups, you could find the **"Activity"** app very useful. With it, you have a general overview on all the events happening within your cloud account (file changes, comments, shares, contacts, todos, calendars etc). + +![](en/activity_app.png) + +The main window gives you a timeline with all events, and the left sidebar let's you filter the information based on certain criteria. + +Additionally, you can create a RSS feed of your activities which you can follow using your favorite rss reader, share it with someone or integrate it in your application or website. To do it, just press the "Settings" button at the bottom left-sidebar and enable the RSS feed option. + +![](en/activity_rss.png) + +---------- diff --git a/pages/03.Cloud/02.Files_management/en/activity_app.png b/pages/03.Cloud/02.Files_management/en/activity_app.png new file mode 100644 index 00000000..40547b38 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/activity_app.png differ diff --git a/pages/03.Cloud/02.Files_management/en/activity_opt.png b/pages/03.Cloud/02.Files_management/en/activity_opt.png new file mode 100644 index 00000000..67ca4fbe Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/activity_opt.png differ diff --git a/pages/03.Cloud/02.Files_management/en/activity_rss.png b/pages/03.Cloud/02.Files_management/en/activity_rss.png new file mode 100644 index 00000000..776ebd19 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/activity_rss.png differ diff --git a/pages/03.Cloud/02.Files_management/en/app_order.gif b/pages/03.Cloud/02.Files_management/en/app_order.gif new file mode 100644 index 00000000..5aa4d35d Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/app_order.gif differ diff --git a/pages/03.Cloud/02.Files_management/en/chat_opt.png b/pages/03.Cloud/02.Files_management/en/chat_opt.png new file mode 100644 index 00000000..32f992f4 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/chat_opt.png differ diff --git a/pages/03.Cloud/02.Files_management/en/comment_01.png b/pages/03.Cloud/02.Files_management/en/comment_01.png new file mode 100644 index 00000000..583812b3 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/comment_01.png differ diff --git a/pages/03.Cloud/02.Files_management/en/comment_edit.png b/pages/03.Cloud/02.Files_management/en/comment_edit.png new file mode 100644 index 00000000..1dddb782 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/comment_edit.png differ diff --git a/pages/03.Cloud/02.Files_management/en/dragging_files.gif b/pages/03.Cloud/02.Files_management/en/dragging_files.gif new file mode 100644 index 00000000..d6109af0 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/dragging_files.gif differ diff --git a/pages/03.Cloud/02.Files_management/en/edit_options.png b/pages/03.Cloud/02.Files_management/en/edit_options.png new file mode 100644 index 00000000..41c6bdc4 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/edit_options.png differ diff --git a/pages/03.Cloud/02.Files_management/en/file_creation.gif b/pages/03.Cloud/02.Files_management/en/file_creation.gif new file mode 100644 index 00000000..cd4f0c6e Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/file_creation.gif differ diff --git a/pages/03.Cloud/02.Files_management/en/file_menu.png b/pages/03.Cloud/02.Files_management/en/file_menu.png new file mode 100644 index 00000000..bb509f52 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/file_menu.png differ diff --git a/pages/03.Cloud/02.Files_management/en/file_sharing_menu.png b/pages/03.Cloud/02.Files_management/en/file_sharing_menu.png new file mode 100644 index 00000000..93c5faa1 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/file_sharing_menu.png differ diff --git a/pages/03.Cloud/02.Files_management/en/main.png b/pages/03.Cloud/02.Files_management/en/main.png new file mode 100644 index 00000000..776c6e04 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/main.png differ diff --git a/pages/02.nextcloud/01.introduction/pt/main_activities_icon.png b/pages/03.Cloud/02.Files_management/en/main_activities_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_activities_icon.png rename to pages/03.Cloud/02.Files_management/en/main_activities_icon.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_activities_settings_icon.png b/pages/03.Cloud/02.Files_management/en/main_activities_settings_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_activities_settings_icon.png rename to pages/03.Cloud/02.Files_management/en/main_activities_settings_icon.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_add.png b/pages/03.Cloud/02.Files_management/en/main_files_add.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_add.png rename to pages/03.Cloud/02.Files_management/en/main_files_add.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_icon.png b/pages/03.Cloud/02.Files_management/en/main_files_icon.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_icon.png rename to pages/03.Cloud/02.Files_management/en/main_files_icon.png diff --git a/pages/02.nextcloud/01.introduction/pt/main_files_other.png b/pages/03.Cloud/02.Files_management/en/main_files_other.png similarity index 100% rename from pages/02.nextcloud/01.introduction/pt/main_files_other.png rename to pages/03.Cloud/02.Files_management/en/main_files_other.png diff --git a/pages/03.Cloud/02.Files_management/en/other_ops.png b/pages/03.Cloud/02.Files_management/en/other_ops.png new file mode 100644 index 00000000..33c7ab6f Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/other_ops.png differ diff --git a/pages/03.Cloud/02.Files_management/en/p.png b/pages/03.Cloud/02.Files_management/en/p.png new file mode 100644 index 00000000..cbdbab64 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/p.png differ diff --git a/pages/03.Cloud/02.Files_management/en/share_icon.png b/pages/03.Cloud/02.Files_management/en/share_icon.png new file mode 100755 index 00000000..f3731866 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/share_icon.png differ diff --git a/pages/03.Cloud/02.Files_management/en/share_link_options.png b/pages/03.Cloud/02.Files_management/en/share_link_options.png new file mode 100644 index 00000000..430bee53 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/share_link_options.png differ diff --git a/pages/03.Cloud/02.Files_management/en/sharing_icon.png b/pages/03.Cloud/02.Files_management/en/sharing_icon.png new file mode 100644 index 00000000..eaad79f5 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/sharing_icon.png differ diff --git a/pages/03.Cloud/02.Files_management/en/sharing_options.png b/pages/03.Cloud/02.Files_management/en/sharing_options.png new file mode 100644 index 00000000..f319da21 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/sharing_options.png differ diff --git a/pages/03.Cloud/02.Files_management/en/uploading_files.gif b/pages/03.Cloud/02.Files_management/en/uploading_files.gif new file mode 100644 index 00000000..a426d5fc Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/uploading_files.gif differ diff --git a/pages/03.Cloud/02.Files_management/en/versions_opt.png b/pages/03.Cloud/02.Files_management/en/versions_opt.png new file mode 100644 index 00000000..52adca67 Binary files /dev/null and b/pages/03.Cloud/02.Files_management/en/versions_opt.png differ diff --git a/pages/03.Cloud/03.Apps/01.Tasks/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/01.Tasks/01.Web/docs.en.md new file mode 100644 index 00000000..a44f2326 --- /dev/null +++ b/pages/03.Cloud/03.Apps/01.Tasks/01.Web/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Tasks: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Tasks diff --git a/pages/03.Cloud/03.Apps/01.Tasks/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/01.Tasks/02.Desktop/docs.en.md new file mode 100644 index 00000000..10bf218b --- /dev/null +++ b/pages/03.Cloud/03.Apps/01.Tasks/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Tasks: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Tasks diff --git a/pages/03.Cloud/03.Apps/01.Tasks/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/01.Tasks/03.Mobile/docs.en.md new file mode 100644 index 00000000..d8479591 --- /dev/null +++ b/pages/03.Cloud/03.Apps/01.Tasks/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Tasks: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Tasks diff --git a/pages/03.Cloud/03.Apps/01.Tasks/docs.en.md b/pages/03.Cloud/03.Apps/01.Tasks/docs.en.md new file mode 100644 index 00000000..d74a5c01 --- /dev/null +++ b/pages/03.Cloud/03.Apps/01.Tasks/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud Apps: Tasks +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Tasks + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.en.md new file mode 100755 index 00000000..6fbdf2a8 --- /dev/null +++ b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.en.md @@ -0,0 +1,138 @@ +--- +title: Calendar: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: true +--- + +------------ +# Using Calendar app + +You can access your calendar app by pressing the ![](en/calendar_top_icon.png) icon in the top bar. +*Left-bar* in the calendar window gives you an overview of your calendars, their options and general settings. + +![](en/calendar_main.png) + +-------------- +## Create Calendar +To create a new calendar in this options panel press "*create calendar*" +A small prompt will appear where you can type the name you want to give to this new calendar and select a color for it. +Then press "*create*". + +![](en/calendar_add_new.png) + +You can create multiple calendars for different purposes (work, activism, etc.) by repeating this process. If you do that, you can use different colors to set them apart (last icon is the color picker which allows you to choose any color you want![](en/calendar_colorpick_icon.png)). + +![](en/calendar_list.png) + +----------------------- +## Delete, edit, Download calendar. +On the left panel, you will see your calendars listed. To the right of each calendar you will find a "more" button where you can: + +- rename your calendar, +- download it +- get a url link to sync it with other devices +- delete your calendar. + +![](en/calendar_edit1.png) + +------------------------- +## Create an event +You can create a new event in your calendar by clicking in the calendars *main window* simply on the day of the event. A panel will appear on the right side, where you can fill with the information of the event. + +![](en/calendar_edit_menu.png) + +In this panel you can specify: + + - event title + - start and end date + - start and end time + - if it's full day event or not + - event location + - event description + +![](en/calendar_edit_menu2.png) + +If you have multiple calendars, in your disroot calendar app, you need to select to which calendar the event goes to. You can do that below the event title field. + +![](en/calendar_edit_menu3.png) + +You can set a reminder for the event by pressing "Reminders" and "Add" + +![](en/calendar_edit_menu4.png) + +You can select what type of reminder you want: + +* audio +* email +* pop up + +And set the time for it. + +Just press the reminder you added and the options will show up. + +![](en/calendar_edit_menu5.png) + +You can also set if this is a repeating event or not. Just check *repeating* options. + +![](en/calendar_edit_menu6.png) + +------------------------------- +## Invite people to events + +You can also invite people to your event via email by: + +* pressing "Attendees" +* Filing the field with the persons email address +* press enter + +![](en/calendar_edit_menu7.png) + +The people you invite will receive an automaticly generated email with the invitation. Any changes you make to the event will be automatically sent by email to the person you've added. + +When you're done with everything, just press create at the end of the panel, and your event will appear on the screen + +---------------------------- +## Edit or delete events +To edit or delete an event you've created, just click the event on your screen, edit it and then press "update". +To delete it, you will find the big red button. + +![](en/calendar_edit_menu8.png) + +---------------------------- +## Share calendars +You can share your calendars, either with another disroot user, via email, or public link. + +To share with another Disroot user: + +* press the the share button on the right of your calendar name +* type the username of the Disroot user that you want to share the calender with +* press enter. + +![](en/calendar_share_menu1.png) + +To share calendars via email or public link: + +* go to the same "shared" option +* select "Share link" +* fill the email address field with the email of the person you want to share your calendar with +* press enter +* to just get the link press the chain symbol next to the mail envelope symbol + +![](en/calendar_share_menu2.png) + +------------------------------ +## Import calendars +If you have a ICS file with a calendar to import, go to disroot calendar app then go to "Settings & Import" on the lower left corner of the screen. + +![](en/calendar_import_menu1.png) + +And select import calendar option. + +![](en/calendar_import_menu2.png) + +---------------------------------------- diff --git a/pages/02.nextcloud/02.Apps/Calendar/docs.es.md b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.es.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/docs.es.md rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.es.md diff --git a/pages/02.nextcloud/02.Apps/Calendar/docs.fr.md b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.fr.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/docs.fr.md rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.fr.md diff --git a/pages/02.nextcloud/02.Apps/Calendar/docs.pt.md b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.pt.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/docs.pt.md rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/docs.pt.md diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_add_new.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_add_new.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_add_new.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_add_new.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_colorpick_icon.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_colorpick_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_colorpick_icon.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_colorpick_icon.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit1.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit1.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit1.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu2.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu2.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu2.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu3.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu3.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu3.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu3.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu4.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu4.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu4.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu4.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu5.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu5.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu5.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu5.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu6.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu6.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu6.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu6.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu7.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu7.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu7.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu7.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu8.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu8.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_edit_menu8.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_edit_menu8.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_import_menu1.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_import_menu1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_import_menu1.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_import_menu1.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_import_menu2.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_import_menu2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_import_menu2.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_import_menu2.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_list.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_list.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_list.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_list.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_main.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_main.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_main.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_main.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_share_menu1.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_share_menu1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_share_menu1.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_share_menu1.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_share_menu2.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_share_menu2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_share_menu2.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_share_menu2.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/en/calendar_top_icon.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_top_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/en/calendar_top_icon.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/en/calendar_top_icon.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_add_new.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_add_new.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_add_new.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_add_new.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_colorpick_icon.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_colorpick_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_colorpick_icon.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_colorpick_icon.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit1.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit1.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit1.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu.gif b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu.gif rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.gif diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu2.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu2.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu2.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu3.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu3.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu3.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu3.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu4.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu4.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu4.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu4.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu5.gif b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu5.gif rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.gif diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu5.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu5.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu5.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu6.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu6.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu6.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu6.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu7.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu7.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu7.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu7.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu8.gif b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu8.gif rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.gif diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu8.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_edit_menu8.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_edit_menu8.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_import_menu1.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_import_menu1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_import_menu1.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_import_menu1.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_import_menu2.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_import_menu2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_import_menu2.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_import_menu2.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_list.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_list.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_list.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_list.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_main.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_main.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_main.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_main.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_share_menu1.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_share_menu1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_share_menu1.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_share_menu1.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_share_menu2.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_share_menu2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_share_menu2.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_share_menu2.png diff --git a/pages/02.nextcloud/02.Apps/Calendar/pt/calendar_top_icon.png b/pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_top_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Calendar/pt/calendar_top_icon.png rename to pages/03.Cloud/03.Apps/02.Calendar/01.Web/pt/calendar_top_icon.png diff --git a/pages/03.Cloud/03.Apps/02.Calendar/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/02.Calendar/02.Desktop/docs.en.md new file mode 100644 index 00000000..f29af3a7 --- /dev/null +++ b/pages/03.Cloud/03.Apps/02.Calendar/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Calendar: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Calendar diff --git a/pages/03.Cloud/03.Apps/02.Calendar/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/02.Calendar/03.Mobile/docs.en.md new file mode 100644 index 00000000..c3ad7943 --- /dev/null +++ b/pages/03.Cloud/03.Apps/02.Calendar/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Calendar: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Calendar diff --git a/pages/03.Cloud/03.Apps/02.Calendar/docs.en.md b/pages/03.Cloud/03.Apps/02.Calendar/docs.en.md new file mode 100644 index 00000000..f77f9985 --- /dev/null +++ b/pages/03.Cloud/03.Apps/02.Calendar/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud Apps: Calendar +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Calendar + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.en.md new file mode 100755 index 00000000..46c49b30 --- /dev/null +++ b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.en.md @@ -0,0 +1,109 @@ +--- +title: Contacts: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: true +--- + +# Contacts +You can access the contacts app by by pressing the contacts icon ![](en/contacts_top_icon.png?resize=20,20) on the top bar, in nexcloud. + +---------------------- +## Create a contact + +In the contacts app select "*New contact*" + +![](en/contacts_add1.png) + +You will prompted with a form on the "*right-bar*" side to create the new contact. + +![](en/contacts_add2.png) + +Just type the information you want/have in the fields. If you need, you can just add more fields at the bottom of the form. + +![](en/contacts_add3.png) + +----------------------- +## Delete a contact + +* select the contact +* in the contact form header, select the delete icon + +![](en/contacts_delete.png) + +----------------------- +## Create contact groups +You can create groups to organize your contacts ex: faculty, work, collective, etc. +In the field group you can assign a new contact to an existing group or create a new group. Or assign a contact to multiple groups by typing the several groups. + +![](en/contacts_groups1.png) + +On the left side of the screen in your contacts app, you will see the existing groups. +Selecting them will present all contacts in that respective group. + +![](en/contacts_groups2.png) + +------------------------ +## Share address books + +Go to "settings" on the lower left corner of the screen in the contacts app. + +![](en/contacts_share1.png) + +In settings you can share your address book with other Disroot users by: +selecting share address book +writing the username of the disroot user you want to share the address book with. + +![](en/contacts_share2.png) + +You can also use a link to share your address book via webDAV, to other contact books (thunderbird, mobile, etc,). + +![](en/contacts_share3.png) + +------------------------- +## Import address books + +You can import address books or individual contacts, if you have a vcf file of the contact or the address book. + +* selecting "import". + +![](en/contacts_import1.png) + +Then select the file you want to import, and press ok. + +----------------------------- +## Create a new address book + +Inside settings in the field "Address book name" write the name of the new address book, then press enter. + +![](en/contacts_create1.png) + +----------------------------- +# Syncing cloud contacts with webmail +Syncing cloud contacts with Webmail is very easy. It will permit contacts from your webmail and cloud to be in sync. + +First go to your Nexcloud contacts app. Click on the settings icon in the lower left corner. +Select "Show URL" option of the addressbook you would like to sync with webmail, and copy the given link. + +![](en/webmail_import_contacts1.png) + + +Now go to Webmail app, and click on the settings icon (top right in the webmail app) + +![](en/webmail_import_contacts2.png) + +In your settings, on the left side bar select: **Contacts** +When in the contacts menu: + +1. Select Enable remote synchronization +2. In Addressbook URL, place the URL from your Nexcloud contacts addressbook you have saved before. +3. Provide your username +4. Add your password + +![](en/webmail_import_contacts3.png) + +And then refresh both pages. Now your contacts will stay in sync. diff --git a/pages/02.nextcloud/02.Apps/Contacts/docs.es.md b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.es.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/docs.es.md rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.es.md diff --git a/pages/02.nextcloud/02.Apps/Contacts/docs.fr.md b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.fr.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/docs.fr.md rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.fr.md diff --git a/pages/02.nextcloud/02.Apps/Contacts/docs.pt.md b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.pt.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/docs.pt.md rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/docs.pt.md diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_add1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_add1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_add1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_add1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_add2.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_add2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_add2.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_add2.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_add3.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_add3.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_add3.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_add3.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_create1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_create1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_create1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_create1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_delete.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_delete.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_delete.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_delete.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_groups1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_groups1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_groups1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_groups1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_groups2.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_groups2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_groups2.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_groups2.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_import1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_import1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_import1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_import1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_share1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_share1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_share1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_share1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_share2.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_share2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_share2.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_share2.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_share3.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_share3.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_share3.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_share3.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/en/contacts_top_icon.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_top_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/en/contacts_top_icon.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/en/contacts_top_icon.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_add1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_add1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_add1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_add1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_add2.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_add2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_add2.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_add2.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_add3.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_add3.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_add3.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_add3.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_create1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_create1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_create1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_create1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_delete.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_delete.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_delete.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_delete.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_groups1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_groups1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_groups1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_groups1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_groups2.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_groups2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_groups2.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_groups2.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_import1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_import1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_import1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_import1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_share1.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_share1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_share1.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_share1.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_share2.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_share2.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_share2.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_share2.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_share3.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_share3.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_share3.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_share3.png diff --git a/pages/02.nextcloud/02.Apps/Contacts/pt/contacts_top_icon.png b/pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_top_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Contacts/pt/contacts_top_icon.png rename to pages/03.Cloud/03.Apps/03.Contacts/01.Web/pt/contacts_top_icon.png diff --git a/pages/03.Cloud/03.Apps/03.Contacts/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/03.Contacts/02.Desktop/docs.en.md new file mode 100644 index 00000000..2649d2a8 --- /dev/null +++ b/pages/03.Cloud/03.Apps/03.Contacts/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Contacts: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Contacts diff --git a/pages/03.Cloud/03.Apps/03.Contacts/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/03.Contacts/03.Mobile/docs.en.md new file mode 100644 index 00000000..f575d54e --- /dev/null +++ b/pages/03.Cloud/03.Apps/03.Contacts/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Contacts: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Contacts diff --git a/pages/03.Cloud/03.Apps/03.Contacts/docs.en.md b/pages/03.Cloud/03.Apps/03.Contacts/docs.en.md new file mode 100644 index 00000000..55cc4f54 --- /dev/null +++ b/pages/03.Cloud/03.Apps/03.Contacts/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud Apps: Contacts +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Contacts + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/04.Notes/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/04.Notes/01.Web/docs.en.md new file mode 100644 index 00000000..0b236e9d --- /dev/null +++ b/pages/03.Cloud/03.Apps/04.Notes/01.Web/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Notes: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Notes diff --git a/pages/03.Cloud/03.Apps/04.Notes/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/04.Notes/02.Desktop/docs.en.md new file mode 100644 index 00000000..56b2748f --- /dev/null +++ b/pages/03.Cloud/03.Apps/04.Notes/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Notes: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Notes diff --git a/pages/03.Cloud/03.Apps/04.Notes/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/04.Notes/03.Mobile/docs.en.md new file mode 100644 index 00000000..59c6bc6d --- /dev/null +++ b/pages/03.Cloud/03.Apps/04.Notes/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Notes: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Notes diff --git a/pages/03.Cloud/03.Apps/04.Notes/docs.en.md b/pages/03.Cloud/03.Apps/04.Notes/docs.en.md new file mode 100644 index 00000000..6d9bca1c --- /dev/null +++ b/pages/03.Cloud/03.Apps/04.Notes/docs.en.md @@ -0,0 +1,14 @@ +--- +title: Cloud Apps: Notes +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +## Notes + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/05.News/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/05.News/01.Web/docs.en.md new file mode 100755 index 00000000..4b4bb5d6 --- /dev/null +++ b/pages/03.Cloud/03.Apps/05.News/01.Web/docs.en.md @@ -0,0 +1,33 @@ +--- +title: News: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: true +--- + +News app is pretty handy tool to keep track of the new articles and posts of all the websites you like to follow in one place. Disroot cloud provides great and simple to use app that does the job for you and syncs it to all your devices. In this tutorial we'll try to cover the basic usage, if you are interested in integrating it with your devices choose your prefered operating system in [this](https://howto.disroot.org/nextcloud/sync-with-your-cloud) section. + + +---------- +# News App on Disroot + +To get into the app from web browser, just click news app icon ![](en/news_top_icon.png?resize=20,20) in the top bar. General idea behind the app is very simple. You add RSS-feed of your favorite sites, get notification on new articles, and read then without the need to go to all those websites, by opening lots of tabs and get distracted half way. + +So let's get things rolling: + +## Add new feeds +Most of the websites provide [RSS](https://en.wikipedia.org/wiki/RSS) or Atom feeds. Once you have the RSS link ready, you can copy it and add it to your news app. +To add the feed simply click on the **"+ Subscribe"** button and fill in the URL of the feed you previously copied. + +![](en/news_add1.png) + +For better overview and sorting you can create folders and assign feeds to them. To create new folder hit **"+ New Folder"** button on the left-side bar. Now you can "drag and drop" feeds you wish to add to folders. + +## Feed options +Every feed can be optimized to your needs. Clicking on **"Three dot"** icon: + +![](en/news_options.png) diff --git a/pages/02.nextcloud/02.Apps/News/docs.es.md b/pages/03.Cloud/03.Apps/05.News/01.Web/docs.es.md similarity index 100% rename from pages/02.nextcloud/02.Apps/News/docs.es.md rename to pages/03.Cloud/03.Apps/05.News/01.Web/docs.es.md diff --git a/pages/02.nextcloud/02.Apps/News/docs.fr.md b/pages/03.Cloud/03.Apps/05.News/01.Web/docs.fr.md similarity index 100% rename from pages/02.nextcloud/02.Apps/News/docs.fr.md rename to pages/03.Cloud/03.Apps/05.News/01.Web/docs.fr.md diff --git a/pages/02.nextcloud/02.Apps/News/docs.pt.md b/pages/03.Cloud/03.Apps/05.News/01.Web/docs.pt.md similarity index 100% rename from pages/02.nextcloud/02.Apps/News/docs.pt.md rename to pages/03.Cloud/03.Apps/05.News/01.Web/docs.pt.md diff --git a/pages/02.nextcloud/02.Apps/News/en/news_add1.png b/pages/03.Cloud/03.Apps/05.News/01.Web/en/news_add1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/en/news_add1.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/en/news_add1.png diff --git a/pages/02.nextcloud/02.Apps/News/en/news_options.png b/pages/03.Cloud/03.Apps/05.News/01.Web/en/news_options.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/en/news_options.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/en/news_options.png diff --git a/pages/02.nextcloud/02.Apps/News/en/news_threedot.png b/pages/03.Cloud/03.Apps/05.News/01.Web/en/news_threedot.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/en/news_threedot.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/en/news_threedot.png diff --git a/pages/02.nextcloud/02.Apps/News/en/news_top_icon.png b/pages/03.Cloud/03.Apps/05.News/01.Web/en/news_top_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/en/news_top_icon.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/en/news_top_icon.png diff --git a/pages/02.nextcloud/02.Apps/News/en/rss_icon.png b/pages/03.Cloud/03.Apps/05.News/01.Web/en/rss_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/en/rss_icon.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/en/rss_icon.png diff --git a/pages/02.nextcloud/02.Apps/News/pt/news_add1.png b/pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_add1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/pt/news_add1.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_add1.png diff --git a/pages/02.nextcloud/02.Apps/News/pt/news_options.png b/pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_options.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/pt/news_options.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_options.png diff --git a/pages/02.nextcloud/02.Apps/News/pt/news_threedot.png b/pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_threedot.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/pt/news_threedot.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_threedot.png diff --git a/pages/02.nextcloud/02.Apps/News/pt/news_top_icon.png b/pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_top_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/pt/news_top_icon.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/pt/news_top_icon.png diff --git a/pages/02.nextcloud/02.Apps/News/pt/rss_icon.png b/pages/03.Cloud/03.Apps/05.News/01.Web/pt/rss_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/News/pt/rss_icon.png rename to pages/03.Cloud/03.Apps/05.News/01.Web/pt/rss_icon.png diff --git a/pages/03.Cloud/03.Apps/05.News/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/05.News/02.Desktop/docs.en.md new file mode 100644 index 00000000..3d7d10f3 --- /dev/null +++ b/pages/03.Cloud/03.Apps/05.News/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: News: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## News diff --git a/pages/03.Cloud/03.Apps/05.News/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/05.News/03.Mobile/docs.en.md new file mode 100644 index 00000000..a0eb1fa5 --- /dev/null +++ b/pages/03.Cloud/03.Apps/05.News/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: News: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## News diff --git a/pages/03.Cloud/03.Apps/05.News/docs.en.md b/pages/03.Cloud/03.Apps/05.News/docs.en.md new file mode 100644 index 00000000..5ea22812 --- /dev/null +++ b/pages/03.Cloud/03.Apps/05.News/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud Apps: News +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## News + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/06.Bookmarks/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/06.Bookmarks/01.Web/docs.en.md new file mode 100644 index 00000000..1a346fb3 --- /dev/null +++ b/pages/03.Cloud/03.Apps/06.Bookmarks/01.Web/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Bookmarks: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Bookmarks diff --git a/pages/03.Cloud/03.Apps/06.Bookmarks/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/06.Bookmarks/02.Desktop/docs.en.md new file mode 100644 index 00000000..ca477375 --- /dev/null +++ b/pages/03.Cloud/03.Apps/06.Bookmarks/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Bookmarks: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Bookmarks diff --git a/pages/03.Cloud/03.Apps/06.Bookmarks/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/06.Bookmarks/03.Mobile/docs.en.md new file mode 100644 index 00000000..87c41728 --- /dev/null +++ b/pages/03.Cloud/03.Apps/06.Bookmarks/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Bookmarks: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Bookmarks diff --git a/pages/03.Cloud/03.Apps/06.Bookmarks/docs.en.md b/pages/03.Cloud/03.Apps/06.Bookmarks/docs.en.md new file mode 100644 index 00000000..3ee56f51 --- /dev/null +++ b/pages/03.Cloud/03.Apps/06.Bookmarks/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud Apps: Bookmarks +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Bookmarks + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.en.md b/pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.en.md new file mode 100755 index 00000000..46374ef0 --- /dev/null +++ b/pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.en.md @@ -0,0 +1,44 @@ +--- +title: Talk: Web +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +Since January 2017 we've introduced spreed calls to our cloud. It's very simple audio/video conference app you can use to communicate not only with other disroot users but with anyone who has a computer connected to the internet and up to date web browser supporting WebRTC technology. + +![](en/spreed_main.png) + + +The interface of the application is very simple. The left side bar shows you the list of rooms you have created. + + +On the bottom right of the window you will see your avatar and few options where you can: + +![](en/spreed_bottom.png) + + - mute/un-mute your microphone + - switch on/off your camera + - switch on/off fullscreen mode + +That's pretty much it. You should be ready to start your new call + +#Creating Calls +To start calling, you need to create a room. Click on **"Choose person"** to do so. In the popup window you have an option to invite existing disroot account, or create public room. +You will see there is a new room listed on the left sidebar. +When clicking on the options button of the room, you can either: + - invite more people + - create/delete public link + - leave the call/room + +![](en/spreed_create_calls1.png) + +There is no real difference between disroot user rooms and public rooms as in both cases you can either invite disroot users or create/remove public link rooms. + +Once you initiate the call by pressing on the room's name, a notification will be sent to invited disroot user or (in case of public room instance) you will have to wait for at least one other participant to join in. + +Once they join, you can start having your video call. diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/docs.es.md b/pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.es.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/docs.es.md rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.es.md diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/docs.fr.md b/pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.fr.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/docs.fr.md rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.fr.md diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/docs.pt.md b/pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.pt.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/docs.pt.md rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/docs.pt.md diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_bottom.png b/pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_bottom.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_bottom.png rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_bottom.png diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_create_call.gif b/pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_create_call.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_create_call.gif rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_create_call.gif diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_create_calls1.png b/pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_create_calls1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_create_calls1.png rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_create_calls1.png diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_main.png b/pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_main.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/en/spreed_main.png rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/en/spreed_main.png diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_bottom.png b/pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_bottom.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_bottom.png rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_bottom.png diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_create_call.gif b/pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_create_call.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_create_call.gif rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_create_call.gif diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_create_calls1.png b/pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_create_calls1.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_create_calls1.png rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_create_calls1.png diff --git a/pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_main.png b/pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_main.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Spreed-calls/pt/spreed_main.png rename to pages/03.Cloud/03.Apps/07.Talk/01.Web/pt/spreed_main.png diff --git a/pages/03.Cloud/03.Apps/07.Talk/02.Desktop/docs.en.md b/pages/03.Cloud/03.Apps/07.Talk/02.Desktop/docs.en.md new file mode 100644 index 00000000..ed9444fe --- /dev/null +++ b/pages/03.Cloud/03.Apps/07.Talk/02.Desktop/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Talk: Desktop +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Calls diff --git a/pages/03.Cloud/03.Apps/07.Talk/03.Mobile/docs.en.md b/pages/03.Cloud/03.Apps/07.Talk/03.Mobile/docs.en.md new file mode 100644 index 00000000..71ca942d --- /dev/null +++ b/pages/03.Cloud/03.Apps/07.Talk/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Calls: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Calls diff --git a/pages/03.Cloud/03.Apps/07.Talk/docs.en.md b/pages/03.Cloud/03.Apps/07.Talk/docs.en.md new file mode 100644 index 00000000..9fde3b34 --- /dev/null +++ b/pages/03.Cloud/03.Apps/07.Talk/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Talk: Mobile +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Calls + +|[**WEB**](web)|[**DESKTOP**](desktop)|[**MOBILE**](mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Cloud/03.Apps/08.Keep_sweep/docs.en.md b/pages/03.Cloud/03.Apps/08.Keep_sweep/docs.en.md new file mode 100644 index 00000000..01288a09 --- /dev/null +++ b/pages/03.Cloud/03.Apps/08.Keep_sweep/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Cloud Apps: Keep or Sweep +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Keep or Sweep diff --git a/pages/03.Cloud/03.Apps/docs.en.md b/pages/03.Cloud/03.Apps/docs.en.md new file mode 100755 index 00000000..af4d80b0 --- /dev/null +++ b/pages/03.Cloud/03.Apps/docs.en.md @@ -0,0 +1,18 @@ +--- +title: Cloud Apps +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|![](en/task_app.png)
[Tasks](tasks)|![](en/calendar_app.png)
[Calendar](calendar)|![](en/contacts_app.png)
[Contacts](contacts)|![](en/notes_app.png)
[Notes](notes)| +|:--:|:--:|:--:|:--:| +|[WEB](tasks/web)
[DESKTOP](tasks/desktop)
[MOBILE](tasks/mobile)|[WEB](calendar/web)
[DESKTOP](calendar/desktop)
[MOBILE](calendar/mobile)|[WEB](contacts/web)
[DESKTOP](contacts/desktop)
[MOBILE](contacts/mobile)|[WEB](notes/web)
[DESKTOP](notes/desktop)
[MOBILE](notes/mobile)| + +|![](en/news_app.png)
[News](news)|![](en/bookmarks_app.png)
[Bookmarks](bookmarks)|![](en/talk_app.png)
[Talk](talk)|![](en/sweep_app.png)
[Keep or Sweep](keep_sweep) +|:--:|:--:|:--:|:--:| +|[WEB](news/web)
[DESKTOP](news/desktop)
[MOBILE](news/mobile)|[WEB](bookmarks/web)
[DESKTOP](bookmarks/desktop)
[MOBILE](bookmarks/mobile)|[WEB](talk/web)
[DESKTOP](talk/desktop)
[MOBILE](talk/mobile)|[WEB](keep_sweep) diff --git a/pages/02.nextcloud/02.Apps/docs.es.md b/pages/03.Cloud/03.Apps/docs.es.md similarity index 100% rename from pages/02.nextcloud/02.Apps/docs.es.md rename to pages/03.Cloud/03.Apps/docs.es.md diff --git a/pages/02.nextcloud/02.Apps/docs.fr.md b/pages/03.Cloud/03.Apps/docs.fr.md similarity index 100% rename from pages/02.nextcloud/02.Apps/docs.fr.md rename to pages/03.Cloud/03.Apps/docs.fr.md diff --git a/pages/02.nextcloud/02.Apps/docs.pt.md b/pages/03.Cloud/03.Apps/docs.pt.md similarity index 100% rename from pages/02.nextcloud/02.Apps/docs.pt.md rename to pages/03.Cloud/03.Apps/docs.pt.md diff --git a/pages/03.Cloud/03.Apps/en/activity_app.png b/pages/03.Cloud/03.Apps/en/activity_app.png new file mode 100644 index 00000000..fa9e78be Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/activity_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/bookmarks_app.png b/pages/03.Cloud/03.Apps/en/bookmarks_app.png new file mode 100644 index 00000000..a07c9920 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/bookmarks_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/calendar_app.png b/pages/03.Cloud/03.Apps/en/calendar_app.png new file mode 100644 index 00000000..0aa478f3 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/calendar_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/contacts_app.png b/pages/03.Cloud/03.Apps/en/contacts_app.png new file mode 100644 index 00000000..2edda7a5 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/contacts_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/news_app.png b/pages/03.Cloud/03.Apps/en/news_app.png new file mode 100644 index 00000000..073cea32 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/news_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/notes_app.png b/pages/03.Cloud/03.Apps/en/notes_app.png new file mode 100644 index 00000000..23b012e3 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/notes_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/sweep_app.png b/pages/03.Cloud/03.Apps/en/sweep_app.png new file mode 100644 index 00000000..d1126c27 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/sweep_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/talk_app.png b/pages/03.Cloud/03.Apps/en/talk_app.png new file mode 100644 index 00000000..fd247501 Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/talk_app.png differ diff --git a/pages/03.Cloud/03.Apps/en/task_app.png b/pages/03.Cloud/03.Apps/en/task_app.png new file mode 100644 index 00000000..fc97bb4e Binary files /dev/null and b/pages/03.Cloud/03.Apps/en/task_app.png differ diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/docs.en.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/docs.es.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/docs.es.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/en/nextcloud-cal-link.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/en/nextcloud-cal-link.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/calcurse-caldav/en/nextcloud-cal-link.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/calcurse-caldav/en/nextcloud-cal-link.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.en.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.es.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.es.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.pt.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/docs.pt.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.en.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.es.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.es.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.pt.md b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/docs.pt.md rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/Screenshot from 2017-08-23 23-35-52.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_1.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_1.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_10.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_10.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_10.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_10.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_11.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_11.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_11.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_11.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_12.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_12.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_12.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_12.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_13.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_13.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_13.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_13.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_2.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_2.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_3.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_3.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_4.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_4.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_5.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_5.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_6.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_6.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_7.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_7.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_7.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_7.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_8.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_8.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_8.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_8.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_9.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_9.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_9.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_9.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-1.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-1.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-2.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-2.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-3.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-3.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-4.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-4.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-5.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-5.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts-5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts6.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts6.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/en/thunderbird_contacts6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/Screenshot from 2017-08-23 23-35-52.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_10.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_10.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_10.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_10.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_11.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_11.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_11.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_11.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_12.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_12.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_12.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_12.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_13.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_13.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_13.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_13.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_6.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_6.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_7.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_7.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_7.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_7.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_8.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_8.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_8.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_8.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_9.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_9.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_9.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_9.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts-5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts6.png b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts6.png rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif b/pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/01.Multiplatform/thunderbird-calendar-contacts/pt/thunderbird_contacts_3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.en.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.es.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.es.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.pt.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/docs.pt.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client10.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client10.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client10.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client10.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client11.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client11.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client11.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client11.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client2.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client2.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client3.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client3.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client4.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client4.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client5.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client5.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client6.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client6.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client7.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client7.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client7.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client7.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client8.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client8.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client8.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client8.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client9.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client9.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client9.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client9.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client_systray.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client_systray.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/en/desktop_client_systray.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/en/desktop_client_systray.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client10.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client10.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client10.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client10.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client11.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client11.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client11.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client11.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client2.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client2.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client3.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client3.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client4.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client4.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client5.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client5.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client6.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client6.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client7.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client7.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client7.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client7.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client8.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client8.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client8.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client8.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client9.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client9.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client9.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client9.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client_systray.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client_systray.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/desktop-sync-client/pt/desktop_client_systray.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/desktop-sync-client/pt/desktop_client_systray.png diff --git a/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.en.md new file mode 100755 index 00000000..02deb6f7 --- /dev/null +++ b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.en.md @@ -0,0 +1,18 @@ +--- +title: 'GNU/Linux' +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|![](gnu_linux.png)| +|:--:| +|Nextcloud integrates with GNU/Linux greatly. Below you can find useful links that will help you get everything up and running.| + + ## Table of content + - [Syncing files with desktop client](desktop-sync-client) + - [GNOME: Desktop Integration](gnome-desktop-integration) + - [KDE: Desktop Integration](kde-desktop-integration) + - [News app: Syncing with your desktop](news-app-syncing) diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.es.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.es.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.pt.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/docs.pt.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.en.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.es.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.es.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.pt.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/docs.pt.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_calendar1.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_calendar1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_calendar1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_calendar1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_calendar2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_calendar2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_calendar2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_calendar2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_calendar3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_calendar3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_calendar3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_calendar3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_contacts1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_contacts1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_contacts1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_contacts1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_contacts2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_contacts2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_contacts2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_contacts2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_files1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_files1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_files1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_files1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_install_calendar.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_install_calendar.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_install_calendar.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_install_calendar.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_mail.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_mail.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_mail.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_mail.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_mail2.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_mail2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_mail2.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_mail2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_news1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_news1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_news1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_news1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_news2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_news2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_news2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_news2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_news3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_news3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_news3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_news3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_online_accounts1.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_online_accounts1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_online_accounts1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_online_accounts1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_tasks1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_tasks1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_tasks1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_tasks1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_tasks2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_tasks2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_tasks2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_tasks2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_tasks3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_tasks3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/en/gnome_tasks3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/en/gnome_tasks3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_calendar1.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_calendar1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_calendar1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_calendar1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_calendar2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_calendar2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_calendar2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_calendar2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_calendar3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_calendar3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_calendar3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_calendar3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_contacts1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_contacts1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_contacts1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_contacts1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_contacts2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_contacts2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_contacts2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_contacts2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_files1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_files1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_files1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_files1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_install_calendar.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_install_calendar.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_install_calendar.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_install_calendar.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_mail.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_mail.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_mail.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_mail.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_mail2.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_mail2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_mail2.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_mail2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_news1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_news1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_news1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_news1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_news2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_news2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_news2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_news2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_news3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_news3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_news3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_news3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_online_accounts1.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_online_accounts1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_online_accounts1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_online_accounts1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_tasks1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_tasks1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_tasks1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_tasks1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_tasks2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_tasks2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_tasks2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_tasks2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_tasks3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_tasks3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/gnome-desktop-integration/pt/gnome_tasks3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnome-desktop-integration/pt/gnome_tasks3.gif diff --git a/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnu_linux.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnu_linux.png new file mode 100644 index 00000000..d4a21355 Binary files /dev/null and b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/gnu_linux.png differ diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/docs.en.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/docs.fr.md b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/docs.fr.md rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_files1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_files1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_files1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_files1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_files2.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_files2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_files2.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_files2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_files3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_files3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_files3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_files3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook4.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook4.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kaddressbook4.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kaddressbook4.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kalendar1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kalendar1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kalendar1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kalendar1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kalendar2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kalendar2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kalendar2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kalendar2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kmail1.png b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kmail1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_kmail1.png rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_kmail1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_tasks1.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_tasks1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/en/kde_tasks1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/en/kde_tasks1.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_files3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_files3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_files3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_files3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kaddressbook2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kaddressbook2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kaddressbook2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kaddressbook2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kaddressbook3.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kaddressbook3.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kaddressbook3.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kaddressbook3.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kaddressbook4.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kaddressbook4.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kaddressbook4.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kaddressbook4.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kalendar2.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kalendar2.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_kalendar2.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_kalendar2.gif diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_tasks1.gif b/pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_tasks1.gif similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/02.Linux/kde-desktop-integration/es/kde_tasks1.gif rename to pages/03.Cloud/04.Clients/01.Desktop/02.GNU-Linux/kde-desktop-integration/es/kde_tasks1.gif diff --git a/pages/03.Cloud/04.Clients/01.Desktop/docs.en.md b/pages/03.Cloud/04.Clients/01.Desktop/docs.en.md new file mode 100644 index 00000000..2c2d25a0 --- /dev/null +++ b/pages/03.Cloud/04.Clients/01.Desktop/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud: Desktop Clients +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Environment + +|[Desktop](multiplatform)|[GNU/Linux](gnu-linux)| +|:--:|:--:| +|Multiplatform Clients
|Desktop Clients & Integration| diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.es.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.es.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_add_account1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_add_account1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_add_account1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_add_account1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_download1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_download1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_download1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_download1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_download2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_download2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_download2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_download2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_login.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_login.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_login.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_login.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_main1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_main1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_main1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_main1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_main2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_main2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_main2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_main2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_settings1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_settings1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_settings1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_settings1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_settings2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_settings2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_settings2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_settings2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_settings3.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_settings3.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_settings3.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_settings3.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_share1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_share1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_share1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_share1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_upload1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_upload1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/en/nextcloud_app_upload1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/en/nextcloud_app_upload1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_login1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_login1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_login1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_login1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_login2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_login2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_login2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_login2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_login3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_login3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_login3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_login3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_main1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_main1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_main1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_main1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_main2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_main2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_main2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_main2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_main3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_main3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_main3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_main3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings0.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings0.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings0.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings0.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/es/nextcloud_app_settings2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/es/nextcloud_app_settings2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_add_account1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_add_account1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_add_account1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_add_account1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_add_account1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_add_account1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_add_account1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_add_account1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send4.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send4.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send5.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_auto_send5.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_auto_send5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_download1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_download1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_download1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_download1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_download2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_download2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_download2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_download2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_login1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_login1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_login1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_login1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_login2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_login2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_login2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_login2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_login3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_login3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_login3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_login3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_main1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_main1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_main1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_main1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_main2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_main2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_main2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_main2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_password1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_password1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_password1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_password1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_password2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_password2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_password2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_password2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_settings1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_settings1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_settings1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_settings1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_settings2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_settings2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_settings2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_settings2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share4.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_share4.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_share4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_upload1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_upload1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Nextcloud-app/pt/nextcloud_app_upload1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Nextcloud-app/pt/nextcloud_app_upload1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes10.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes10.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes10.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes10.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes11.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes11.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes11.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes11.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes4.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes4.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes4.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes4.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes5.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes5.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes6.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes6.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes7.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes7.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes7.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes7.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes8.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes8.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes8.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes8.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes9.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes9.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/en/nextcloud_notes9.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/en/nextcloud_notes9.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes10.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes10.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes10.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes10.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes11.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes11.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes11.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes11.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes4.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes4.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes5.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes5.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes6.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes6.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes6.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes6.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes7.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes7.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes7.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes7.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes8.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes8.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes8.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes8.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes9.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes9.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/Using-notes/pt/nextcloud_notes9.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/Using-notes/pt/nextcloud_notes9.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/android.jpg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/android.jpg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/android.jpg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/android.jpg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.es.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.es.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid3.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid3.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid3.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid3.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid4.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid4.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid4.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_davdroid4.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_tasks1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_tasks1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_tasks1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_tasks1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_tasks2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_tasks2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/en/nextcloud_tasks2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/en/nextcloud_tasks2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/Screenshot_2017-12-09-16-18-09.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/Screenshot_2017-12-09-16-18-09.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/Screenshot_2017-12-09-16-18-09.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/Screenshot_2017-12-09-16-18-09.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid3.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid3.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid3.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid3.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid4.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid4.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid4.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_davdroid4.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_tasks1.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_tasks1.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_tasks1.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_tasks1.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_tasks2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_tasks2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/es/nextcloud_tasks2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/es/nextcloud_tasks2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid4.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid4.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_davdroid4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.jpeg b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.jpeg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.jpeg rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.jpeg diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/calendars-contacts-and-tasks/pt/nextcloud_tasks2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/migrating-contacts-from-google/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/migrating-contacts-from-google/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/migrating-contacts-from-google/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/migrating-contacts-from-google/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/migrating-contacts-from-google/docs.es.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/migrating-contacts-from-google/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/migrating-contacts-from-google/docs.es.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/migrating-contacts-from-google/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/migrating-contacts-from-google/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/migrating-contacts-from-google/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/migrating-contacts-from-google/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/migrating-contacts-from-google/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news4.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news4.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news5.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/en/nextcloud_news5.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/en/nextcloud_news5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news1.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news1.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news2.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news2.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news3.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news3.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news4.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news4.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news5.png b/pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news5.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/03.Android/using-news/pt/nextcloud_news5.png rename to pages/03.Cloud/04.Clients/02.Mobile/01.Android/using-news/pt/nextcloud_news5.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/en/ios_calendar1.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/en/ios_calendar1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/en/ios_calendar1.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/en/ios_calendar1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/en/ios_calendar2.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/en/ios_calendar2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/en/ios_calendar2.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/en/ios_calendar2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/en/ios_calendar3.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/en/ios_calendar3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/calendar-syncing/en/ios_calendar3.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/calendar-syncing/en/ios_calendar3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/en/ios_contacts1.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/en/ios_contacts1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/en/ios_contacts1.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/en/ios_contacts1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/en/ios_contacts2.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/en/ios_contacts2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/en/ios_contacts2.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/en/ios_contacts2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/en/ios_contacts3.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/en/ios_contacts3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/contact-syncing/en/ios_contacts3.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/contact-syncing/en/ios_contacts3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/ios.png b/pages/03.Cloud/04.Clients/02.Mobile/02.iOS/ios.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/04.iOS/ios.png rename to pages/03.Cloud/04.Clients/02.Mobile/02.iOS/ios.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar1.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar1.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar2.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar2.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar3.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar3.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar4.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar4.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/calendar-syncing/en/macos_calendar4.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/calendar-syncing/en/macos_calendar4.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/en/macos_contacts1.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/en/macos_contacts1.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/en/macos_contacts1.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/en/macos_contacts1.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/en/macos_contacts2.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/en/macos_contacts2.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/en/macos_contacts2.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/en/macos_contacts2.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/en/macos_contacts3.png b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/en/macos_contacts3.png similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/contact-syncing/en/macos_contacts3.png rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/contact-syncing/en/macos_contacts3.png diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/docs.en.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/docs.en.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/docs.en.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/docs.pt.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/macos.jpg b/pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/macos.jpg similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/05.Mac-OS/macos.jpg rename to pages/03.Cloud/04.Clients/02.Mobile/03.Mac-OS/macos.jpg diff --git a/pages/03.Cloud/04.Clients/02.Mobile/docs.en.md b/pages/03.Cloud/04.Clients/02.Mobile/docs.en.md new file mode 100755 index 00000000..009ef2cc --- /dev/null +++ b/pages/03.Cloud/04.Clients/02.Mobile/docs.en.md @@ -0,0 +1,14 @@ +--- +title: 'Cloud: Mobile Clients' +taxonomy: + category: + - docs +page-toc: + active: false +--- +## Syncing your devices + +Nextcloud integrates with your device very easily, providing native experience for most devices and operating systems. +Here in Disroot we are trying to include and document all of them to make it easy for anyone to get up and running. + +If you would like to help us, your contribution is more than welcome. diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/docs.es.md b/pages/03.Cloud/04.Clients/02.Mobile/docs.es.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/docs.es.md rename to pages/03.Cloud/04.Clients/02.Mobile/docs.es.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/docs.fr.md b/pages/03.Cloud/04.Clients/02.Mobile/docs.fr.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/docs.fr.md rename to pages/03.Cloud/04.Clients/02.Mobile/docs.fr.md diff --git a/pages/02.nextcloud/03.sync-with-your-cloud/docs.pt.md b/pages/03.Cloud/04.Clients/02.Mobile/docs.pt.md similarity index 100% rename from pages/02.nextcloud/03.sync-with-your-cloud/docs.pt.md rename to pages/03.Cloud/04.Clients/02.Mobile/docs.pt.md diff --git a/pages/03.Cloud/04.Clients/docs.en.md b/pages/03.Cloud/04.Clients/docs.en.md new file mode 100644 index 00000000..bdc8fd61 --- /dev/null +++ b/pages/03.Cloud/04.Clients/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Cloud: Clients +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Environment / Device + +|[Desktop](desktop)|[Mobile](mobile)| +|:--:|:--:| +|Desktop Clients & Integration|Syncing your devices| diff --git a/pages/03.Cloud/docs.en.md b/pages/03.Cloud/docs.en.md new file mode 100755 index 00000000..223538dd --- /dev/null +++ b/pages/03.Cloud/docs.en.md @@ -0,0 +1,22 @@ +--- +title: Cloud +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](/start/icons/nc_logo.png)| +|:--:| +|**Nextcloud** is Disroot's core service and the main user interface we try to integrate with most of the apps we offer. In this how2 we would like to go through the basics of the interface, explaining the main UI (User interface) concept, as well as some basic actions on files and personal settings.| +
+ +## What is Nextcloud? +Nextcloud is a free and open source software that allows you to upload and storage files on a server (it could be a server of your own), syncing them with different devices to which you can safely access from anywhere via internet. In addition, Nextcloud provides some interesting and useful features like calendars, contacts and bookmarks synchronization, call/video conference and news feeder.
+ +---------- + +|[Web](introduction)|[Desktop](/cloud/clients/desktop)|[Mobile](/cloud/clients/mobile)| +|:--:|:--:|:--:| +|01.General Overview
02.Settings
03.Files management
04.Apps|01.Desktop Clients & Integration
02.Apps|01.Syncing your devices
02.Apps| diff --git a/pages/02.nextcloud/docs.es.md b/pages/03.Cloud/docs.es.md similarity index 100% rename from pages/02.nextcloud/docs.es.md rename to pages/03.Cloud/docs.es.md diff --git a/pages/02.nextcloud/docs.fr.md b/pages/03.Cloud/docs.fr.md similarity index 100% rename from pages/02.nextcloud/docs.fr.md rename to pages/03.Cloud/docs.fr.md diff --git a/pages/02.nextcloud/docs.it.md b/pages/03.Cloud/docs.it.md similarity index 100% rename from pages/02.nextcloud/docs.it.md rename to pages/03.Cloud/docs.it.md diff --git a/pages/02.nextcloud/docs.pt.md b/pages/03.Cloud/docs.pt.md similarity index 100% rename from pages/02.nextcloud/docs.pt.md rename to pages/03.Cloud/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/c64.jpg b/pages/03.Email/01.Email-Clients/01.Desktop/c64.jpg deleted file mode 100755 index fe0db08a..00000000 Binary files a/pages/03.Email/01.Email-Clients/01.Desktop/c64.jpg and /dev/null differ diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/docs.en.md b/pages/03.Email/01.Email-Clients/01.Desktop/docs.en.md deleted file mode 100755 index 75de6ac9..00000000 --- a/pages/03.Email/01.Email-Clients/01.Desktop/docs.en.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: 'Desktop clients' -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -How to setup your email on your desktop: - -## Table of content -- [Thunderbird - multiplatform email client](thunderbird) - -![](c64.jpg) diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/docs.en.md b/pages/03.Email/01.Email-Clients/02.Mobile/docs.en.md deleted file mode 100755 index 3d4f57bc..00000000 --- a/pages/03.Email/01.Email-Clients/02.Mobile/docs.en.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -title: 'Mobile Clients' -taxonomy: - category: - - docs -page-toc: - active: false ---- - -How to setup your email with your mobile device: - -## Table of content - - [K9 - Android Email App](androidk9) - - [SailfishOS](sailfishos) - - [iOS](ios) - -![](mobile.jpg) diff --git a/pages/03.Email/01.Email-Clients/docs.en.md b/pages/03.Email/01.Email-Clients/docs.en.md deleted file mode 100755 index 32394ea2..00000000 --- a/pages/03.Email/01.Email-Clients/docs.en.md +++ /dev/null @@ -1,19 +0,0 @@ ---- -title: How to setup Email Clients -taxonomy: - category: - - docs -page-toc: - active: false ---- - -This section is dedicated to get you off the stupid webmail crap and onto truly productive, native experience on your device. - -If your favorite mail client isn't listed, just follow the general server settings to get up and running. Setting mail clients is pretty straight forward and easy (unless using outlook but who cares about that:) - -``` -IMAP: disroot.org | SSL Port 993 | Authentication: Normal Password -SMTP: disroot.org | STARTTLS Port 587 | Authentication: Normal Password -POP: disroot.org | SSL Port 995 | Authentication: Normal Password -``` -In case you would like to see a tutorial on setting up client of your choice that isn't listed yet, consider writing up a short howto and share it with the community. diff --git a/pages/03.Email/02.identities/docs.en.md b/pages/03.Email/02.identities/docs.en.md deleted file mode 100755 index c61b7560..00000000 --- a/pages/03.Email/02.identities/docs.en.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: How to setup mail alias -taxonomy: - category: - - docs -page-toc: - active: false ---- - -Once you requested email aliases using the [form](https://disroot.org/forms/alias-request-form). You need to set them up. Below you can find how to do it on various email clients. - -## Table of contents -- [Webmail](webmail) -- [Thunderbird](thunderbird) -- [K9](k9) diff --git a/pages/03.Email/03.Filters/01.forward/docs.en.md b/pages/03.Email/03.Filters/01.forward/docs.en.md deleted file mode 100755 index 9f78cf7c..00000000 --- a/pages/03.Email/03.Filters/01.forward/docs.en.md +++ /dev/null @@ -1,64 +0,0 @@ ---- -title: Forward emails from disroot to your primary email -published: true -visible: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -We understand that not everyone wants to use disroot mail as their daily driver. People have their mail accounts for years and it is hard, not practical or in some cases even impossible for them to switch to another provider such as disroot. - -However, there are important information you should not miss out on. - - - Get notifications for forum and nextcloud. Those services are tight to disroot email and you cannot change it. - - To be up to date with what's going on in dirsoot. Every three /six weeks we are sending email to all users informing them about recent developments, new features and services. We are also sending information about scheduled downtime of services if they are longer then 20 min. We have no intention to spam you with too much information so don't worry about that. - -In this short howto I would like to show you how to forward your disroot emails to your preferred email address -(it should take you no more then 3 minutes to get this setup). - -## Steps needed to forward your mail - -1. **Login to webmail** (https://mail.disroot.org) - - -![](en/login.jpg) - - -2. **Go to Settings** (hit the 'gear' icon on bottom left of the window) - - -![](en/webmail1.jpg) - - -3. Once in Settings **Hit Filter Tab.** -Filters help you manage your emails. Based on your filer conditions, you can move, copy, forward any email automatically. This is quite straight forward so if you want to setup some extra filters just look around. Here I'll show you how to setup forwarding filter for all your mail. - - -![](en/settings1.jpg) - - -4. **Click on 'Add new Filter" icon.** -You will be presented with dialog window that guides you through the setup. - - -![](en/filters1.jpg) - -5. **Fill in your filter rule.** - - -![](en/filters2.jpg) - - - - Give your filter a name - - If no conditions specified, filter will apply to all incoming emails, which is what we want, so **do not add any conditions** for that filter. - - From "**Action**" Dropdown menu select "**Forward to**" option, and add email address you want all emails to be forwarded to. - - Once you are done, hit the "**Done**" button. - - In order for the filter to be set to active you need to "**Save**" it. - - -![](en/filters3.jpg) - -###Voila! From now on all your emails to disroot account will be forwarded to your preferred email address. If you ever decide to actually switch to disroot mail as your main email address just simply remove that rule or alter it to your liking. diff --git a/pages/03.Email/03.Filters/docs.en.md b/pages/03.Email/03.Filters/docs.en.md deleted file mode 100755 index 9ebd194a..00000000 --- a/pages/03.Email/03.Filters/docs.en.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -title: Email Filters -published: true -visible: true -taxonomy: - category: - - docs ---- - -Email Filters allow you to manage incoming mails in automated fashion such as moving incoming mail to a directory based on certain criteria, setting up out-of-office/holiday auotreply, automatically reject or forward emails etc. - -In this section we will cover the basics based on some scenarios. diff --git a/pages/03.Email/docs.en.md b/pages/03.Email/docs.en.md deleted file mode 100755 index c6555977..00000000 --- a/pages/03.Email/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Email -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/04.Communication/01.Email/01.Webmail/docs.en.md b/pages/04.Communication/01.Email/01.Webmail/docs.en.md new file mode 100644 index 00000000..a7a97579 --- /dev/null +++ b/pages/04.Communication/01.Email/01.Webmail/docs.en.md @@ -0,0 +1,11 @@ +--- +title: Webmail +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# Webmail diff --git a/pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.en.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.en.md new file mode 100755 index 00000000..dcb4b7e9 --- /dev/null +++ b/pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.en.md @@ -0,0 +1,15 @@ +--- +title: 'Email: Desktop clients' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +How2 setup your email on your desktop: + +## Clients +- [Thunderbird: multiplatform email client](thunderbird) diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/docs.es.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.en.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.en.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.en.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.en.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.es.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup1.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup1.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup1.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup1.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup2.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup2.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup2.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup2.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup3.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup3.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup3.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup4.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup4.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup4.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup5.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/en/thunderbird_setup5.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/en/thunderbird_setup5.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/es/thunderbird_setup3.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/es/thunderbird_setup3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/es/thunderbird_setup3.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/es/thunderbird_setup3.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/es/thunderbird_setup4.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/es/thunderbird_setup4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/es/thunderbird_setup4.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/es/thunderbird_setup4.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/es/thunderbird_setup5.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/es/thunderbird_setup5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/es/thunderbird_setup5.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/es/thunderbird_setup5.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.gif b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.gif similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.gif rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.gif diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup1.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup2.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup2.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup2.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup2.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup3.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup3.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup3.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup4.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup4.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup4.png diff --git a/pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup5.png b/pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/01.Desktop/thunderbird/pt/thunderbird_setup5.png rename to pages/04.Communication/01.Email/02.Clients/01.Desktop/thunderbird/pt/thunderbird_setup5.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.en.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.en.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.en.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.en.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.es.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_1.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_1.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_1.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_1.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_2.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_2.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_2.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_2.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_3.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_3.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_3.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_4.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_4.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_4.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_5.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_5.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_5.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_6.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_6.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/en/android-k9_6.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/en/android-k9_6.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_1.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_1.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_1.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_1.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_2.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_2.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_2.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_2.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_3.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_3.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_3.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_4.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_4.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_4.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_5.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_5.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_5.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_6.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_6.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/es/android-k9_6.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/es/android-k9_6.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/IMG_20171118_173032_1.jpg b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/IMG_20171118_173032_1.jpg similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/IMG_20171118_173032_1.jpg rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/IMG_20171118_173032_1.jpg diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_1.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_1.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_1.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_1.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_2.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_2.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_2.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_2.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_21.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_21.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_21.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_21.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_3.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_3.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_3.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_3ç.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_3ç.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_3ç.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_3ç.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_4.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_4.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_4.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_5.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_5.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_5.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_6.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_6.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/androidk9/pt/android-k9_6.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/01.k9/pt/android-k9_6.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.en.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.en.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.en.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.en.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.es.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail1.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail1.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail1.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail1.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail2.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail2.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail2.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail2.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail3.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail3.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail3.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail3.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail4.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail4.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail4.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail4.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail5.png b/pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail5.png similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/sailfishos/en/sailfish_mail5.png rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/02.sailfishos/en/sailfish_mail5.png diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.en.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.en.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.en.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.en.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.es.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail1.PNG b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail1.PNG similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail1.PNG rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail1.PNG diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail2.PNG b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail2.PNG similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail2.PNG rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail2.PNG diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail3.PNG b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail3.PNG similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail3.PNG rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail3.PNG diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail4.PNG b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail4.PNG similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail4.PNG rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail4.PNG diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail5.PNG b/pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail5.PNG similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/ios/en/ios_mail5.PNG rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/03.ios/en/ios_mail5.PNG diff --git a/pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.en.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.en.md new file mode 100755 index 00000000..946af137 --- /dev/null +++ b/pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.en.md @@ -0,0 +1,16 @@ +--- +title: 'Email: Mobile Clients' +taxonomy: + category: + - docs +page-toc: + active: false +--- + +How2 setup your email with your mobile device: + +## Clients + +|**Android**|**SailfishOS**|**iOS**| +|:--:|:--:|:--:| +|**[K9](k9)**|**[Mail App](sailfishos)**|**[Mail App](ios)**| diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/docs.es.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/docs.pt.md diff --git a/pages/03.Email/01.Email-Clients/02.Mobile/mobile.jpg b/pages/04.Communication/01.Email/02.Clients/02.Mobile/mobile.jpg similarity index 100% rename from pages/03.Email/01.Email-Clients/02.Mobile/mobile.jpg rename to pages/04.Communication/01.Email/02.Clients/02.Mobile/mobile.jpg diff --git a/pages/04.Communication/01.Email/02.Clients/docs.en.md b/pages/04.Communication/01.Email/02.Clients/docs.en.md new file mode 100755 index 00000000..59477c62 --- /dev/null +++ b/pages/04.Communication/01.Email/02.Clients/docs.en.md @@ -0,0 +1,26 @@ +--- +title: Email Settings +taxonomy: + category: + - docs +page-toc: + active: false +--- + +This is the information you need if you want to configure an email client. + +|IMAP|SSL Port| Authentication| +|:--:|:--:|:--:| +|disroot.org|993|Normal Password| + +
+ +|SMTP|STARTTLS Port|Authentication| +|:--:|:--:|:--:| +|disroot.org|587|Normal Password| + +
+ +|POP |SSL Port|Authentication| +|:--:|:--:|:--:| +|disroot.org|995|Normal Password| diff --git a/pages/03.Email/01.Email-Clients/docs.es.md b/pages/04.Communication/01.Email/02.Clients/docs.es.md similarity index 100% rename from pages/03.Email/01.Email-Clients/docs.es.md rename to pages/04.Communication/01.Email/02.Clients/docs.es.md diff --git a/pages/03.Email/01.Email-Clients/docs.fr.md b/pages/04.Communication/01.Email/02.Clients/docs.fr.md similarity index 100% rename from pages/03.Email/01.Email-Clients/docs.fr.md rename to pages/04.Communication/01.Email/02.Clients/docs.fr.md diff --git a/pages/03.Email/01.Email-Clients/docs.pt.md b/pages/04.Communication/01.Email/02.Clients/docs.pt.md similarity index 100% rename from pages/03.Email/01.Email-Clients/docs.pt.md rename to pages/04.Communication/01.Email/02.Clients/docs.pt.md diff --git a/pages/03.Email/02.identities/webmail/docs.en.md b/pages/04.Communication/01.Email/03.Alias/01.webmail/docs.en.md similarity index 100% rename from pages/03.Email/02.identities/webmail/docs.en.md rename to pages/04.Communication/01.Email/03.Alias/01.webmail/docs.en.md diff --git a/pages/03.Email/02.identities/webmail/docs.es.md b/pages/04.Communication/01.Email/03.Alias/01.webmail/docs.es.md similarity index 100% rename from pages/03.Email/02.identities/webmail/docs.es.md rename to pages/04.Communication/01.Email/03.Alias/01.webmail/docs.es.md diff --git a/pages/03.Email/02.identities/webmail/docs.fr.md b/pages/04.Communication/01.Email/03.Alias/01.webmail/docs.fr.md similarity index 100% rename from pages/03.Email/02.identities/webmail/docs.fr.md rename to pages/04.Communication/01.Email/03.Alias/01.webmail/docs.fr.md diff --git a/pages/03.Email/02.identities/webmail/docs.pt.md b/pages/04.Communication/01.Email/03.Alias/01.webmail/docs.pt.md similarity index 100% rename from pages/03.Email/02.identities/webmail/docs.pt.md rename to pages/04.Communication/01.Email/03.Alias/01.webmail/docs.pt.md diff --git a/pages/03.Email/02.identities/webmail/en/identity_add.gif b/pages/04.Communication/01.Email/03.Alias/01.webmail/en/identity_add.gif similarity index 100% rename from pages/03.Email/02.identities/webmail/en/identity_add.gif rename to pages/04.Communication/01.Email/03.Alias/01.webmail/en/identity_add.gif diff --git a/pages/03.Email/02.identities/webmail/en/identity_default.gif b/pages/04.Communication/01.Email/03.Alias/01.webmail/en/identity_default.gif similarity index 100% rename from pages/03.Email/02.identities/webmail/en/identity_default.gif rename to pages/04.Communication/01.Email/03.Alias/01.webmail/en/identity_default.gif diff --git a/pages/03.Email/02.identities/webmail/en/identity_send.gif b/pages/04.Communication/01.Email/03.Alias/01.webmail/en/identity_send.gif similarity index 100% rename from pages/03.Email/02.identities/webmail/en/identity_send.gif rename to pages/04.Communication/01.Email/03.Alias/01.webmail/en/identity_send.gif diff --git a/pages/03.Email/02.identities/webmail/en/settings1.png b/pages/04.Communication/01.Email/03.Alias/01.webmail/en/settings1.png similarity index 100% rename from pages/03.Email/02.identities/webmail/en/settings1.png rename to pages/04.Communication/01.Email/03.Alias/01.webmail/en/settings1.png diff --git a/pages/03.Email/02.identities/webmail/pt/identity_add.gif b/pages/04.Communication/01.Email/03.Alias/01.webmail/pt/identity_add.gif similarity index 100% rename from pages/03.Email/02.identities/webmail/pt/identity_add.gif rename to pages/04.Communication/01.Email/03.Alias/01.webmail/pt/identity_add.gif diff --git a/pages/03.Email/02.identities/webmail/pt/identity_default.gif b/pages/04.Communication/01.Email/03.Alias/01.webmail/pt/identity_default.gif similarity index 100% rename from pages/03.Email/02.identities/webmail/pt/identity_default.gif rename to pages/04.Communication/01.Email/03.Alias/01.webmail/pt/identity_default.gif diff --git a/pages/03.Email/02.identities/webmail/pt/identity_send.gif b/pages/04.Communication/01.Email/03.Alias/01.webmail/pt/identity_send.gif similarity index 100% rename from pages/03.Email/02.identities/webmail/pt/identity_send.gif rename to pages/04.Communication/01.Email/03.Alias/01.webmail/pt/identity_send.gif diff --git a/pages/03.Email/02.identities/webmail/pt/settings1.png b/pages/04.Communication/01.Email/03.Alias/01.webmail/pt/settings1.png similarity index 100% rename from pages/03.Email/02.identities/webmail/pt/settings1.png rename to pages/04.Communication/01.Email/03.Alias/01.webmail/pt/settings1.png diff --git a/pages/03.Email/02.identities/thunderbird/docs.en.md b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.en.md similarity index 100% rename from pages/03.Email/02.identities/thunderbird/docs.en.md rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.en.md diff --git a/pages/03.Email/02.identities/thunderbird/docs.es.md b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.es.md similarity index 100% rename from pages/03.Email/02.identities/thunderbird/docs.es.md rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.es.md diff --git a/pages/03.Email/02.identities/thunderbird/docs.fr.md b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.fr.md similarity index 100% rename from pages/03.Email/02.identities/thunderbird/docs.fr.md rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.fr.md diff --git a/pages/03.Email/02.identities/thunderbird/docs.pt.md b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.pt.md similarity index 100% rename from pages/03.Email/02.identities/thunderbird/docs.pt.md rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/docs.pt.md diff --git a/pages/03.Email/02.identities/thunderbird/en/identity_add.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_add.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/en/identity_add.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_add.gif diff --git a/pages/03.Email/02.identities/thunderbird/en/identity_default.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_default.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/en/identity_default.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_default.gif diff --git a/pages/03.Email/02.identities/thunderbird/en/identity_send.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_send.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/en/identity_send.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_send.gif diff --git a/pages/03.Email/02.identities/thunderbird/en/identity_settings.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_settings.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/en/identity_settings.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_settings.gif diff --git a/pages/03.Email/02.identities/thunderbird/en/identity_settings.png b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_settings.png similarity index 100% rename from pages/03.Email/02.identities/thunderbird/en/identity_settings.png rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/en/identity_settings.png diff --git a/pages/03.Email/02.identities/thunderbird/es/identity_add.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/es/identity_add.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/es/identity_add.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/es/identity_add.gif diff --git a/pages/03.Email/02.identities/thunderbird/es/identity_settings.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/es/identity_settings.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/es/identity_settings.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/es/identity_settings.gif diff --git a/pages/03.Email/02.identities/thunderbird/pt/identity_add.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_add.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/pt/identity_add.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_add.gif diff --git a/pages/03.Email/02.identities/thunderbird/pt/identity_default.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_default.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/pt/identity_default.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_default.gif diff --git a/pages/03.Email/02.identities/thunderbird/pt/identity_send.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_send.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/pt/identity_send.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_send.gif diff --git a/pages/03.Email/02.identities/thunderbird/pt/identity_settings.gif b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_settings.gif similarity index 100% rename from pages/03.Email/02.identities/thunderbird/pt/identity_settings.gif rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_settings.gif diff --git a/pages/03.Email/02.identities/thunderbird/pt/identity_settings.png b/pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_settings.png similarity index 100% rename from pages/03.Email/02.identities/thunderbird/pt/identity_settings.png rename to pages/04.Communication/01.Email/03.Alias/02.thunderbird/pt/identity_settings.png diff --git a/pages/03.Email/02.identities/k9/docs.en.md b/pages/04.Communication/01.Email/03.Alias/03.k9/docs.en.md similarity index 100% rename from pages/03.Email/02.identities/k9/docs.en.md rename to pages/04.Communication/01.Email/03.Alias/03.k9/docs.en.md diff --git a/pages/03.Email/02.identities/k9/docs.es.md b/pages/04.Communication/01.Email/03.Alias/03.k9/docs.es.md similarity index 100% rename from pages/03.Email/02.identities/k9/docs.es.md rename to pages/04.Communication/01.Email/03.Alias/03.k9/docs.es.md diff --git a/pages/03.Email/02.identities/k9/docs.fr.md b/pages/04.Communication/01.Email/03.Alias/03.k9/docs.fr.md similarity index 100% rename from pages/03.Email/02.identities/k9/docs.fr.md rename to pages/04.Communication/01.Email/03.Alias/03.k9/docs.fr.md diff --git a/pages/03.Email/02.identities/k9/docs.pt.md b/pages/04.Communication/01.Email/03.Alias/03.k9/docs.pt.md similarity index 100% rename from pages/03.Email/02.identities/k9/docs.pt.md rename to pages/04.Communication/01.Email/03.Alias/03.k9/docs.pt.md diff --git a/pages/03.Email/02.identities/k9/en/identity_settings.png b/pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings.png similarity index 100% rename from pages/03.Email/02.identities/k9/en/identity_settings.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings.png diff --git a/pages/03.Email/02.identities/k9/en/identity_settings2.png b/pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings2.png similarity index 100% rename from pages/03.Email/02.identities/k9/en/identity_settings2.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings2.png diff --git a/pages/03.Email/02.identities/k9/en/identity_settings3.png b/pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings3.png similarity index 100% rename from pages/03.Email/02.identities/k9/en/identity_settings3.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings3.png diff --git a/pages/03.Email/02.identities/k9/en/identity_settings4.png b/pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings4.png similarity index 100% rename from pages/03.Email/02.identities/k9/en/identity_settings4.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings4.png diff --git a/pages/03.Email/02.identities/k9/en/identity_settings5.png b/pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings5.png similarity index 100% rename from pages/03.Email/02.identities/k9/en/identity_settings5.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/en/identity_settings5.png diff --git a/pages/03.Email/02.identities/k9/es/identity_settings.png b/pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings.png similarity index 100% rename from pages/03.Email/02.identities/k9/es/identity_settings.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings.png diff --git a/pages/03.Email/02.identities/k9/es/identity_settings2.png b/pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings2.png similarity index 100% rename from pages/03.Email/02.identities/k9/es/identity_settings2.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings2.png diff --git a/pages/03.Email/02.identities/k9/es/identity_settings3.png b/pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings3.png similarity index 100% rename from pages/03.Email/02.identities/k9/es/identity_settings3.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings3.png diff --git a/pages/03.Email/02.identities/k9/es/identity_settings4.png b/pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings4.png similarity index 100% rename from pages/03.Email/02.identities/k9/es/identity_settings4.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings4.png diff --git a/pages/03.Email/02.identities/k9/es/identity_settings5.png b/pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings5.png similarity index 100% rename from pages/03.Email/02.identities/k9/es/identity_settings5.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/es/identity_settings5.png diff --git a/pages/03.Email/02.identities/k9/pt/identity_settings.png b/pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings.png similarity index 100% rename from pages/03.Email/02.identities/k9/pt/identity_settings.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings.png diff --git a/pages/03.Email/02.identities/k9/pt/identity_settings2.png b/pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings2.png similarity index 100% rename from pages/03.Email/02.identities/k9/pt/identity_settings2.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings2.png diff --git a/pages/03.Email/02.identities/k9/pt/identity_settings3.png b/pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings3.png similarity index 100% rename from pages/03.Email/02.identities/k9/pt/identity_settings3.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings3.png diff --git a/pages/03.Email/02.identities/k9/pt/identity_settings4.png b/pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings4.png similarity index 100% rename from pages/03.Email/02.identities/k9/pt/identity_settings4.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings4.png diff --git a/pages/03.Email/02.identities/k9/pt/identity_settings5.png b/pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings5.png similarity index 100% rename from pages/03.Email/02.identities/k9/pt/identity_settings5.png rename to pages/04.Communication/01.Email/03.Alias/03.k9/pt/identity_settings5.png diff --git a/pages/04.Communication/01.Email/03.Alias/docs.en.md b/pages/04.Communication/01.Email/03.Alias/docs.en.md new file mode 100755 index 00000000..8536a1f1 --- /dev/null +++ b/pages/04.Communication/01.Email/03.Alias/docs.en.md @@ -0,0 +1,15 @@ +--- +title: How2 setup email alias +taxonomy: + category: + - docs +page-toc: + active: false +--- + +Once you requested email aliases using this [form](https://disroot.org/forms/alias-request-form), you'll need to set them up. Below you can find how to do it on various email clients. + +## Table of contents +- [Webmail](webmail) +- [Thunderbird](thunderbird) +- [K9](k9) diff --git a/pages/03.Email/02.identities/docs.es.md b/pages/04.Communication/01.Email/03.Alias/docs.es.md similarity index 100% rename from pages/03.Email/02.identities/docs.es.md rename to pages/04.Communication/01.Email/03.Alias/docs.es.md diff --git a/pages/03.Email/02.identities/docs.fr.md b/pages/04.Communication/01.Email/03.Alias/docs.fr.md similarity index 100% rename from pages/03.Email/02.identities/docs.fr.md rename to pages/04.Communication/01.Email/03.Alias/docs.fr.md diff --git a/pages/03.Email/02.identities/docs.pt.md b/pages/04.Communication/01.Email/03.Alias/docs.pt.md similarity index 100% rename from pages/03.Email/02.identities/docs.pt.md rename to pages/04.Communication/01.Email/03.Alias/docs.pt.md diff --git a/pages/04.Communication/01.Email/04.Filters/01.forward/docs.en.md b/pages/04.Communication/01.Email/04.Filters/01.forward/docs.en.md new file mode 100755 index 00000000..4ecd54fb --- /dev/null +++ b/pages/04.Communication/01.Email/04.Filters/01.forward/docs.en.md @@ -0,0 +1,64 @@ +--- +title: Forward emails from Disroot to your primary email +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +We understand that not everyone wants to use Disroot mail as their daily driver. People have their mail accounts for years and it is hard, not practical or in some cases even impossible for them to switch to another provider such as Disroot. + +However, there are important information you should not miss out on. + + - Get notifications for forum and nextcloud. Those services are tight to disroot email and you cannot change it. + - To be up to date with what's going on in Dirsoot. Every three /six weeks we are sending email to all users informing them about recent developments, new features and services. We are also sending information about scheduled downtime of services if they are longer then 20 min. We have no intention to spam you with too much information so don't worry about that. + +In this short howto I would like to show you how to forward your disroot emails to your preferred email address +(it should take you no more then 3 minutes to get this setup). + +## Steps needed to forward your mail + +1. **Login to webmail** (https://mail.disroot.org) + + +![](en/login.jpg) + + +2. **Go to Settings** (hit the 'gear' icon on bottom left of the window) + + +![](en/webmail1.jpg) + + +3. Once in Settings **Hit Filter Tab.** +Filters help you manage your emails. Based on your filer conditions, you can move, copy, forward any email automatically. This is quite straight forward so if you want to setup some extra filters just look around. Here I'll show you how to setup forwarding filter for all your mail. + + +![](en/settings1.jpg) + + +4. **Click on 'Add new Filter" icon.** +You will be presented with dialog window that guides you through the setup. + + +![](en/filters1.jpg) + +5. **Fill in your filter rule.** + + +![](en/filters2.jpg) + + + - Give your filter a name + - If no conditions specified, filter will apply to all incoming emails, which is what we want, so **do not add any conditions** for that filter. + - From "**Action**" Dropdown menu select "**Forward to**" option, and add email address you want all emails to be forwarded to. + - Once you are done, hit the "**Done**" button. + - In order for the filter to be set to active you need to "**Save**" it. + + +![](en/filters3.jpg) + +###Voila! From now on all your emails to disroot account will be forwarded to your preferred email address. If you ever decide to actually switch to disroot mail as your main email address just simply remove that rule or alter it to your liking. diff --git a/pages/03.Email/03.Filters/01.forward/docs.es.md b/pages/04.Communication/01.Email/04.Filters/01.forward/docs.es.md similarity index 100% rename from pages/03.Email/03.Filters/01.forward/docs.es.md rename to pages/04.Communication/01.Email/04.Filters/01.forward/docs.es.md diff --git a/pages/03.Email/03.Filters/01.forward/docs.fr.md b/pages/04.Communication/01.Email/04.Filters/01.forward/docs.fr.md similarity index 100% rename from pages/03.Email/03.Filters/01.forward/docs.fr.md rename to pages/04.Communication/01.Email/04.Filters/01.forward/docs.fr.md diff --git a/pages/03.Email/03.Filters/01.forward/docs.pt.md b/pages/04.Communication/01.Email/04.Filters/01.forward/docs.pt.md similarity index 100% rename from pages/03.Email/03.Filters/01.forward/docs.pt.md rename to pages/04.Communication/01.Email/04.Filters/01.forward/docs.pt.md diff --git a/pages/03.Email/03.Filters/01.forward/en/filters1.jpg b/pages/04.Communication/01.Email/04.Filters/01.forward/en/filters1.jpg similarity index 100% rename from pages/03.Email/03.Filters/01.forward/en/filters1.jpg rename to pages/04.Communication/01.Email/04.Filters/01.forward/en/filters1.jpg diff --git a/pages/03.Email/03.Filters/01.forward/en/filters2.jpg b/pages/04.Communication/01.Email/04.Filters/01.forward/en/filters2.jpg similarity index 100% rename from pages/03.Email/03.Filters/01.forward/en/filters2.jpg rename to pages/04.Communication/01.Email/04.Filters/01.forward/en/filters2.jpg diff --git a/pages/03.Email/03.Filters/01.forward/en/filters3.jpg b/pages/04.Communication/01.Email/04.Filters/01.forward/en/filters3.jpg similarity index 100% rename from pages/03.Email/03.Filters/01.forward/en/filters3.jpg rename to pages/04.Communication/01.Email/04.Filters/01.forward/en/filters3.jpg diff --git a/pages/03.Email/03.Filters/01.forward/en/login.jpg b/pages/04.Communication/01.Email/04.Filters/01.forward/en/login.jpg similarity index 100% rename from pages/03.Email/03.Filters/01.forward/en/login.jpg rename to pages/04.Communication/01.Email/04.Filters/01.forward/en/login.jpg diff --git a/pages/03.Email/03.Filters/01.forward/en/settings1.jpg b/pages/04.Communication/01.Email/04.Filters/01.forward/en/settings1.jpg similarity index 100% rename from pages/03.Email/03.Filters/01.forward/en/settings1.jpg rename to pages/04.Communication/01.Email/04.Filters/01.forward/en/settings1.jpg diff --git a/pages/03.Email/03.Filters/01.forward/en/webmail1.jpg b/pages/04.Communication/01.Email/04.Filters/01.forward/en/webmail1.jpg similarity index 100% rename from pages/03.Email/03.Filters/01.forward/en/webmail1.jpg rename to pages/04.Communication/01.Email/04.Filters/01.forward/en/webmail1.jpg diff --git a/pages/04.Communication/01.Email/04.Filters/docs.en.md b/pages/04.Communication/01.Email/04.Filters/docs.en.md new file mode 100755 index 00000000..a7527e89 --- /dev/null +++ b/pages/04.Communication/01.Email/04.Filters/docs.en.md @@ -0,0 +1,12 @@ +--- +title: How2 set email filters +published: true +visible: true +taxonomy: + category: + - docs +--- + +Email Filters allow you to manage incoming mails in automated fashion such as moving incoming mail to a directory based on certain criteria, setting up out-of-office/holiday auotreply, automatically reject or forward emails etc. + +In this section we will cover the basics based on some scenarios. diff --git a/pages/03.Email/03.Filters/docs.es.md b/pages/04.Communication/01.Email/04.Filters/docs.es.md similarity index 100% rename from pages/03.Email/03.Filters/docs.es.md rename to pages/04.Communication/01.Email/04.Filters/docs.es.md diff --git a/pages/03.Email/03.Filters/docs.fr.md b/pages/04.Communication/01.Email/04.Filters/docs.fr.md similarity index 100% rename from pages/03.Email/03.Filters/docs.fr.md rename to pages/04.Communication/01.Email/04.Filters/docs.fr.md diff --git a/pages/03.Email/03.Filters/docs.pt.md b/pages/04.Communication/01.Email/04.Filters/docs.pt.md similarity index 100% rename from pages/03.Email/03.Filters/docs.pt.md rename to pages/04.Communication/01.Email/04.Filters/docs.pt.md diff --git a/pages/04.Communication/01.Email/docs.en.md b/pages/04.Communication/01.Email/docs.en.md new file mode 100755 index 00000000..977fc8a4 --- /dev/null +++ b/pages/04.Communication/01.Email/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Email +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Environment / Device +
+ +|[**Webmail**](webmail)|[**Desktop Clients**](clients/desktop)|[**Mobile Clients**](clients/mobile)| +|:--:|:--:|:--:| diff --git a/pages/03.Email/docs.es.md b/pages/04.Communication/01.Email/docs.es.md similarity index 100% rename from pages/03.Email/docs.es.md rename to pages/04.Communication/01.Email/docs.es.md diff --git a/pages/03.Email/docs.fr.md b/pages/04.Communication/01.Email/docs.fr.md similarity index 100% rename from pages/03.Email/docs.fr.md rename to pages/04.Communication/01.Email/docs.fr.md diff --git a/pages/03.Email/docs.pt.md b/pages/04.Communication/01.Email/docs.pt.md similarity index 100% rename from pages/03.Email/docs.pt.md rename to pages/04.Communication/01.Email/docs.pt.md diff --git a/pages/04.Communication/02.Chat/01.Webchat/docs.en.md b/pages/04.Communication/02.Chat/01.Webchat/docs.en.md new file mode 100644 index 00000000..d9b2fda3 --- /dev/null +++ b/pages/04.Communication/02.Chat/01.Webchat/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Webchat +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Converse.js +
diff --git a/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.en.md new file mode 100755 index 00000000..700b6417 --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.en.md @@ -0,0 +1,46 @@ +--- +title: Pidgin on GNU/Linux +published: true +visible: true +taxonomy: + category: + - docs +--- + +|![](/start/icons/pidgin.png)| +|:--:| +|Pidgin is multi-platform (runs on most operating systems) and multi-protocol messaging application. It supports a lot of different messaging protocols such as: xmpp, skype, AIM, TOX, Whatsapp, facebook etc, so you can have all your messaging done with just one app.| + +To setup disroot chat on pidgin, follow those easy steps: + +1. **Install Pidgin.** +If you use windows/macos check [pidgin's website](http://pidgin.im/download/) and download a version for you. +If you are a linux user, check your package repository and get it. (check for some additional plugins while you're at it. + +2. **Fire it up.** +You will be greeted with a welcome message like this: + +![](en/pidgin1.png) + +To Proceed, we need to **add an account**. +If it's not the first time you run pidgin you should use menu: + +![](en/pidgin2.png) + +3. **Setup account.** +First of, choose xmpp protocol from the drop-down list: + +![](en/pidgin3.png) + +Next fill in the information needed: + +![](en/pidgin4.png) + +!Note! If you wish to use avatar (optional) you can select "Use this buddy icon for this account" and browse your local filesystem (computer) for the picture you want to use. + +4. Hit "**Add**" and you are done! +Now you are ready to start preaching people to ditch corporate evil apps and jump on the federation *Starship*. + +![](en/pidgin5.png) + +**All your contacts are synced between all the clients, so you can use disroot chat on all the devices at the same time.** diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/docs.es.md b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.es.md similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/docs.es.md rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.es.md diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/docs.fr.md b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.fr.md similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/docs.fr.md rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.fr.md diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/docs.pt.md b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.pt.md similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/docs.pt.md rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/docs.pt.md diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin1.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin1.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin1.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin1.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin2.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin2.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin2.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin2.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin3.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin3.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin3.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin3.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin4.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin4.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin4.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin4.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin5.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin5.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/en/pidgin5.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/en/pidgin5.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin1.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin1.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin1.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin1.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin2.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin2.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin2.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin2.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin3.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin3.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin3.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin3.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin4.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin4.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin4.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin4.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin5.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin5.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/es/pidgin5.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/es/pidgin5.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin1.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin1.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin1.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin1.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin2.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin2.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin2.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin2.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin3.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin3.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin3.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin3.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin4.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin4.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin4.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin4.png diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin5.png b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin5.png similarity index 100% rename from pages/05.XMPP/01.Desktop/01.pidgin/pt/pidgin5.png rename to pages/04.Communication/02.Chat/02.Desktop/01.pidgin/01.linux/pt/pidgin5.png diff --git a/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/02.win/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/02.win/docs.en.md new file mode 100644 index 00000000..8d6d875b --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/02.win/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Pidgin on MS Windows +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](/start/icons/pidgin.png)| +|:--:| +|Pidgin is multi-platform (runs on most operating systems) and multi-protocol messaging application. It supports a lot of different messaging protocols such as: xmpp, skype, AIM, TOX, Whatsapp, facebook etc, so you can have all your messaging done with just one app.| diff --git a/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/docs.en.md new file mode 100644 index 00000000..c7b6795d --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/01.pidgin/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Chat Clients: Pidgin +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](/start/icons/pidgin.png)| +|:--:| +|Pidgin is multi-platform (runs on most operating systems) and multi-protocol messaging application. It supports a lot of different messaging protocols such as: xmpp, skype, AIM, TOX, Whatsapp, facebook etc, so you can have all your messaging done with just one app.| +
+|[**GNU/Linux**](linux)|[**MS Windows**](win)| +|:--:|:--:| diff --git a/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/docs.en.md new file mode 100644 index 00000000..da861268 --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/docs.en.md @@ -0,0 +1,91 @@ +--- +title: Gajim on GNU/Linux +published: true +visible: true +taxonomy: + category: + - docs +--- + +|![](/start/icons/gajim.png)| +|:--:| +|Gajim is multi-platform (runs on most operating systems) messaging application.| + +To setup disroot chat on Gajim, follow those easy steps: + +## Install Gajim +If you use windows/macos check [Gajim's website](https://gajim.org/downloads.php) and download a version for you. +If you are a linux user, check your package repository and get it. (check for some additional plugins while you're at it.) + +## Fire it up +You will be greeted with a welcome message like this: + +![](en/01_creation.png) + +- If you want to use your Disroot account then choose **"I already have an acccount I want to use"**. +- If you want to create a new account, choose **"I want to register for a new account"** + +## Setup account +Next fill in the information needed: + +![](en/02_creation.png) + +Replace **username** by either your Disroot username, or by the username you have already created. + +![](en/03_creation.png) + +Click on **Finish**. + +**All your contacts are synced between all the clients, so you can use disroot chat on all the devices at the same time.** + +## Single window +Instead of having several windows (for contacts, for conversations, etc.), you can have a single window for everything. + +Go to the **Preferences**. It depends on either you’re using Windows or Linux. +You may find it at the top bar menu. Or you may have to right-click on the Gajim icon in the app list. + +In the **Preferences** window, in **Chat Appearance**, change the **Window behavior** to **“Single window for everything”**. + +![](en/04_windows.png) + +## Plugins +We also need to set up a few plugins. +Depending of your OS, you may have to install them first. [See that page](https://dev.gajim.org/gajim/gajim-plugins) + +Then, in the same place you found the **Preferences**, you should find **Plugins**. We need two plugins: + - OMEMO + - URL image preview + +So go to the **Available** tab and check those two plugins. Click on **Install/Upgrade** when you’re done. + +![](en/05_plugins.png) + +Then, go to the **Installed** tab. Check the plugins to make them active. Then close the windows. + +![](en/06_plugins.png) + +## Join a room +Room are also called group conversations or MUC (Multiple Chat Users). + +To join one, click on **Accounts**, then on **Join Group Chat**. + +There, some group conversations may appear. If not, click again on **Join Group Chat**. + +![](en/07_join.png) + +- **Nickname**: you can set whatever you want, it doesn't have to be your username! +- **Room**: the name of the room you want to join. If the room doesn't exist, it will then be created, and you will be its admin. +- **Server**: enter **chat.disroot.org** +- **Password**: useful only if the room you're trying to join is password protected. +- **Bookmark**: very useful, it allows to remember room you joined, so that you can easily and quickly find them again. And it allows also to keep them from one device to another one! +- **Autojoin**: if enabled, then on startup, Gajim will automatically open the room. + + +## History +As soon as you close Gajim, the rooms are cleaned of messages that you've already read. +However, you can still read a group conversation history. + +![](en/08_history.png) + +Click on the **three vertical dots** next to the attach file icon and choose **History**. +You can navigate through history by date. diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/01_creation.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/01_creation.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/01_creation.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/01_creation.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/02_creation.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/02_creation.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/02_creation.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/02_creation.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/03_creation.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/03_creation.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/03_creation.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/03_creation.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/04_windows.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/04_windows.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/04_windows.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/04_windows.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/05_plugins.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/05_plugins.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/05_plugins.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/05_plugins.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/06_plugins.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/06_plugins.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/06_plugins.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/06_plugins.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/07_join.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/07_join.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/07_join.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/07_join.png diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/en/08_history.png b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/08_history.png similarity index 100% rename from pages/05.XMPP/01.Desktop/02.Gajim/en/08_history.png rename to pages/04.Communication/02.Chat/02.Desktop/02.gajim/01.linux/en/08_history.png diff --git a/pages/04.Communication/02.Chat/02.Desktop/02.gajim/02.win/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/02.win/docs.en.md new file mode 100644 index 00000000..f7c0e047 --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/02.win/docs.en.md @@ -0,0 +1,13 @@ +--- +title: Gajim on MS Windows +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|![](/start/icons/gajim.png)| +|:--:| +|Gajim is multi-platform (runs on most operating systems) messaging application.| diff --git a/pages/04.Communication/02.Chat/02.Desktop/02.gajim/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/docs.en.md new file mode 100644 index 00000000..f3e9285d --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/02.gajim/docs.en.md @@ -0,0 +1,18 @@ +--- +title: Chat Clients: Gajim +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|![](/start/icons/gajim.png)| +|:--:| +|Gajim is multi-platform (runs on most operating systems) messaging application.| + +
+ +|[**GNU/Linux**](linux)|[**MS Windows**](win)| +|:--:|:--| diff --git a/pages/05.XMPP/01.Desktop/03.dino/.gitkeep b/pages/04.Communication/02.Chat/02.Desktop/03.dino/.gitkeep similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/.gitkeep rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/.gitkeep diff --git a/pages/04.Communication/02.Chat/02.Desktop/03.dino/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/03.dino/docs.en.md new file mode 100644 index 00000000..d59e532a --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/03.dino/docs.en.md @@ -0,0 +1,88 @@ +--- +title: Dino +published: true +visible: true +taxonomy: + category: + - docs +--- +|![](en/dino.png)| +|:--:| +|Dino is an open source chat client for the desktop. It has support for [OMEMO](https://en.wikipedia.org/wiki/OMEMO) and [OpenPGP](https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP), which means that once you enable encryption, only you and the other person can read your messages and no one else.| +
+ +1. **Installing Dino**
+**Dino** is available for GNU/Linux users only. You can check if there's a compiled package version for your distro by clicking [here](https://github.com/dino/dino/wiki/Distribution-Packages). Or build it yourself by downloading the code and compiling it from the command line: +``` +./configure +make +build/dino +``` + +2. **Starting Dino**
+First time you launch Dino, it'll appear a screen like this: + +![](en/01.png) + +To continue, select **Manage accounts** and then **Add an account**. + +![](en/02.png) + +3. **Setting up an account**
+Sign in with your information...:
+``` +JID: your_username@disroot.org +Password: your Disroot password +Local alias: the name you want to use +``` +... and then **Save** + +![](en/03.png) + +Once you've completed the previous step, the next box will appear: + +![](en/04.png) + +Connect by clicking the Connection button next to the username. + +![](en/05.png) + +To change the avatar, just click on the user icon, browse your local system and select the image you want to use. + +![](en/06.png) + + +4. **Starting a conversation**
+If you want to start a communication with other user, just click on **Start Conversation**. However, if you want to join a chat room then click on **Join a channel**. + +![](en/08.png) + +The procedure will be the same in both cases: enter the username or the chatroom's name and then click **Next**... + +![](en/09.png) + +... and a confirmation request will appear. + +![](en/10.png) + +By clicking on the **Join** button you will access the room or start a conversation with another user. + +![](en/12.png) + +Encryption is very uncommon at chatrooms, but it is recommended to enable it on one to one user conversations. To do it, just click on the lock icon at the right of the text box. + +![](es/13.png) + +5. **Settings and Preferences**
+If you want to add more accounts, start conversations with other users, join chatrooms or adjust some preferences, just click on the left icon at the top bar... + +![](en/13.png) + + +![](en/14.png) + + +![](en/15.png) + + +... and that's it. diff --git a/pages/05.XMPP/01.Desktop/03.dino/docs.es.md b/pages/04.Communication/02.Chat/02.Desktop/03.dino/docs.es.md similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/docs.es.md rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/docs.es.md diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/.gitkeep b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/.gitkeep similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/.gitkeep rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/.gitkeep diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/01.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/01.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/01.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/01.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/02.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/02.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/02.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/02.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/03.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/03.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/03.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/03.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/04.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/04.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/04.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/04.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/05.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/05.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/05.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/05.png diff --git a/06.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/06.png similarity index 100% rename from 06.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/06.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/07.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/07.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/07.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/07.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/07a.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/07a.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/07a.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/07a.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/08.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/08.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/08.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/08.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/09.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/09.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/09.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/09.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/10.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/10.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/10.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/10.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/11.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/11.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/11.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/11.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/12.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/12.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/12.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/12.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/13.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/13.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/13.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/13.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/14.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/14.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/14.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/14.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/15.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/15.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/15.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/15.png diff --git a/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/dino.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/dino.png new file mode 100644 index 00000000..61a64530 Binary files /dev/null and b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/dino.png differ diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/dino.svg b/pages/04.Communication/02.Chat/02.Desktop/03.dino/en/dino.svg similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/en/dino.svg rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/en/dino.svg diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/01.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/01.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/01.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/01.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/02.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/02.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/02.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/02.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/03.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/03.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/03.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/03.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/04.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/04.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/04.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/04.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/05.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/05.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/05.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/05.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/05a.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/05a.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/05a.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/05a.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/06.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/06.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/06.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/06.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/07.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/07.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/07.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/07.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/08.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/08.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/08.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/08.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/09.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/09.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/09.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/09.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/10.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/10.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/10.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/10.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/11.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/11.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/11.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/11.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/12.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/12.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/12.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/12.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/13.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/13.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/13.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/13.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/14.png b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/14.png similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/14.png rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/14.png diff --git a/pages/05.XMPP/01.Desktop/03.dino/es/dino.svg b/pages/04.Communication/02.Chat/02.Desktop/03.dino/es/dino.svg similarity index 100% rename from pages/05.XMPP/01.Desktop/03.dino/es/dino.svg rename to pages/04.Communication/02.Chat/02.Desktop/03.dino/es/dino.svg diff --git a/pages/04.Communication/02.Chat/02.Desktop/docs.en.md b/pages/04.Communication/02.Chat/02.Desktop/docs.en.md new file mode 100755 index 00000000..642eb023 --- /dev/null +++ b/pages/04.Communication/02.Chat/02.Desktop/docs.en.md @@ -0,0 +1,13 @@ +--- +title: Chat: Desktop Clients +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|**Pidgin**|**Gajim**|**Dino**| +|:--:|:--:|:--:| +|01.[GNU/Linux](pidgin/linux)
02.[Windows](pidgin/win)|01.[GNU/Linux](gajim/linux)
02.[Windows](gajim/win)|[GNU/Linux](/dino)| diff --git a/pages/05.XMPP/01.Desktop/docs.es.md b/pages/04.Communication/02.Chat/02.Desktop/docs.es.md similarity index 100% rename from pages/05.XMPP/01.Desktop/docs.es.md rename to pages/04.Communication/02.Chat/02.Desktop/docs.es.md diff --git a/pages/05.XMPP/01.Desktop/docs.fr.md b/pages/04.Communication/02.Chat/02.Desktop/docs.fr.md similarity index 100% rename from pages/05.XMPP/01.Desktop/docs.fr.md rename to pages/04.Communication/02.Chat/02.Desktop/docs.fr.md diff --git a/pages/05.XMPP/01.Desktop/docs.pt.md b/pages/04.Communication/02.Chat/02.Desktop/docs.pt.md similarity index 100% rename from pages/05.XMPP/01.Desktop/docs.pt.md rename to pages/04.Communication/02.Chat/02.Desktop/docs.pt.md diff --git a/pages/05.XMPP/02.Mobile/01.android/docs.en.md b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/docs.en.md similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/docs.en.md rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/docs.en.md diff --git a/pages/05.XMPP/02.Mobile/01.android/docs.fr.md b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/docs.fr.md similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/docs.fr.md rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/docs.fr.md diff --git a/pages/05.XMPP/02.Mobile/01.android/docs.pt.md b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/docs.pt.md similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/docs.pt.md rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/docs.pt.md diff --git a/pages/05.XMPP/02.Mobile/01.android/en/conversations.png b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/en/conversations.png similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/en/conversations.png rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/en/conversations.png diff --git a/pages/05.XMPP/02.Mobile/01.android/en/conversations2.png b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/en/conversations2.png similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/en/conversations2.png rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/en/conversations2.png diff --git a/pages/05.XMPP/02.Mobile/01.android/pt/conversations.png b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/pt/conversations.png similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/pt/conversations.png rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/pt/conversations.png diff --git a/pages/05.XMPP/02.Mobile/01.android/pt/conversations2.png b/pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/pt/conversations2.png similarity index 100% rename from pages/05.XMPP/02.Mobile/01.android/pt/conversations2.png rename to pages/04.Communication/02.Chat/03.Mobile/01.android/01.Conversation/pt/conversations2.png diff --git a/pages/04.Communication/02.Chat/03.Mobile/01.android/docs.en.md b/pages/04.Communication/02.Chat/03.Mobile/01.android/docs.en.md new file mode 100644 index 00000000..54d01474 --- /dev/null +++ b/pages/04.Communication/02.Chat/03.Mobile/01.android/docs.en.md @@ -0,0 +1,15 @@ +--- +title: 'Chat Clients: Android' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +How2 setup your chat client on your mobile: + +## Clients +- [Conversation](conversation) diff --git a/pages/05.XMPP/02.Mobile/02.sailfishos/docs.en.md b/pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/docs.en.md similarity index 100% rename from pages/05.XMPP/02.Mobile/02.sailfishos/docs.en.md rename to pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/docs.en.md diff --git a/pages/05.XMPP/02.Mobile/02.sailfishos/docs.fr.md b/pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/docs.fr.md similarity index 100% rename from pages/05.XMPP/02.Mobile/02.sailfishos/docs.fr.md rename to pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/docs.fr.md diff --git a/pages/05.XMPP/02.Mobile/02.sailfishos/docs.pt.md b/pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/docs.pt.md similarity index 100% rename from pages/05.XMPP/02.Mobile/02.sailfishos/docs.pt.md rename to pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/docs.pt.md diff --git a/pages/05.XMPP/02.Mobile/02.sailfishos/en/sailfish_xmpp1.png b/pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/en/sailfish_xmpp1.png similarity index 100% rename from pages/05.XMPP/02.Mobile/02.sailfishos/en/sailfish_xmpp1.png rename to pages/04.Communication/02.Chat/03.Mobile/02.sailfishos/en/sailfish_xmpp1.png diff --git a/pages/05.XMPP/02.Mobile/03.iOS/docs.en.md b/pages/04.Communication/02.Chat/03.Mobile/03.iOS/docs.en.md similarity index 100% rename from pages/05.XMPP/02.Mobile/03.iOS/docs.en.md rename to pages/04.Communication/02.Chat/03.Mobile/03.iOS/docs.en.md diff --git a/pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure1.png b/pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure1.png similarity index 100% rename from pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure1.png rename to pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure1.png diff --git a/pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure2.png b/pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure2.png similarity index 100% rename from pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure2.png rename to pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure2.png diff --git a/pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure3.png b/pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure3.png similarity index 100% rename from pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure3.png rename to pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure3.png diff --git a/pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure4.png b/pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure4.png similarity index 100% rename from pages/05.XMPP/02.Mobile/03.iOS/en/chatsecure4.png rename to pages/04.Communication/02.Chat/03.Mobile/03.iOS/en/chatsecure4.png diff --git a/pages/04.Communication/02.Chat/03.Mobile/docs.en.md b/pages/04.Communication/02.Chat/03.Mobile/docs.en.md new file mode 100755 index 00000000..b2018895 --- /dev/null +++ b/pages/04.Communication/02.Chat/03.Mobile/docs.en.md @@ -0,0 +1,12 @@ +--- +title: Chat: Mobile clients +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|[**Android**](android)|[**SailfishOS**](sailfishos)|[**iOS**](ios)| +|:--:|:--:|:--:| diff --git a/pages/05.XMPP/02.Mobile/docs.fr.md b/pages/04.Communication/02.Chat/03.Mobile/docs.fr.md similarity index 100% rename from pages/05.XMPP/02.Mobile/docs.fr.md rename to pages/04.Communication/02.Chat/03.Mobile/docs.fr.md diff --git a/pages/04.Communication/02.Chat/docs.en.md b/pages/04.Communication/02.Chat/docs.en.md new file mode 100755 index 00000000..31c346f3 --- /dev/null +++ b/pages/04.Communication/02.Chat/docs.en.md @@ -0,0 +1,30 @@ +--- +title: Chat +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## What is XMPP? + +|![](en/xmpp_logo.png)| +|:--:| +|XMPP (Extensible Messaging and Presence Protocol) is: "*a set of open technologies for instant messaging, presence, multi-party chat, voice and video calls, collaboration, lightweight middleware, content syndication, and generalized routing of XML data.*"| + +XMPP provides an open and decentralized alternative to closed instant messaging services. XMPP protocol offers a lot of advantages: + +* It's **Open** (wich means is free, open, public, and easily understandable) +* It's a **Standard** (approved by the [IETF](http://www.ietf.org/)) +* It's **Decentralized** (its network architecture is similar to email, meaning anyone can run their own XMPP server, therefore individuals and organizations can take control of their communications) +* It's **Secure** (SASL and TLS has been built into the XMPP core and E2E encryption can be implemented) +* It's **Extensible** (anyone can build custom functionality on top of the core protocols (common extensions are published in the XEP series) + +... among other features. +
+ +|**WEB**|**Desktop Clients**|**Mobile Clients**| +|:--:|:--:|:--:| +|[Webchat](webchat)|01.[Pidgin](desktop/pidgin)
02.[Gajim](desktop/gajim)
03.[Dino](desktop/dino)|01.[Android clients](mobile/android)
02.[Sailfish OS](mobile/sailfishos)
03.[iOS](mobile/ios)| diff --git a/pages/04.Communication/02.Chat/en/xmpp_logo.png b/pages/04.Communication/02.Chat/en/xmpp_logo.png new file mode 100644 index 00000000..20f1a186 Binary files /dev/null and b/pages/04.Communication/02.Chat/en/xmpp_logo.png differ diff --git a/pages/04.Communication/03.Forum/01.basics/docs.en.md b/pages/04.Communication/03.Forum/01.basics/docs.en.md new file mode 100755 index 00000000..ae1c2716 --- /dev/null +++ b/pages/04.Communication/03.Forum/01.basics/docs.en.md @@ -0,0 +1,151 @@ +--- +title: Discourse: Basics +page-toc: + active: true +published: true +visible: true +taxonomy: + category: + - docs +--- + +The Discourse forum provides a simple and intuitive user interface. Even if you are using Discourse primarily as a mailing list, it is recommended to check the web-interface for a superior user experience. Here are some tips to get you started: + + +---------- + + +# Log in first +You can log in to the forum with your Discourse account or your All-in-one Disroot account, if you have one. +Go to https://forum.disroot.org/ and click ![](en/forum_basics1.png?resize=64,25) on the top right corner. +**If you have a Disroot account make sure to select Login with disroot account before entering your credentials.** + +If you don't have an account yet, you can register a Disroot account via https://user.disroot.org, which will give you additionaly access to cloud storage, email, xmpp and project board. You can also decide to create a forum only account - you will find the Sign up button at the top right of the forum page. + +# The menu +The icon buttons on the top right include the search and your personal settings: + +![](en/forum_basics2.png) + +Click on your user icon (the first letter of your name until you change your avatar) to see your messages and notifications and to enter your personal setting and see your user page. + +The little numbers on top of your avatar mark how many notifications (on the right) and messages (left) you have. When you click on your avatar you will see all unread notification and messages listed below. You can also access all you messages via the ![](en/forum_basics3.png?resize=30,25) icon. + +Click on your avatar and then on the ![](en/forum_basics4.png?resize=23,24) to enter your personal settings. There you can change you avatar, adjust the level of notifications, your viewed categories and much more. + +# Navigation +When you first log in to the forum (or click ![](en/forum_basics5.png?resize=100,20) icon to get back to home page at any time), you will find a list of the categories you are following. Categories are like sub-forums. If you are a member of a private forum group, the categories of that group will be listed first and all public categories will be listed below. More on how to follow and hide certain categories will be posted soon in another tutorial. + +~[](en/forum_basics6.png) + +The bar on top allows you to quickly navigate between latest, new, unread and most active posts. You can also filter which categories you wish to view under the ![](en/forum_basics7.png?resize=133,30) button. +On the far right you find a tab button for starting a new discussion thread (topic). + +The latest topics are also listed in your home page, right of the categories. Any topic title you select to view will take you to the next unread post. + +# Keep scrolling + +Once you are in the topic thread you can scroll down to read through. There are no next page buttons or page numbers – to read more, just keep scrolling down! + +As new posts come in, they will appear automatically. + +# Replying to posts + +To reply to the overall topic, use the ![](en/forum_basics8.png?resize=80,29) button at the very bottom of the page. + +To reply to a specific post within the thread, use the ![](en/forum_basics9.png?resize=82,30) button on that post. + +To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes! + +To notify someone about your reply, mention their name. Type @ to begin selecting a username. + +You can also like, share, flag or bookmark a post. + +![](en/forum_basics1.gif) + + +# Creating a new topic +You can create a new topic in a category (Howtos, support, changelog, etc) by either navigating to the category and then pressing the new topic button ![](en/forum_basics10.png?resize=121,26), or by just pressing the button and in the compose topic/message panel select the category it goes to. Topics need to have a minimum of 8 letters in the subject and 10 letters in the topic, otherwise the message won't be sent. + +![](en/forum_basics2.gif) + +# The interface +The interface is relatively simple. + +![](en/forum_basics11.png) + +Discourse supports Markdown and HTML to compose messages, on the left side of the panel you write your topic, and on the right side you can preview how the topic will be presented. + +![](en/forum_basics3.gif) + +But you don't need to learn Markdown or HTML to write a topic, you can just use the formatting options presented in the top bar, Blockquote **Strong**, **Emphasis**, **Bulleted List**, **Numbered List**, **Heading**, **Horizontal Rule**, **Emojis**. Commands like CTRL+b or CTRL+I also work. + +![](en/forum_basics4.gif) + +## Inserting pictures and videos +You can insert pictures into your topic by dragging them to the message to the part where you want them to be. + +![](en/forum_basics5.gif) + +To insert a video it's the same process. + +## Uploading files to your topic +You can upload files by pressing the upload button and then browsing until you reach and select the file you want. + +![](en/forum_basics6.gif) + +## Moving files, pictures and videos from one place to another in the message +File, pictures, and videos will be presented on the left side of the screen (where all the code is) like this: + +**Files** +> < a class="attachment" href="/uploads/default/original/1X/ffd8f38b235dbf199a919f0187ae63a183d22ada.odt">hello world.odt (8.0 KB) + +**Pictures** +> < img src="/uploads/default/original/1X/019a9706a4676128e452b81f450851353f36175c.png" width="690" height="347"> + +**Videos** +>https ://forum.disroot.org/uploads/default/original/1X/59b17ec97a8daabcb96a787b4900f3d3221083da.mp4 + +To move them just cut the line and paste it where you want it. Also in the case of pictures you can adjust their size by changing the values for "height" and "width" in the line. + +## Adding tags to your topic +Adding a tag makes it easier for people looking for topics or threads about a certain subject. Adding them is super easy. + +![](en/forum_basics7.gif) + +Once your done with composing your topic just press "Create Topic" ![](en/forum_basics14.png) + +# How to mute or watch categories +In Discourse it's possible for you regulate the stream of posts you receive via the forum board or via email. You can mute categories or just a sub-category you are not interested or set categories to watch which will guarantee you will always receive notifications and emails of every post in a category or sub-category you are interested in. + +If you just mute a category you will be muting all sub-categories, unless you select a specific sub-category to watch. If you mute a category or sub-category you will still be able to access it in the message board, if you want to check it from time to time. You simply just don't receive any emails or notifications about it. + +The current categories and sub-categories in the Disroot Forum are: + +* disroot + * disroot-Changelog + * support + * feature + * main + * FAQ +* Open Talks +* TOFU +* Engineering Yuvasamithi + +The best way to watch/mute categories is in your preferences, from there you can set all your mute and watch preferences from one single place. + +![](en/forum_basics12.png) + +Just scroll down to **Categories** , you will see the **fields** for **Mute** and **Watched**, write the categories you want in each and in the end **save your settings** for them to take effect. + +![](en/forum_basics8.gif) + +The other method is to navigate to each category or sub-category one by one and do it from there, by pressing the button that is to right of "new topic" ![](en/forum_basics13.png?resize=50,25) + +![](en/forum_basics9.gif) + +---------- + + + + You can find more tips at [Discourse's welcome message](https://forum.disroot.org/t/welcome-to-discourse) diff --git a/pages/08.Forum/01.basic-usage/docs.fr.md b/pages/04.Communication/03.Forum/01.basics/docs.fr.md similarity index 100% rename from pages/08.Forum/01.basic-usage/docs.fr.md rename to pages/04.Communication/03.Forum/01.basics/docs.fr.md diff --git a/pages/08.Forum/01.basic-usage/docs.pt.md b/pages/04.Communication/03.Forum/01.basics/docs.pt.md similarity index 100% rename from pages/08.Forum/01.basic-usage/docs.pt.md rename to pages/04.Communication/03.Forum/01.basics/docs.pt.md diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics1.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics1.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics1.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics1.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics1.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics1.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics1.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics1.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics10.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics10.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics10.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics10.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics11.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics11.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics11.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics11.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics12.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics12.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics12.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics12.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics13.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics13.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics13.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics13.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics14.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics14.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics14.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics14.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics2.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics2.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics2.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics2.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics2.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics2.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics2.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics2.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics3.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics3.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics3.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics3.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics3.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics3.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics3.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics3.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics4.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics4.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics4.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics4.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics4.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics4.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics4.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics4.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics5.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics5.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics5.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics5.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics5.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics5.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics5.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics5.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics6.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics6.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics6.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics6.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics6.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics6.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics6.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics6.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics7.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics7.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics7.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics7.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics7.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics7.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics7.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics7.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics8.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics8.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics8.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics8.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics8.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics8.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics8.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics8.png diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics9.gif b/pages/04.Communication/03.Forum/01.basics/en/forum_basics9.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics9.gif rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics9.gif diff --git a/pages/08.Forum/01.basic-usage/en/forum_basics9.png b/pages/04.Communication/03.Forum/01.basics/en/forum_basics9.png similarity index 100% rename from pages/08.Forum/01.basic-usage/en/forum_basics9.png rename to pages/04.Communication/03.Forum/01.basics/en/forum_basics9.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics1.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics1.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics1.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics1.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics10.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics10.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics10.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics10.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics11.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics11.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics11.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics11.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics12.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics12.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics12.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics12.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics13.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics13.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics13.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics13.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics14.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics14.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics14.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics14.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics15.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics15.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics15.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics15.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics16.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics16.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics16.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics16.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics2.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics2.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics2.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics2.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics3.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics3.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics3.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics3.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics3.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics3.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics3.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics3.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics4.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics4.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics4.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics4.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics4.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics4.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics4.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics4.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics5.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics5.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics5.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics5.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics5.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics5.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics5.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics5.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics6.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics6.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics6.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics6.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics6.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics6.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics6.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics6.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics7.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics7.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics7.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics7.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics7.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics7.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics7.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics7.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics8.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics8.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics8.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics8.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics8.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics8.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics8.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics8.png diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics9.gif b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics9.gif similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics9.gif rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics9.gif diff --git a/pages/08.Forum/01.basic-usage/pt/forum_basics9.png b/pages/04.Communication/03.Forum/01.basics/pt/forum_basics9.png similarity index 100% rename from pages/08.Forum/01.basic-usage/pt/forum_basics9.png rename to pages/04.Communication/03.Forum/01.basics/pt/forum_basics9.png diff --git a/pages/08.Forum/02.mailinglist/docs.en.md b/pages/04.Communication/03.Forum/02.mailinglist/docs.en.md similarity index 100% rename from pages/08.Forum/02.mailinglist/docs.en.md rename to pages/04.Communication/03.Forum/02.mailinglist/docs.en.md diff --git a/pages/08.Forum/02.mailinglist/docs.fr.md b/pages/04.Communication/03.Forum/02.mailinglist/docs.fr.md similarity index 100% rename from pages/08.Forum/02.mailinglist/docs.fr.md rename to pages/04.Communication/03.Forum/02.mailinglist/docs.fr.md diff --git a/pages/08.Forum/02.mailinglist/docs.pt.md b/pages/04.Communication/03.Forum/02.mailinglist/docs.pt.md similarity index 100% rename from pages/08.Forum/02.mailinglist/docs.pt.md rename to pages/04.Communication/03.Forum/02.mailinglist/docs.pt.md diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml1.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml1.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml1.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml1.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml2.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml2.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml2.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml2.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml3.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml3.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml3.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml3.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml4.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml4.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml4.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml4.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml5.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml5.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml5.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml5.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml6.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml6.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml6.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml6.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml7.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml7.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml7.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml7.png diff --git a/pages/08.Forum/02.mailinglist/en/forum_ml8.png b/pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml8.png similarity index 100% rename from pages/08.Forum/02.mailinglist/en/forum_ml8.png rename to pages/04.Communication/03.Forum/02.mailinglist/en/forum_ml8.png diff --git a/pages/04.Communication/03.Forum/docs.en.md b/pages/04.Communication/03.Forum/docs.en.md new file mode 100755 index 00000000..f6868345 --- /dev/null +++ b/pages/04.Communication/03.Forum/docs.en.md @@ -0,0 +1,17 @@ +--- +title: 'Forum' +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# **DISCOURSE** +|![](/start/icons/discourse.png)| +|:--:| +|Discourse is an Open Source internet forum and mailing list management software.| +
+|**[Forum Basics](basics)**|**[Mailing list](mailinglist)**| +|:--:|:--:| diff --git a/pages/08.Forum/docs.fr.md b/pages/04.Communication/03.Forum/docs.fr.md similarity index 100% rename from pages/08.Forum/docs.fr.md rename to pages/04.Communication/03.Forum/docs.fr.md diff --git a/pages/08.Forum/docs.pt.md b/pages/04.Communication/03.Forum/docs.pt.md similarity index 100% rename from pages/08.Forum/docs.pt.md rename to pages/04.Communication/03.Forum/docs.pt.md diff --git a/pages/04.Communication/docs.en.md b/pages/04.Communication/docs.en.md new file mode 100644 index 00000000..c915d553 --- /dev/null +++ b/pages/04.Communication/docs.en.md @@ -0,0 +1,13 @@ +--- +title: Communication Tools +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|[Email
![](/start/icons/email.png)](email)|[Chat
![](/start/icons/chat.png)](chat)|[Forum
![](/start/icons/forum.png)](forum)| +|:--:|:--:|:--:| +|01.[Email Settings](email/clients/)
02.[Setting Alias](email/alias)
03.[Setting Filters](email/filters)

**WEB**:
[Webmail](email/webmail)

**DESKTOP**:
[Clients](email/clients/desktop)

**MOBILE**:
[Clients](email/clients/mobile)|**WEB**:
[Webchat](chat/webchat)

**DESKTOP**:
[Clients](chat/desktop)

**Mobile Clients**:
[Clients](chat/clients/mobile)|**Discourse**:
01.[Basics](/forum/basics)
02.[Mailinglist](/forum/mailinglist)| diff --git a/pages/04.Matrix/01.usage-basics/docs.en.md b/pages/04.Matrix/01.usage-basics/docs.en.md deleted file mode 100755 index 95577352..00000000 --- a/pages/04.Matrix/01.usage-basics/docs.en.md +++ /dev/null @@ -1,206 +0,0 @@ ---- -title: Riot/Matrix - Basic usage -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - - -Riot is the main and most feature rich client (app) to use with matrix. It ships as a webchat, "native" desktop client, and mobile app (android, ios). In this tutorial we would like to guide you through the basic usage and show you few tricks here and there. - - - ----------- - -# How to access Riot? -There are numerous ways you can interact with the network of Matrix through the client Riot. - -## Webapp -The easiest way to access Riot on disroot is by going to . All you need is a supported web browser (Currently Mozilla Firefox and Chromium/Google Chrome are supported. Other browsers might also work, but there's no guarantee that all features will work perfectly). - -## Mobile app -For Android, we of course recommend using Riot shipped via [F-droid](https://f-droid.org/repository/browse/?fdfilter=riot&fdid=im.vector.alpha), though if you want to receive push notifications and your life depends on Google Services, you can also find Riot on Google's Play Store. - -For iOS of course you don't have any alternatives and you must use their app store. Just search for "Riot". - -## "Native" desktop app -We intentionally use "native" in quotes because it isn't a purely native solution. It is basically the webapp but run from your own computer. It however provides you with the best security as it does not rely on any third parties (not even disroot or any other server providing Riot). To get it up and running, follow this link: . - - ----------- - -# How to login/register an account -To register an account, go to . - -**TIP**: Currently your email address will be shared with a third party server at matrix.org in order to provide you with better contact discovery, as well as send you emails about forgotten passwords etc. This, however, is totally optional and if you're concerned with privacy and sharing information with matrix.org, you can skip it. - -For disroot users - your email address is not filled in by default for the same reason. You should decide whether or not to trust matrix.org with your email address and you can add it at a later stage. - - ----------- - -# User Interface -The user interface is quite intuitive if you ever used a chat system such as IRC, Slack, or Rocket.chat. - -![](en/riot_interface1.png) - -For the purpose of this howto, we'll name some of the key elements of the interface to help you identify them later on: - - - **Chat List** - The place where you will find all the chatrooms and “Direct Chats” (chatrooms with exactly one person other than you) you participate in. You can sort these chatrooms in various categories (favorite, direct chats, low priority) by dragging the rooms into them. - - **Chat Details** - This is where the room’s name, logo and topic are displayed. Additionally, ![](en/riot_interface2.png?resize=23,26) is for searching for keywords in the room’s history and ![](en/riot_interface3.png?resize=18,20) is for the room’s settings where you can e.g. change the topic, add and manage integrations, and adjust various room admin settings. - - **Main window** - This is the main part of the application. Here you can see all the chat messages in the currently selected room or all the public rooms when going to the Room directory. - - **Message area** - This is where you type your messages, upload files, start audio or video calls or conferences. - - **User List** - Here you can see all the users currently participating in the room. - - **Actions and settings** - Here you can start a new direct chat, create a new room, list all public rooms, as well as enter your user settings. - - ----------- - -# User Settings -First thing after you login for the first time is to customize your user settings. To do that click on ![](en/riot_interface4.png?resize=28,23) in the area **"Actions and settings"** (bottom left corner). In this section, you can set up various information about yourself, as well as set up the behavior of notifications, enable extra interface features and check and verify the list of connected devices. - -## Profile - -![](en/riot_interface5.png) - -This section lets you add or change information about your profile. - - - You can change or upload your new profile picture - - Change your display name - - Add email address **(this is optional)** - - Sign out - - Change password **(users with disroot account should only change their password through https://user.disroot.org)** - -## Notifications - -![](en/riot_interface6.png) - -Here you can change the behavior of notifications for your account. (Note that these changes will affect all devices running Riot. Hopefully in the future we will be able to change notifications settings per device). - -## Devices -Here you can see a list of devices connected to your account. You can view the devices ID, general information about the devices origin such as their name, the url they are connected to, the name of the operating system and browser or client being used, the IP address and the time they last made the connection to your account. You can also delete devices you no longer use. If you see a suspicious device or IP address you're never used, it might mean your account has been compromised and you should immediately logout (this will logout all devices), and change your password. Not logging out will not result in the compromised device logging back in. Be careful not to rush to conclusions too quickly! Study the list to be sure before you run around all paranoid. - -## Deactivate account -At the bottom of your user settings, you can deactivate your account. - -![](en/riot_interface7.png) - - ----------- - - -# Room Directory -The coolest thing about Matrix is the fact that it’s totally federated. It means you can join any channel on any server that’s part of the federation. In the Room Directory, you can search for and discover rooms on friendly servers we have listed (the list will keep growing) as well as search for rooms on servers (if you know the server’s URL). All public rooms of given server are listed in the main window. - -![](en/riot_interface8.png) - -The right dropdown menu lets you filter public rooms in of specific server, or simply add url of server that isn't yet listed. - -![](en/riot_interface9.png) - -The left input field is used to either type in the full room address (if you know it) or search for rooms using keywords. - -![](en/riot_interface10.png) - - ----------- - -# Joining a Channel -You can join a room in many ways. -The most straight forward way to join public rooms is to search for them in room directory. You can either choose a room from the list given by the predefined servers or search for the room on the server you know the address of. - - -You can also just click on the room address if someone shares it with you in the chat. The room address consist of #room_name:matrix_server for example #disroot:disroot.org This type of addresses are recognizable by Riot client and once clicked, will try to join the room automatically. - -If you know the matrix room address or perhaps would like to join one of the IRC channels straight away without too much clicking, you can use this command: `/join #channel_name:server.url` (for example `/join #disroot:disroot.org`). For syntax and list of currently IRC bridged networks, check this page: https://github.com/matrix-org/matrix-appservice-irc/issues/208 - - ----------- - -# Creating rooms -To create new room simply click on the ![](en/riot_interface11.png?resize=26,24) and type desired name. You will automatically be logged into the new room and you can start inviting people to it by clicking on ![](en/riot_interface12.png?resize=110,28) button on the bottom right. - -Clicking room's settings button ![](en/riot_interface13.png?resize=25,25) in the **"chat detail"** block (top), will reveal some settings you might consider: - - - Who can access the room - - Enable Encryption - - Permissions to read rooms history - - User permissions - - additional aliases - -## Aliases -Remember when I said the rooms are federated? Since the room gets duplicated to other servers (whenever some user from other server joins the room), the rooms can continue living in the network even if the originating server is no longer available. This is the true power of decentralized and federated networks. They are immune to server shutdowns or censorship. -So since rooms "live in the network" you can easily add extra aliases to them. Usually those aliases refer to different servers (so that they they can be easily search-able and if permitted, listed in rooms directories on other servers), you can also add extra names you want your room to figure under. For example we want our disroot room to be accessible if someone tries to join room `#support:disroot.org` . We just simply add new alias to existing room. -**example:** - -![](en/riot_interface14.png) - - ----------- - -# Starting private chats -If you want to start chatting with someone in private, you can do it in numerous ways: - -The easiest way is to click on the ![](en/riot_interface15.png?resize=21,23) on the bottom of **"Action and Settings block**, and type the name of the person you would like to talk to. The autocompletion will give you suggestions based on the channels you are already in. - -![](en/riot_interface16.png) - -If you decided to upload your email and share you address book with riot, it will try to search through your address-book to provide you with names of you contacts that are already using matrix. - -If you want to talk to someone that does not figure in one of the rooms or your address book, you need to know their matrixID. The user address is quite similar to the room address but has **@** symbol instead of **#** in the beginning (@username:server.url). And so the address of our beloved test users is: @testuser:disroot.org - -Once you started new private room, you will notice it's not that much different then the ordinary matrix room. In fact it's pretty much the same thing. You can invite more people to it, change it's name, add user permissions, list it in room directory of the server, etc. - - ----------- - -# Enabling encryption -Since recently, matrix ships with end to end encryption. What does it mean? It means the messages are encrypted and decrypted on users computer without interference from the server side. This means administrators, or anyone "eavesdropping" on the conversation cannot read it. This quarantines privacy and protects your conversation from any dirty hands. - -Matrix uses same technology for encrypting messages as OMEMO on xmpp, SIgnal or Whatsapp. Matrix's implementation of it is called: [Olm](https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last/) -To enable encryption in your room go to room settings ![](en/riot_interface17.png) and select -![](en/riot_interface18.png) - -## Few things to be aware of when using Encryption -1. Encryption keys are created per device! This means you won't be able to read history of the conversation if you joined in at later stage with your device (eg. second laptop) -2. If you logout, or your browser (if using browser to connect) closes the session, your keys will be lost and newly created ones upon login will not be able to read history. This makes sense as in case your account is compromised, the history of your encrypted chats won't be view-able. We recommend therefore to use Riot mobile and native desktop versions and never hit the logout button (unless you want to lose your encrypted room history). -3. Once Encryption is enabled in the room, it cant be disabled. -4. You can't make use of any integration (linking to irc or slack or having rss bot for example). - -## Trust and key verification -Once you enter the room with encryption switched on, you will notice people having ![](en/riot_interface19.png?resize=17,21) or ![](en/riot_interface20.png?resize=22,20) next to their messages. - -- ![](en/riot_interface20.png?resize=22,20) Means the encryption key for the device the message has been sent from has not yet been verified by you. -- ![](en/riot_interface19.png?resize=17,21) means you have verified the device. - -**What does it mean?** -If you truly want to be sure person you are talking with is the one you think it is, you need to have an option to verify that. By default all the encryption keys of any user are not verified and that's why you get ![](en/riot_interface20.png?resize=22,20) next to their messages as an indication. In order to make sure the communication channel is secure, you need to trust that device and the person. Each device used by a person you communicate with generates encryption keys. Each key has it's unique fingerprint (just like human fingerprints). When you click on the ![](en/riot_interface20.png?resize=22,20) you will be presented with all the information about the device, it's key and the fingerprint. You can just blindly trust it by clicking on "Verify" button, but that's not ensuring you in any way the person on the other side is the one you think it is. - -The best way to verify the fingerprint is to use other means of communication (personally, email, other chat) to send each others fingerprints for verification. You can also ask some private questions in the chatroom in order to verify person you are talking to. It's up to you how you want to ensure you are safe and what's the level of security for your chat. Many other services (such as signal or whatsapp) seem to skip that point, or make it very easy (where your app trusts other persons encryption key by default) but that's what makes encryption less secure. In most cases when using other apps such as whatsapp by default you have no way of telling if someone's account has been tempered with (new encryption keys generated), and you need to manually enable such option. - -Encryption is not a joke and basic understanding how it works is what makes your communication more secure. - - ----------- - -# Integrations -Integration is what makes matrix so strong. With integration you can easily extend the features of the room by adding bots, as well as joining chats on different networks (protocols/apps) unconnected to matrix. - -To enable any of the integration, go to your room's Settings and click on "Manage integration" button. - - -## Bridges -At this moment you can easily bridge any room on several IRC networks. Slack and Gitter. There is more and more bridges being written so soon we will be able to easily integrate and link more networks with each other. At the moment we are looking into integration with: xmpp muc, telegram, hangouts, libpurple, etc. If you are interested, ask us for more details. - -## Other integrations - - - RSS bot - Updates posts based on RSS feed of chosen website. - - Guggy,Imgur and Giphy - Posts animated gifs based on keyword (eg. !guggy awesome) - - Github - you can post issued form the channel directly to your github project - -## Bots -We are working on deploying various bots you can invite to your room. Bots are there to basically serve you. From useful stuff such as, give you weather information on any given place, or distance between two cities, search wikipedia, loading RSS feeds, search the net, to useless things such as telling you a joke, or insult any given person. You can already now invite mijris (@mijris:chat.weho.st) form our friends at [weho.st](https://weho.st) to your channel. For more info type **!help** once mijris joins or ask us on our disroot channel for help. diff --git a/pages/04.Matrix/01.usage-basics/docs.es.md b/pages/04.Matrix/01.usage-basics/docs.es.md deleted file mode 100644 index 4e1e2f14..00000000 --- a/pages/04.Matrix/01.usage-basics/docs.es.md +++ /dev/null @@ -1,193 +0,0 @@ ---- -title: Riot/Matrix - Uso básico -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - -Riot es la aplicación cliente principal y más rica en características para usar con Matrix. Se presenta como chat web, como cliente de escritorio «nativo» y como aplicación móvil (Android, iOS). En este tutorial nos gustaría guiarte a través de su uso básico y mostrarte algunos trucos aquí y allá. - ----------- - -# ¿Cómo acceder a Riot? -Hay numerosas formas de poder interactuar con la red de Matrix a través del cliente Riot. - -## Aplicación web -La forma más fácil de acceder a Riot desde Disroot es yendo a . Todo lo que necesitas es un navegador web que ofrezcan soporte (actualmente Mozilla Firefox y Chromium o Google Chrome lo soporta. Otros navegadores también funcionan, pero no hay garantías de que todas las características funcionen correctamente). - -## Aplicación móvil -Para Android, nosotros desde luego recomendamos usar Riot a través de [F-droid](https://f-droid.org/repository/browse/?fdfilter=riot&fdid=im.vector.alpha), aunque si quieres recibir notificaciones automáticas y tu vida depende de los servicios de Google, también puedes usar la tienda de Google's Play. - -Para iOS, por supuesto, no tienes alternativas y debes usar su tienda de aplicaciones. Solo busca «Riot». - -## Aplicación de escritorio «nativa» -Intencionalmente usamos «nativo» entre comillas porque no es una solución puramente nativa. Básicamente es la aplicación web, pero se ejecuta desde tu propia computadora. Sin embargo, te ofrece la mejor seguridad, ya que no depende de terceros (ni siquiera de Disroot o cualquier otro servidor que proporcione Riot). Para ponerla en funcionamiento, sigue este enlace: . - ----------- - -# Cómo ingresar o registrar una cuenta -Para registrar una cuenta, ve a . - -**Consejo**: Actualmente, tu dirección de correo electrónico se compartirá con un servidor de terceros en matrix.org para proporcionarte la posibilidad de encontrar a tus contactos, así como para enviarte correos electrónicos sobre contraseñas olvidadas, etc. Esto, no obstante, es totalmente opcional y, si te preocupa tu privacidad y compartir información con matrix.org, puedes omitirlo. - -Para usuarios de Disroot, tu dirección de correo electrónico no se completa de manera predeterminada por el mismo motivo. Debes decidir si confías o no a matrix.org tu dirección de correo electrónico y puedes agregarla en una etapa posterior. - ----------- - -# Interfaz del usuario -La interfaz del usuario es bastante intuitiva si nunca has usado un sistema de chat tales como IRC, Slack o Rocket.chat. - -![](en/riot_interface1.png) - -A los efectos de este tutorial, nombraremos algunos de los elementos claves de la interfaz para ayudarte a identificarlos más adelante: - - - **Lista de salas** - El lugar donde puedes encontrar las salas de chats y «chats directos» (salas con exactamente una única persona a parte de ti mismo) en las que participas. Puedes ordenar estas salas de chats en varias categorías (favoritas, chats directos, baja prioridad) arrastrando la sala a la categoría correspondiente. - - **Detalles de la sala** - Aquí es donde se muestra la temática, el logo y el nombre de la sala. Además, ![](en/riot_interface2.png?resize=23,26) sirve para buscar palabras claves en el historial de la sala y ![](en/riot_interface3.png?resize=18,20) para configurar la sala, donde puedes, por ejemplo, cambiar la temática, añadir y gestionar integraciones y ajustar varias configuraciones de administración de la sala. - - **Ventana principal** - Esta es la parte principal de la aplicación. Aquí puedes ver todos los mensajes del chat en la sala actualmente seleccionada o todas las salas públicas cuando estás en el directorio de salas. - - **Área de mensajes** - Aquí es donde puedes escribir tus mensajes, subir archivos, grabar audio o videollamadas o webconferencias. - - **Lista de usuarios** - Aquí puedes ver todos los usuarios que participan actualmente en la sala. - - **Acciones y configuración** - Aquí puedes iniciar un nuevo chat directo, crear una nueva sala, mostrar todas las salas públicas, así como establecer tus configuraciones de usuario. - ----------- - -# Configuraciones de usuario -Lo primero después de ingresar con tu cuenta por primera vez es personalizar tus configuraciones de usuario. Para hacer esto, haz clic en ![](en/riot_interface4.png?resize=28,23) en el área **«Acciones y configuraciones»** (esquina inferior izquierda). En esta sección, puedes configurar varias informaciones sobre ti mismo, además del comportamiento de las notificaciones, habilitar características adicionales de la interfaz y comprobar y verificar la lista de dispositivos conectados. - -## Perfil - -![](en/riot_interface5.png) - -La sección permite añadir o cambiar información sobre tu perfil. - - - Puedes cambiar o subir tu nueva imagen de perfil - - Cambiar tu nombre a mostrar - - Añadir direcciones de correo electrónico **(esto es opcional)** - - Desconectar - - Cambiar contraseña **(los usuarios con una cuenta Disroot, deberán cambiar su exclusivamente a través de https://user.disroot.org)** - -## Notificaciones - -![](en/riot_interface6.png) - -Aquí puedes cambiar el comportamiento de las notificaciones para tu cuenta (ten en cuenta que estos cambios afectarán a todos los dispositiovs que ejecuten Riot. Esperamos que en el futuro podamos modificar las notificaciones en función del dispositivo). - -## Devices -Aquí puedes ver la lista de dispositivos conectados a tu cuenta. Puedes ver el ID del dispositivo, información general sobre el origen del dispositivo, como su nombre, la URL a la que están conectados, el nombre del sistema operativo y el navegador o cliente que se está utilizando, la dirección IP y la hora de la última conexión a tu cuenta. También puedes eliminar dispositivos que ya no uses. Si ves un dispositivo sospechoso o una dirección IP que nunca usas, puede significar que tu cuenta se ha visto comprometida y debes cerrar la sesión de inmediato (esto desconectará todos los dispositivos) y cambiar seguidamente tu contraseña. No cerrar la sesión no hará que el dispositivo comprometido vuelva a iniciar sesión. ¡Ten cuidado de no precipitarte a llegar a conclusiones demasiado rápido! Estudia la lista para estar seguro antes de volverte paranoico. - -## Desactivar cuenta -En la parte inferior de tus configuraciones de usuarios, puedes desactivar tu cuenta. - -![](en/riot_interface7.png) - ----------- - -# Directorio de salas -Lo mejor de Matrix es el hecho de que está totalmente federado. Significa que puedes unirte a cualquier canal en cualquier servidor que sea parte de la federación. En el directorio de salas, puedes buscar y descubrir salas en servidores amigables que han sido seleccionados (la lista seguirá creciendo), así como buscar salas en los servidores (si conoces la URL del servidor). Todas las salas públicas del servidor dado se relacionan en la ventana principal. - -![](en/riot_interface8.png) - -El menú desplegable de la derecha te permite filtrar las salas públicas de un servidor específico, o simplemente agregar la url del servidor que aún no está en la lista. - -![](en/riot_interface9.png) - -El campo de entrada de la izquierda se utiliza para escribir la dirección de la sala completa (si la conoces) o buscar salas utilizando palabras clave. - -![](en/riot_interface10.png) - - ----------- - -# Unirse a un canal -Puedes unirte a una sala de muchas formas. -La manera más sencilla de unirse a salas públicas es buscarlas en el directorio de salas. Puedes elegir una sala de la lista proporcionada por los servidores predefinidos o buscar la habitación en el servidor del que conozcas la dirección. - -También puedes simplemente hacer clic en la dirección de la sala si alguien la compartió contigo en el chat. La dirección de la sala consiste en #nombre_sala:servidor_matrix, por ejemplo, #disroot:disroot.org Este tipo de direcciones son reconocidas por el cliente Riot y, una vez haz clic en ellas, intentará unirte a la sala automáticamente. - -Si conoces la dirección de la sala de Matrix o tal vez deseas unirte a uno de los canales de IRC de inmediato sin demasiados clics, puedes usar este comando: `/join #nombre_canal:servidor.url` (por ejemplo, `/join #disroot:disroot.org`). Para conocer la sintaxis y la lista de redes IRC puenteadas actualmente, consulta esta página: https://github.com/matrix-org/matrix-appservice-irc/issues/208 - ----------- - -# Creación de salas -Para crear una nueva sala, simplemente haz clic en ![](en/riot_interface11.png?resize=26,24) y introduce el nombre que desees. Automáticamente ingresarás en la nueva sala y podrás empezar a invitar gente a la misma haciendo clic en el botón ![](en/riot_interface12.png?resize=110,28) de la parte inferior derecha. - -Haciendo clic en el botón de configuraciones de la sala ![](en/riot_interface13.png?resize=25,25) en el bloque de **«detalles del chat»** (arriba), se mostrarán algunas configuraciones que podrías considerar: - - - Quién puede acceder a la sala - - Habilitar encriptación - - Permisos para leer el historial de salas - - Permisos de usuarios - - Alias adicionales - -## Alias -¿Recuerdas cuando decíamos que las salas estaban federadas? Como la sala se duplica en otros servidores (cada vez que un usuario de otro servidor se une a la sala), las salas pueden seguir viviendo en la red, incluso si el servidor de origen ya no está disponible. Este es el verdadero poder de las redes descentralizadas y federadas. Son inmunes a los cierres de servidores o a la censura. - -En consecuencia, dado que las salas «viven en la red», puedes agregar fácilmente alias adicionales. Por lo general, esos alias se refieren a diferentes servidores (para que puedan buscarse fácilmente y, si está permitido, se muestren en los directorios de salas en otros servidores); también puedes agregar nombres adicionales por los que desees que figure tu sala. Por ejemplo, queremos que nuestra sala de Disroot sea accesible si alguien intenta unirse a `#support:disroot.org` . Simplemente añadimos un nuevo alias a la sala existente. - -**Ejemplo:** - -![](en/riot_interface14.png) - ----------- - -# Iniciar chats privados -Si quieres iniciar una charla privada con alguien, puedes hacerlo de numerosas formas: - -La forma más fácil es haciendo clic en el botón ![](en/riot_interface15.png?resize=21,23) de la parte inferior del bloque de **«Acciones y configuraciones»**, e introducir el nombre de la persona con la que te gustaría charlar. El autocompletado te proporcionará sugerencias basadas en los canales en los que participas. - -![](en/riot_interface16.png) - -Si decidiste proporcionar tu correo electrónico y compartir tu libreta de direcciones con Riot, intentará buscar en tu libreta de direcciones los nombres de tus contactos que ya estén usando Matrix. - -Si deseas hablar con alguien que no figure en las salas o en tu libreta de direcciones, necesitarás conocer su identificador de Matrix (matrixID). La dirección del usuario es bastante similar a la dirección de la sala, pero tiene un símbolo **@** en lugar de **#** al principio (@nombredeusuario:servidor.url). Y así, la dirección de nuestro querido usuario de prueba es: @testuser:disroot.org - -Una vez hayas comenzado una nueva sala privada, notarás que no es tan diferente de una sala de Matrix ordinaria. De hecho, es más o menos lo mismo. Puedes invitar a más personas, cambiar su nombre, agregar permisos de usuario, relacionarla en el directorio de salas del servidor, etc. - ----------- - -# Habilitar encriptación -Desde hace poco, Matrix envía mensajes encriptados de extremo a extremo. ¿Qué significa eso? Significa que los mensajes se cifran y descifran en la computadora de los usuarios sin interferencia del lado del servidor. Esto significa que los administradores, o cualquier persona que «escuche» la conversación, no puede leerla. Esto salvaguarda la privacidad y protege tu conversación de oídos y manos sucias. - -Matrix usa la misma tecnología para encriptar mensajes que OMEMO en XMPP, Signal o Whatsapp. La implementación de esto en Matrix se llama: [Olm](https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last/) -Para habilitar la encriptación en tu sala, ve a las configuraciones de sala ![](en/riot_interface17.png) y selecciona ![](en/riot_interface18.png) - -## Una pocas cosas a tener en cuenta cuando usas encriptación -1. ¡Las claves de cifrado se crean por dispositivo! Esto significa que no podrás leer el historial de la conversación si te uniste en una etapa posterior con tu dispositivo (por ejemplo, una segunda computadora portátil) -2. Si cierras la sesión, o tu navegador cierra la sesión (si usas el navegador para conectarte), tus claves se perderán y con las recién creadas al iniciar sesión no podrás leer el historial. Esto tiene sentido ya que, en caso de que tu cuenta se vea comprometida, el historial de tus chats encriptados no será visible. Por lo tanto, recomendamos utilizar las versiones móviles y de escritorio nativas de Riot y nunca presionar el botón de cerrar sesión (a menos que desees perder tu historial de salas encriptadas). -3. Una vez la encriptación sea habilitada en la sala, no se podrá deshabilitar. -4. No podrás hacer uso de ninguna integración (vincular a IRC o Slack o tener un bot de RSS, por ejemplo). - -## Confianza y verificación de claves -Una vez entras en la sala con la encriptación activada, notarás que los participantes tienen un símbolo ![](en/riot_interface19.png?resize=17,21) o ![](en/riot_interface20.png?resize=22,20) junto a sus mensajes. - -- ![](en/riot_interface20.png?resize=22,20) significa que la clave de cifrado para el dispositivo desde el que se envió el mensaje aún no ha sido verificado por ti. -- ![](en/riot_interface19.png?resize=17,21) significa que has verificado el dispositivo. - -**¿Qué significa esto?** -Si realmente quieres estar seguro de que la persona con la que estás hablando es la que crees que es, debes disponer de una opción para verificarlo. Por defecto, todas las claves de encriptación de cualquier usuario no están verificadas, y es por eso se muestra un símbolo ![](en/riot_interface20.png?resize=22,20) junto a sus mensajes como indicación. Para asegurarte de que el canal de comunicación sea seguro, debes confiar en ese dispositivo y en la persona. Cada dispositivo utilizado por una persona con la que te comunicas genera claves de cifrado. Cada clave tiene su huella digital única (al igual que las huellas dactilares humanas). Cuando haces clic en el símbolo ![](en/riot_interface20.png?resize=22,20), se te presentará toda la información sobre el dispositivo, su clave y la huella digital. Puedes simplemente confiar ciegamente en él haciendo clic en el botón «Verificar», pero eso no te garantiza de ninguna manera que la persona del otro lado es la que tú crees que es. - -La mejor manera de verificar la huella digital es usar otros medios de comunicación (personalmente, correo electrónico, otro chat) para enviar las huellas digitales a los demás para su verificación. También puedes hacer algunas preguntas privadas en la sala de chat para verificar que la persona con la que estás hablando es quien dice ser. Depende de ti cómo quieras verificar que es seguro y cuál es el nivel de seguridad de tu chat. Muchos otros servicios (como Signal o Whatsapp) parecen omitir este punto, o lo hacen demasiado fácil (permitiendo que tu aplicación confíe en la clave de cifrado de otras personas de forma predeterminada), pero eso provoca que el cifrado sea menos seguro. En la mayoría de los casos, cuando se usan otras aplicaciones como WhatsApp de forma predeterminada, no hay forma de saber si la cuenta de alguien se ha atenuado (se han generado nuevas claves de cifrado) y se debe habilitar manualmente dicha opción. - -El cifrado no es una broma y la comprensión básica de cómo funciona es lo que hace que tu comunicación sea más segura. - ----------- - -# Integraciones -La integración es lo que hace que Matrix sea tan fuerte. Con la integración, puedes ampliar fácilmente las características de la sala agregando bots, y unirte a chats en diferentes redes (protocolos o aplicaciones) desconectadas de Matrix. - -Para habilitar cualquier de las integraciones, ve a las configuraciones de tu sala y haz clic en el botón «Gestionar integración». - -## Puentes -En este momento, puedes unir fácilmente a cualquier sala desde varias redes IRC. Slack y Gitter. Cada vez se escriben más puentes, por lo que pronto podremos integrar y vincular más redes entre sí. En este momento estamos trabajando en la integración con: XMPP, Muc, Telegram, Hangouts, Libpurple, etc. Si estás interesado, consúltanos para obtener más detalles. - -## Otras integraciones - - - Bot de RSS - Actualizciones de publicaciones basadas en una fuente RSS del sitio web elegido. - - Guggy, Imgur y Giphy - Publicaciones de gifs animados basados en palabras clave (p. e., !guggy awesome). - - GitHub - Puedes publicar formularios de incidencias desde el canal directamente a tu proyecto en GitHub. - -## Bots -Estamos trabajando en la implementación de varios bots que puedes invitar a tu sala. Los bots están ahí para básicamente servirte. De cosas útiles, como darte información sobre el clima en un lugar determinado, la distancia entre dos ciudades, buscar en Wikipedia, cargar fuentes RSS, buscar en la red; cosas inútiles, como contarte una broma o insultar a cualquier persona. Ya puedes invitar a mijris (@mijris:chat.weho.st) creado por nuestros amigos de [weho.st](https://weho.st) a tu canal. Para más información, teclea **!help** una vez que mijris se una o solicita ayuda en nuestro canal de Disroot. diff --git a/pages/04.Matrix/01.usage-basics/docs.fr.md b/pages/04.Matrix/01.usage-basics/docs.fr.md deleted file mode 100755 index c367ff92..00000000 --- a/pages/04.Matrix/01.usage-basics/docs.fr.md +++ /dev/null @@ -1,203 +0,0 @@ ---- -title: Riot/Matrix - Utilisation de base -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - - -Riot est le client (application) principal et le plus riche en fonctionnalités à utiliser avec matrix. Il est livré sous forme de webchat, de client de bureau "natif" et d'application mobile (antroid, ios). Dans ce tutoriel, nous aimerions vous guider dans l'utilisation de base et vous montrer quelques astuces ici et là. - - - ----------- - -# Comment accéder à Riot? -Il existe de nombreuses façons d'interagir avec le réseau matrix via le client Riot. -## Webapp -Le moyen le plus simple d'accéder à Riot sur Disroot est d'aller sur https://chat.disroot.org Tout ce dont vous avez besoin est un navigateur web en état de marche. -## Application mobile -Pour Android, nous vous recommandons bien sûr d'utiliser Riot via [F-droid](https://f-droid.org/repository/browse/?fdfilter=riot&fdid=im.vector.alpha), bien que si vous voulez recevoir des notifications de push et que votre vie dépend des services google, vous pouvez également trouver riot sur le Google Play Store. - -Pour iOS bien sûr vous n'avez pas d'alternative et vous devez utiliser leur appstore. cherchez juste "Riot". -## L'application bureau "native" -Nous utilisons intentionnellement "native" dans les guillemets parce que ce n'est pas une solution purement native. C'est fondamentalement l'application web, mais dissociée de votre propre ordinateur. Elle vous offre cependant une grande sécurité car elle ne dépend pas d'une tierce partie (pas même pas Disroot ou un autre serveur qui fournit Riot). Pour la mettre en route, suivez ce lien: https://riot.im/desktop.html - - ----------- - -# Procédure de connexion / inscription d'un compte. -Pour vous inscrire, rendez-vous sur https://user.disroot.org - -**Astuce** Actuellement votre adresse email sera partagée avec un serveur tiers sur matrix.org afin de vous fournir une meilleure possibilité de trouver des contacts, ainsi que pour vous envoyer des emails de récupération du mot de passe, etc. Ceci est toutefois totalement facultatif et si vous êtes préoccupé par la confidentialité et le partage d'informations avec matrix.org, vous pouvez passer outre. - -Pour les utilisateurs Disroot - votre adresse e-mail n'est pas renseignée par défaut pour la même raison. Vous devriez décider si vous faites confiance ou non à matrix.org en leur laissant votre adresse e-mail et vous pouvez de toutes façons l'ajouter plus tard. - - ----------- - -# User Interface -L'interface utilisateur est très intuitive si vous avez déjà utilisé un système de chat comme IRC, Slack, Rocket.chat. - -![](en/riot_interface1.png) - -Pour les besoins de ce mode d'emploi, nous nommerons certains des éléments clés de l'interface pour vous aider à les identifier plus tard: - -- **Liste des chats** - Lieu où vous trouverez tous les salons de chat et les chats directs auxquels vous participez. -- **Détails des chats** - C'est l'endroit où le nom des salles, le logo et le sujet sont affichés. En plus ![](en/riot_interface2.png?resize=23,26) sert pour la recherche de mots-clés dans l'historique des salles et ![](en/riot_interface3.png?resize=18,20) sert pour les paramètres de salles, vous pouvez par exemple changer le sujet, ajouter et gérer des intégrations, et divers paramètres d'administration de salles. -- **Fenêtre principale** - C'est l'affichage principal de l'application. Vous pouvez voir tous les messages de chat dans la salle ou voir toutes les salles publiques en allant dans le répertoire de la salle. -- **Zone de message** - C'est l'endroit où vous tapez votre message, téléchargez le fichier, lancez un appel téléphonique, un appel vidéo ou une conférence. -- **Liste des utilisateurs**- C'est là que vous pouvez voir tous les utilisateurs qui participent actuellement à la salle. -- **Actions et paramétrages**** - ici vous pouvez démarrer un nouveau chat direct, créer une nouvelle salle, lister toutes les salles publiques, entrer vos paramètres utilisateur. - - ----------- - -# Paramètres utilisateur -La première chose après vous être connecté pour la première fois est de personnaliser vos paramètres utilisateur. Pour cela, cliquez sur ![](en/riot_interface4.png?resize=28,23) dans la zone **"Actions et paramètres"** (en bas à gauche). Dans cette section, vous pouvez configurer diverses informations sur vous-même, ainsi que le comportement des notifications, activer des fonctionnalités d'interface supplémentaires et vérifier la liste des périphériques connectés. - -## Profil - -![](en/riot_interface5.png) - -Cette section vous permet d'ajouter ou de modifier des informations sur votre profil. - -- Vous pouvez modifier ou télécharger votre nouvelle photo de profil -- Changer le nom de l'affichage -- Ajouter l'adresse email **(ceci est facultatif)** -- Vous déconnecter -- Modifier le mot de passe **(les utilisateurs avec un compte Disroot ne doivent changer leur mot de passe que par https://user.disroot.org)** - -## Notifications - -![](en/riot_interface6.png) - -Ici, vous pouvez modifier le comportement des notifications pour votre compte (notez que ces changements affecteront tous les périphériques en cours d'exécution de Riot, il est à espérer que dans l'avenir, nous serons en mesure de modifier les paramètres des notifications par périphérique). - -## Appareils -Une liste des appareils connectés à votre compte. Vous pouvez visualiser l'ID des périphériques, les informations générales sur l'origine des périphériques telles que leur nom, l'url à laquelle ils sont connectés, le système d'exploitation et le nom du navigateur (si connecté via le navigateur), leur adresse IP et la date de leur dernière connexion à votre compte. Vous pouvez également supprimer les appareils que vous n'utilisez plus. Si vous voyez un périphérique suspect ou une adresse IP que vous n'utilisez jamais, cela pourrait signifier que votre compte a été compromis. Vous devez immédiatement vous déconnecter (ceci déconnectera tous les appareils) et changer votre mot de passe. Le fait de ne pas se déconnecter n'entraînera pas la réinscription du périphérique compromis. Attention à ne pas tirer de conclusions trop vite! Étudiez la liste pour être sûr avant de courir dans tous les sens en mode parano. - -## Désactiver le compte -En bas de vos paramètres utilisateur, vous pouvez désactiver votre compte. - -![](en/riot_interface7.png) - - ----------- - - -# Répertoire des salles -La chose la plus cool à propos de matrix, c'est le fait qu'il soit totalement fédéré. Cela signifie que vous pouvez rejoindre n'importe quel canal sur n'importe quel serveur. Dans le répertoire des salles, vous pouvez rechercher et découvrir des salles sur les serveurs amis que nous avons répertoriés (la liste ne cessera de s'allonger) ainsi que rechercher des salles sur les serveurs (si vous connaissez l'URL des serveurs). Toutes les salles publiques d'un serveur donné sont listées dans la fenêtre principale. - -![](en/riot_interface8.png) - -Le menu déroulant à droite vous permet de filtrer les salles publiques du serveur spécifique, ou simplement ajouter l'url du serveur qui n'est pas encore listé. - -![](en/riot_interface9.png) - -Le champ de saisie de gauche permet d'entrer l'adresse complète de la salle (si vous la connaissez) ou de rechercher des salles à l'aide d'un mot-clé. - -![](en/riot_interface10.png) - - ----------- - -# Rejoindre un canal -Vous pouvez rejoindre une salle de plusieurs façons. -La façon la plus simple de rejoindre les salles publiques est de les rechercher dans l'annuaire des salles. Vous pouvez choisir une salle de la liste donnée par les serveurs prédéfinis ou rechercher la salle sur le serveur dont vous connaissez l'adresse. - - -Vous pouvez également cliquer sur l'adresse de la chambre si quelqu'un vous la partage dans le chat. L'adresse de la salle se compose de #nom_de_la_salle:serveur_matrix par exemple #disroot:disroot.org Ce type d'adresses est reconnaissable par le client Riot et une fois cliqué, celui-ci essaiera de rejoindre la salle automatiquement. - -Si vous connaissez l'adresse de la salle matrix ou si vous souhaitez rejoindre l'un des canaux IRC directement sans trop cliquer, vous pouvez utiliser cette commande: `/join #nom_du_canal:url_du_serveur` (par exemple `/join #disroot:disroot.org`). Pour la syntaxe et la liste des réseaux pontés IRC actuels, consultez cette page: https://github.com/matrix-org/matrix-appservice-irc/issues/208 - - ----------- - -# Création de salles -Pour créer une nouvelle salle cliquez simplement sur le bouton ![](en/riot_interface11.png?resize=26,24) et tapez le nom désiré. Vous serez automatiquement connecté à la nouvelle salle et vous pourrez commencer à y inviter des gens en cliquant dessus ![](en/riot_interface12.png?resize=110,28) en bas à droite. - -Cliquez sur le bouton Paramètres de la salle ![](en/riot_interface13.png?resize=25,25) dans le bloc (en haut) **"détail du chat"**, vous révélera certains paramètres qui peuvent vous intéresser: - -- Qui peut accéder à la salle? -- Activer le cryptage -- Permissions de lecture de l'histoire des salles -- Autorisations utilisateur -- alias supplémentaires. - -## Alias -Souvenez-vous quand j'ai dit que les salles étaient fédérées? Etant donné que la salle est dupliquée sur d'autres serveurs (chaque fois qu'un utilisateur d'un autre serveur rejoint la salle), les salles peuvent continuer à vivre dans le réseau même si le serveur d'origine n'est plus disponible. C'est le véritable pouvoir des réseaux décentralisés et fédérés. Ils sont à l'abri des arrêts de serveurs ou de la censure. -Donc, puisque les salles "vivent dans le réseau" vous pouvez facilement leur ajouter des alias supplémentaires. Habituellement, ces alias se réfèrent à différents serveurs (de sorte qu'ils peuvent être facilement recherchés et si permis, répertoriés dans les répertoires des salles sur d'autres serveurs), vous pouvez également ajouter des noms supplémentaires. Par exemple, nous voulons que notre salle Disroot soit accessible si quelqu'un essaie de rejoindre la salle `#support:disroot.org`. Il suffit d'ajouter un nouvel alias à la salle existante. -**exemple:** - -![](en/riot_interface14.png) - - ----------- - -# Démarrage de chats privés -Si vous voulez commencer à discuter avec quelqu'un en privé, vous pouvez le faire de plusieurs façons: - -La façon la plus simple est de cliquer sur le bouton ![](en/riot_interface15.png?resize=21,23) en bas du bloc **"Action et Paramètres**, et tapez le nom de la personne à qui vous souhaitez parler. L'auto-complétion vous donnera des suggestions basées sur les canaux dans lesquels vous êtes déjà. - -![](en/riot_interface16.png) - -Si vous avez décidé d'indiquer votre email et de partager votre carnet d'adresses avec riot, celui-ci tentera de faire une recherche dans votre carnet d'adresses pour vous fournir les noms de vos contacts qui utilisent déjà matrix. - -Si vous voulez parler à quelqu'un qui ne figure pas dans une des salles ou dans votre carnet d'adresses, vous devez connaître son identifiant matrix. L'adresse de l'utilisateur est assez similaire à l'adresse de la salle mais a le symbole **@** au lieu de **#** au début (@nom_d_utilisateur:url_serveur). Et donc l'adresse de nos utilisateurs de test bien-aimés est: @testuser:disroot.org - -Une fois que vous avez commencé une nouvelle salle privée, vous remarquerez qu'elle n'est pas très différente de la salle matrix ordinaire. En fait, c'est à peu près la même chose. Vous pouvez y inviter plus de personnes, changer son nom, ajouter des permissions d'utilisateur, la lister dans le répertoire des salles du serveur, etc. - - ----------- - -# Activation du chiffrement -Depuis peu, matrix est livrée avec un chiffrement de bout en bout. Qu'est-ce que ça veut dire? Cela signifie que les messages sont chiffrés et déchiffrés sur l'ordinateur des utilisateurs sans interférence du côté serveur. Cela signifie que les administrateurs, ou toute personne "espionnant" la conversation ne peuvent pas le lire. Ceci garantit votre vie privée et protège votre conversation. - -Matrix utilise la même technologie de chiffrement des messages que OMEMO sur xmpp, Signal ou Whatsapp. L'implémentation de Matrix est appelée: [Olm](https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last/) -Pour activer le chiffrement dans votre salle, accédez aux paramètres de la salle. ![](en/riot_interface17.png) et sélectionnez -![](en/riot_interface18.png) - -## Quelques points à savoir lors de l'utilisation du chiffrement -1. Les clés de chiffrement sont créées par appareil! Cela signifie que vous ne pourrez pas lire l'historique de la conversation si vous rejoignez la salle ultérieurement avec un autre appareil (ex. second ordinateur portable) -2. Si vous fermez la session, ou si votre navigateur (si vous utilisez le navigateur pour vous connecter) ferme la session, vos clés seront perdues et les clés nouvellement créées lors de la connexion ne pourront pas lire l'historique. Ceci est logique car si votre compte est compromis, l'historique de vos chats chiffrés ne sera pas visible. Nous vous recommandons donc d'utiliser les versions Riot mobile et bureau natif et de ne jamais appuyer sur le bouton de déconnexion (à moins que vous ne vouliez perdre l'historique de votre pièce chiffrée). -3. Une fois que le chiffrement est activé dans la pièce, il ne peut plus être désactivé. -4. Vous ne pouvez utiliser aucune intégration (lien vers irc ou slack ou avoir un bot rss par exemple). - -## Vérification de la confiance et des clés -Une fois que vous entrez dans la pièce avec le chiffrement activé, vous remarquerez que les gens ont ![](en/riot_interface19.png?resize=17,21) ou ![](en/riot_interface20.png?resize=22,20) à côté de leurs messages. - -- ![](en/riot_interface20.png?resize=22,20) signifie que la clé de chiffrement de l'appareil à partir duquel le message a été envoyé n'a pas encore été vérifiée par vous. -- ![](en/riot_interface19.png?resize=17,21) signifie que vous avez vérifié l'appareil. - -**Qu'est-ce que ça veut dire?** -Si vous voulez vraiment vous assurer que la personne avec qui vous parlez est bien celle que vous croyez, vous devez avoir une option pour vérifier cela. Par défaut, toutes les clés de chiffrement de tout utilisateur ne sont pas vérifiées et c'est pourquoi vous obtenez ![](en/riot_interface20.png?resize=22,20) à côté de leurs messages comme indication. Afin de s'assurer que le canal de communication est sécurisé, vous devez faire confiance à cet appareil et à la personne. Chaque appareil utilisé par une personne avec laquelle vous communiquez génère des clés de cryptage. Chaque clé a son empreinte digitale unique (comme les empreintes digitales humaines). Lorsque vous cliquez sur le bouton ![](en/riot_interface20.png?resize=22,20) vous obtiendrez toutes les informations concernant l'appareil, sa clé et l'empreinte digitale. Vous pouvez simplement lui faire aveuglément confiance en cliquant sur le bouton "Vérifier", mais cela ne vous assure pas que la personne de l'autre côté est bien celle que vous pensez que c'est. - -La meilleure façon de vérifier l'empreinte digitale est d'utiliser d'autres moyens de communication (personnellement, e-mail, autre chat) pour s'envoyer mutuellement des empreintes digitales pour vérification. Vous pouvez également poser des questions privées dans la salle de chat afin de vérifier la personne à qui vous parlez. C'est à vous de décider comment vous voulez vous assurer que vous êtes en sécurité et quel est le niveau de sécurité pour votre chat. Beaucoup d'autres services (tels que Signal ou Whatsapp) semblent ignorer ce point, ou le rendre très facile (où votre application fait confiance par défaut à la clé de chiffrement d'autres personnes), mais c'est ce qui rend le chiffrement moins sûr. Dans la plupart des cas, lorsque vous utilisez d'autres applications comme whatsapp par défaut, vous n'avez aucun moyen de savoir si le compte de quelqu'un a été compromis (nouvelles clés de chiffrement générées), et vous devez activer manuellement cette option. - -Le chiffrement n'est pas une blague et la compréhension de base de son fonctionnement est ce qui rend votre communication plus sûre. - - ----------- - -# Integrations -Les intégrations est ce qui rend matrix si fort. Avec les intégrations, vous pouvez facilement étendre les fonctionnalités de la salle en ajoutant des robots, ainsi que rejoindre des chats sur différents réseaux (protocoles/applications) non connectés à matrix. - -Pour activer n'importe quelle intégration, allez dans les Paramètres de votre salle et cliquez sur le bouton "Gérer l'intégration". - - -## Passerelles -Pour le moment, vous pouvez facilement lier n'importe quelle salle sur plusieurs réseaux IRC, Slack et Gitter. Il y a de plus en plus de passerelles en train d'être écrites si bien que bientôt nous pourrons facilement intégrer et relier plus de réseaux entre eux. En ce moment, nous étudions l'intégration avec: xmpp muc, telegram, hangouts, libpurple, etc. Si vous êtes intéressés, n'hésitez pas à nous contacter pour plus de détails. - -## Autres intégrations - -- Robot RSS - Mises à jour des messages basés sur le flux RSS du site Web choisi. -- Guggy et Giphy - Poster des gifs animés basés sur le mot-clé (ex.! guggy magnifique) -- Github - vous pouvez poster directement sur votre projet Github les problèmes émis sur le canal. - -## Robots -Nous travaillons sur le déploiement de différents robots que vous pouvez inviter dans votre salle. Les robots sont là pour vous servir. De choses utiles comme vous donner des informations météorologiques sur un endroit donné, ou la distance entre deux villes, une recherche wikipedia, le chargement de flux RSS, une recherche sur le net, à des choses inutiles comme vous dire une blague, ou insulter une personne donnée. Vous pouvez d'ores et déjà inviter mijris (@mijris:chat.weho.st) de nos amis [weho.st](https://weho.st) sur votre canal. Pour plus d'informations, tapez **!help** une fois que mijris vous rejoint ou demandez de l'aide sur notre canal Disroot. diff --git a/pages/04.Matrix/01.usage-basics/docs.pt.md b/pages/04.Matrix/01.usage-basics/docs.pt.md deleted file mode 100755 index 2f29c08e..00000000 --- a/pages/04.Matrix/01.usage-basics/docs.pt.md +++ /dev/null @@ -1,201 +0,0 @@ ---- -title: Riot/Matrix - Introdução -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - - -Riot é o cliente (app) principal e com mais funcionalidades para se usar com o matrix. Tem um webchat para aceder a partir de um browser, um cliente de desktop "nativo" e app para smarthphone (android e iOS). Neste tutorial gostaríamos de mostrar as funcionalidades básicas do Riot/Matrix e mostrar-lhe alguns truques. - - - ----------- - -# Como aceder ao Riot -Existem várias maneiras através das quais pode usar a rede do matrix com um cliente Riot. -## Aplicação Web -A maneira mais fácil de aceder ao Riot no Disroot é indo a https://chat.disroot.org. A única coisa de que necessita é de um browser. -## Aplicação para smartphone -No caso do android recomendamos obviamente que instale o Riot via [F-droid](https://f-droid.org/repository/browse/?fdfilter=riot&fdid=im.vector.alpha), mas se quer receber notificações push e a sua vida depende dos serviços da google, também pode descarregar a app através da google play store. - -No caso do iOS, claro que não há alterantiva e a única opção é usar a appstore deles. Basta procurar por "Riot". - -## Aplicação de Desktop "Nativa" -Usamos a expressão "Nativa" entre aspas de propósito porque não é uma solução 100% nativa. É basicamente a aplicação web a funcionar a partir do seu computador para se ligar à rede matrix. No entanto é a solução mais segura pois não depende de terceiros (nem do Disroot ou qualquer outro servior que tenha a aplicação Riot). A a ter a funcionar no seu desktop siga um dos links na seguinte página: https://riot.im/desktop.html - - ----------- - -# Como fazer login / registar conta. -Para registar uma conta vá a https://user.disroot.org - -**Dica** Atualmente o seu email é partilhado por princípio com o servidor do matrix.org de modo a facilitar a descoberta de contactos e para ter um email para enviar um link de recuperação de password, emails, etc. Isto é opcional e se está preocupado com a sua privacidade e partilha de dados com o matrix.org pode saltar esta opção. - -Para utilizadores do Disroot, o endereço de email não é enviado por predefinição exatamente questão de privacidade. Você deve decidir se confia ou não no matrix.org para terem o seu email e se quiser pode adicionar o seu email mais tarde. - - ----------- - -# Interface de utilizador -O interface de utilizador é bastante intuitivo caso já tenha utilizado antes sistemas de chat como por exemplo: IRC, Slack, Rocket.chat. - -![](pt/riot_interface1.png) - -Para efeitos deste tutorial iremos apelidar alguns dos elementos principais do interface para nos ajudar a identificá-los mais em diante: - - - **Lista de Salas de Chat** - O sítio onde encontrará todas as salas de chat e conversas diretas nas quais participa. Pode organizar estas salas de chat em várias categorias (ex: favoritos, conversas diretas, baixa prioridade) arrastando as salas para cima e para baixo. - - **Detalhes da Sala** - É onde está o nome da sala, o tópico e o logótipo da mesma. Para além disso ![](pt/riot_interface2.png?resize=23,26) serve para procurar palavras chave no histórico da sala e ![](pt/riot_interface3.png?resize=18,20) é onde pode alterar as várias configurações de administração da sala e gerir as integrações (se tiver direitos de administrador da sala). - - **Janela principal do chat** - Esta é a janela principal da aplicação. Aqui pode ver todas as mensagens de chat da respetiva sala, ou ver todas as sala de chat públicas quando vai a "Lista de Salas". - - **Área de mensagens** - é onde escreve as suas mensagens, faz upload de um ficheiro, inicia uma conversa pu conferência de vídeo ou áudio. - - **Utilizadores na Sala** - (Ou Lista de utilizadores) é onde pode ver todos os utilizadores que estão a participar na sala. - - **Ações e configurações** - Aqui pode começar novos chats diretos, com outros utilizadores, criar uma sala de chat nova, listar as salas públicas todas, editar/editar o seu perfil de utilizador(a). - - ----------- - -# Perfil/configurações de utilizador -A primeir coisa a afazer depois do primeiro login é costumizar o perfil/configurações de utilizador. Para isso carregue em ![](en/riot_interface4.png?resize=28,23) **"Configurações"** (em baixo, do lado esquerdo). Aqui pode inserir várias informações sobre si, bem como configurar como funcionarão as notificações, habilitar funcionalidades extra, verificar a lista de dispositivos ligados a esta conta. - -## Perfil - -![](pt/riot_interface5.png) - -Esta parte permite-lhe adicionar ou alterar as informações acerca do seu perfil. - - - Pode alterar ou carregar uma nova fotografia de perfil - - Mudar o nome que aparece a outras pessoas - - Adicionar um endereço de email **(isto é opcional)** - - Fazer Logout - - Alterar a palavra-passe **(utilizadores do Disroot para alterar a sua palavra-passe devem ir a: https://user.disroot.org)** - -## Notificações - -![](pt/riot_interface6.png) - -Aqui pode alterar o comportamento das notificações da sua conta (tenha em conta que alterações aqui irão afetar todos os seus dispositivos onde tem o Riot a funcionar), esperamos que de futuro seja possível ajustar estas definições por dispositivo. - -## Dispositivos -A lista de dispositivos que se ligaram à sua conta. Pode ver a ID dos dispositivos, informação geral acerca dos dispositivos origem, o url a que se ligou, sistema operativo, e o browser (caso se tenha ligado via browser), o IP e a última ligação feita à sua conta. Também pode apagar o registo de dispositivos que já não utilize. Se vir um IP suspeito que nunca tenha utilizado pode querer significar que a sua conta foi comprometida. Nesse caso deve fazer logout imediatamente (isto fará o logout de todos os seus dispositivos) e alterar a sua palavra-passe. Seja cuidadoso e não tire conclusões precipitadas! Estude a lista com cuidado para ter a certeza das suas conclusões antes de entrar em modo paranoico. - -## Desativar a conta -Neste botão do seu perfil de utilizador pode desativar a sua conta. - -![](pt/riot_interface7.png) - - ----------- - - -# Lista de Salas/Diretório -Uma das coisas mais fixes no matrix é que é completamente federado. O que significa que pode juntar-se a qualquer canal/chat independentemente do servidor onde esse canal está alojado. Na Lista de Salas pode procurar e descobrir salas/chat alojados em servidores "amigos" de outros grupos que temos listados (a lista continuará a crescer) bem como procurar salas em servidores (se souber o endereço URL da sala). Todas as salas de chat públicas de um servidor matrix estão listadas na janela principal. - -![](pt/riot_interface8.png) - -O menu do lado direito permite-lhe filtrar as salas públicas de um servidor especifico, ou simplesmente adicionar um URL de um servidor que ainda não esteja listado. - -![](pt/riot_interface9.png) - -O campo de pesquisas do lado esquerdo serve para ou pesquisar o endereço completo de uma sala (se o souber) ou para procurar sala usando palavras chave. - -![](pt/riot_interface10.png) - - ----------- - -# Entrar numa sala -Você pode entrar numa sala de chat de várias maneiras. -A maneira mais simples de entrar numa sala é procurar na Lista de Salas. Pode ou escolher uma sala que já esteja listada no servidor ou procurar a sala em causa, se souber o endereço dela. - -Pode simplesmente carregar no endereço da sala (se alguém partilhar essa informação consigo). O endereço de uma sala consiste em #nome_da_sala:servidor_matrix, por exemplo: #disroot:disroot.org. Este tipode endereços são reconhecidos por qualquer cliente de matrix (Ex: o Riot) e quando carrega neles irá entrar na sala. - -Se sabe o endereço de uma sala ou se quer juntar-se a a um dos canais de IRC imediatamente sem teer que carregar muitas vezes no rato pode usar este comando: `/join #channel_name:server.url` (por exemplo `/join #disroot:disroot.org`). Para ter uma lista da sintaxe e uma lista das salas matrix de ligadas a salas de IRC consulte esta página: https://github.com/matrix-org/matrix-appservice-irc/issues/208 - - ----------- - -# Criar Salas -Para criar uma sala basta carregar em ![](pt/riot_interface11.png?resize=26,24) e escrever o nome da sala que quer criar. Irá entrar automaticamente na nova sala e pode começar a convidar outros utilizadores para se juntarem à sala carregando no botão ![](pt/riot_interface12.png?resize=110,28) no canto inferior direito. - -Carregando no botão de configurações da sala ![](pt/riot_interface13.png?resize=25,25) na zona **"Detalhes da Sala"** no topo da janela, irá ver algumas possibilidades de configuração da sala que talvez lhe interessem: - - - Quem pode acessar a esta sala - - Habilitar criptografia - - Permissões sobre quem pode ler o histórico da sala - - Permissões dos utilizadores - - Endereços adicionais para a sala - -## Endereços -Lembra-se de termos dito que as salas são federadas? Como as salas são duplicadas para outros servidores (sempre que um utilizador de outro servidor matrix se junta a uma sala do servidor que você está a utilizar essa sala é duplicada no servidor do outro utilizador). Assim as salas podem continuar a existir na rede mesmo que os servidores matrix onde essas salas foram originalmente criadas já não existam. Esta é a verdadeira força de redes descentralizadas e federadas. São imunes a falhas de servidores e censura.
-Como as salas "vivem na rede" pode facilmente adicionar endereços extra para essa sala. Normalmente esses endereços referen-se a servidores diferentes (para que sejam fáceis de procurar e se permitido listadas na lista de Salas de outros servidores). Também pode adicionar nomes extra para a sua sala. Por exemplo se nós quisermos que a nossa sala Disroot seja acessível se alguém se tentar juntar à sala escrevendo `#support:disroot.org`. Simplesmente adicionamos o novo endereço à sala já existente. -**exemplo:** - -![](pt/riot_interface14.png) - - ----------- - -# Iniciar uma conversa direta/privada -Se quiser começar a conversar diretamente com outra pessoa pode fazê-lo de várias maneiras: - -A mais fácil é carregar em ![](pt/riot_interface15.png?resize=21,23) na secção **"Ações e Configurações**, no canto inferior esquerdo e escrever o nome de utilizador da pessoa com quer falar. O sistema de autocomple irá dar-lhe algumas sugestões de utilizadores com base nas salas/canais nos quais já participa. - -![](pt/riot_interface16.png) - -Caso você tenha decidido inserir o seu endereço de email e partilhar a sua lista de endereços de email com o Riot, o cliente irá tentar procurar na sua lista de contactos de email para o informar de contactos de email seus que também são utilizadores do matrix (caso eles tenham partilhado os seus contatos de email nas suas informações de perfil). - -Se quiser falar com alguém que não está listado numa sala ou que no seu livro de endereços de email então necessita de saber o matrixID dessa pessoa. O enderço do utilizador é bastante parecido com a estrutura de um endereço de uma sala mas tem o símbolo **@** em vez de **#** no início (@nome_de_utilizador:server.url). Por exemplo o endereço do nosso querido utilizador de testes é: @testuser:disroot.org - -Assim que começar a conversar numa sala privada vai ver que não é muito diferente do que uma sala de chat pública. De fato é exatamente a mesma coisa. Pode convidar pessoas, alterar o nome da sala, alterar as permissões de utilizadores, colocar a sala na Lista de Salas do servidor, etc. - -# Habilitar encriptação -O matrix tem suporte para encriptação ponta a ponta. O que é que isso significa? Significa que as mensagens são encriptadas e desencriptadas nos computadores dos utilizadores sem interferência do servidor. Isso significa que os administradores ou qualquer pessoa que esteja "a escutar" a conversa não consegue ler o seu conteúdo. Isto garante a privacidade e proteje a sua conversa de terceiros. - -O matrix usa a mesma tecnologia para encriptar as mensagens que o OMEMO no xmpp, Signal ou Whatsapp. A implementação de encriptação do Matrix chama-se: [Olm](https://matrix.org/blog/2016/11/21/matrixs-olm-end-to-end-encryption-security-assessment-released-and-implemented-cross-platform-on-riot-at-last/) -Para habilitar encriptação de uma sala do qual é administrador, vá às definições da sala e escolha ![](pt/riot_interface13.png?resize=25,25) - -![](pt/riot_interface18.png) - -## Algumas coisas a ter em conta quando usa encriptação -1. As chaves de encriptação são criadas por dispositivo! Isto significa que não será capaz de ler o histórico de conversas anteriores da sala se se juntar à sala a partir de outro dispositivo (i.e; um segundo computador) -2. Se fizer logout ou se o seu browser fechar a sessão (caso esteja a utilizar um browser para se ligar) irá perder as suas chaves de encriptação e serão criadas novas chaves, o que significa que não será capaz de ver o histórico de conversas encriptadas anteriores. Isto é útil, caso a sua conta seja comprometida, o histórico dos seus chats encriptados não será comprometido. Por isso recomendamos utilizar a aplicação de Desktop e de telemóvel do Riot e nunca carregar no botão de Logout/Sair (a não ser que queira "perder" o histórico da sua sala encriptada de propósito). -3. Uma vez que a encriptação esteja habilitada não pode ser desativada. -4. Não é possível utilizar nenhum tipo de integração (por exemplo: ligar a sala a uma sala de IRC, Slack, Telegram ou ter bots de RSS). - -## Confiança e verificação de chaves -Assim que entra numa sala encriptada, irá ver que as pessoas que participam na sala tem nas suas mensagens um dos seguintes simbolos ![](pt/riot_interface19.png?resize=17,21) ou ![](pt/riot_interface20.png?resize=22,20). - -- ![](pt/riot_interface20.png?resize=22,20) Significa que a chave de encriptação do dispositivo a partir da qual a pessoa escreveu a mensagem foi enviada mas ainda não foi verificada por si. -- ![](pt/riot_interface19.png?resize=17,21) significa que verificou o dispositivo. - -**O que é que isto quer dizer?**
-Se você quer mesmo ter a certeza de que está a falar com uma determinada pessoa (e não alguém que intercetou a comunicação), então precisa de ter uma maneira de poder verificar isso. Por principio todas as chaves de encriptação aparecem como "não verificadas" e é por isso que aparece o símbolo ![](en/riot_interface20.png?resize=22,20) à esquerda das mensagens. De modo a poder certificar-se de que o canal de comunicação é seguro, necessita de "confiar/verificar" aquele dispositivo e a pessoa. Cada dispositivo diferente que uma pessoa utiliza para comunicar gera uma chave de encriptação diferente. Cada chave de encriptação tem uma impressão digital "Fingerprint", como se fossem impressões digitais humanas diferentes. Quando carrega em ![](en/riot_interface20.png?resize=22,20) ser-lhe-á apresentada informações acerca daquele dispositivo, a chave e a "Fingerprint". Pode simplesmente confiar cegamente na chave e carregar no botão "Verificar", mas isto não lhe vai assegurar que a pessoa no outro lado da conversa é mesmo quem você pensa que é. - -A melhor maneira de verificar a "Fingerprint" de outra pessoa é usando outro meio de comunicação (pessoalmente, email, outro chat) e enviar as "Fingerprint" para verificação. Também pode fazer algumas perguntas privadas no chat para se certificar que a outra pessoa é mesmo quem diz ser. É uma opção sua a maneira de se certificar qual o nível de segurança que quer ter no seu chat. Muitos outros serviços (como o Signal ou o Whatsapp) parecem saltar esta parte, ou fazem isto de um modo muito fácil (onde a sua aplicação "confia" nas chaves de encriptação de outras pessoas por princípio) mas isso torna a encriptação menos segura. Em muitos casos quando utiliza outras aplicações, como por exemplo o whatsapp, por principio essa aplicação não tem maneira de verificar se a conta de alguém pode ter sido comprometida (com novas chaves de encriptação geradas), e (no caso do whatsapp) precisa de habilitar manualmente essa opção. - -Encriptação não é um jogo ou uma piada e uma compreensão básica de como funciona ajuda a tornar as suas comunicações mais seguras. - - ----------- - -# Integrações -Integração é uma das coisas que torna o matrix tão forte. Com integrações pode adicionar funcionalidades à sua sala, adicionando bots, ligando a sua sala a outras salas que usam protocolos de comunicação diferentes do matrix (ex: IRC, Slack, Telegram) -Paraa habilitar qualquer tipo de integração basta ir a "Gerenciar Integrações" na barra do topo da sala. - - -## Bridges -Neste momento pode facilmente fazer uma bridge/ligação entre a sua sala e várias redes de IRC, Slack e Gitter (isto permite a quem está na sala de IRC, Slack, Gitter e na sua sala de matrix, comunicarem entre si, apesar de serem salas com protocolos de comunicação diferentes). -Existem cada vez mais bridges a serem escritas por isso em breve poderemos ligar e integrar cada vez mais redes entre elas. De momento estamos a avaliar integração com: xmpp muc, telegram, hangouts, libpurple, etc. Se está interessado em mais pormenores entre em contacto connosco. - -## Outras integrações - - - RSS bot - Actualizações e feeds de RSS de um site escolhido por si. - - Guggy e Giphy - Publicam posts com gifs baseados em palavras chave (ex: !guggy awesome) - - Github - pode criar um issue a partir da sala para o seu projeto no Github - -## Bots -Estamos a trabalhar em vários bots que pode convidar (como se fossem um utilizador) para a sua sala. Os Bots estão lá para trabalhar para si. Desde coisas úteis como, dar informação meteorológica de um local, ou a distancia entre duas cidades, procurar informação na wikipédia, feeds de RSS, pesquisas na net a coisas ínuteis como por exemplo contar anedotas, insultar uma pessoa. Se quiser pode para já convidar o mijris (@mijris:chat.weho.st) dos nossos amigos do [weho.st](https://weho.st) para o seu canal/sala. Para mais informações escreva **!help** depois de o mijris se juntar à sala ou peça ajuda no nosso canal do Disroot. diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface1.png b/pages/04.Matrix/01.usage-basics/en/riot_interface1.png deleted file mode 100755 index baf8e08f..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface1.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface10.png b/pages/04.Matrix/01.usage-basics/en/riot_interface10.png deleted file mode 100755 index 859f747e..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface10.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface11.png b/pages/04.Matrix/01.usage-basics/en/riot_interface11.png deleted file mode 100755 index 41b4b369..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface11.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface12.png b/pages/04.Matrix/01.usage-basics/en/riot_interface12.png deleted file mode 100755 index b5dbd373..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface12.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface13.png b/pages/04.Matrix/01.usage-basics/en/riot_interface13.png deleted file mode 100755 index 8e4fe15d..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface13.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface14.png b/pages/04.Matrix/01.usage-basics/en/riot_interface14.png deleted file mode 100755 index 226c95a5..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface14.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface15.png b/pages/04.Matrix/01.usage-basics/en/riot_interface15.png deleted file mode 100755 index 4b1ac6df..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface15.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface16.png b/pages/04.Matrix/01.usage-basics/en/riot_interface16.png deleted file mode 100755 index 0c39e6f0..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface16.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface17.png b/pages/04.Matrix/01.usage-basics/en/riot_interface17.png deleted file mode 100755 index c7de02e9..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface17.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface18.png b/pages/04.Matrix/01.usage-basics/en/riot_interface18.png deleted file mode 100755 index 43e677d6..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface18.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface19.png b/pages/04.Matrix/01.usage-basics/en/riot_interface19.png deleted file mode 100755 index 60b2ff0f..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface19.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface2.png b/pages/04.Matrix/01.usage-basics/en/riot_interface2.png deleted file mode 100755 index 3f7bcdf1..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface2.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface20.png b/pages/04.Matrix/01.usage-basics/en/riot_interface20.png deleted file mode 100755 index d298b249..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface20.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface3.png b/pages/04.Matrix/01.usage-basics/en/riot_interface3.png deleted file mode 100755 index ae0be903..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface3.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface4.png b/pages/04.Matrix/01.usage-basics/en/riot_interface4.png deleted file mode 100755 index d467524a..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface4.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface5.png b/pages/04.Matrix/01.usage-basics/en/riot_interface5.png deleted file mode 100755 index c49b9ab8..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface5.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface6.png b/pages/04.Matrix/01.usage-basics/en/riot_interface6.png deleted file mode 100755 index 4120ded4..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface6.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface7.png b/pages/04.Matrix/01.usage-basics/en/riot_interface7.png deleted file mode 100755 index 2e84c67f..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface7.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface8.png b/pages/04.Matrix/01.usage-basics/en/riot_interface8.png deleted file mode 100755 index 7c0e886c..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface8.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/en/riot_interface9.png b/pages/04.Matrix/01.usage-basics/en/riot_interface9.png deleted file mode 100755 index 9392736c..00000000 Binary files a/pages/04.Matrix/01.usage-basics/en/riot_interface9.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface1.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface1.png deleted file mode 100755 index 6c67f26d..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface1.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface10.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface10.png deleted file mode 100755 index ac63a131..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface10.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface11.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface11.png deleted file mode 100755 index fbb190a5..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface11.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface12.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface12.png deleted file mode 100755 index 57995c7f..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface12.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface13.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface13.png deleted file mode 100755 index b91cc89b..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface13.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface14.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface14.png deleted file mode 100755 index a1fe262d..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface14.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface15.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface15.png deleted file mode 100755 index c3e4f696..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface15.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface16.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface16.png deleted file mode 100755 index e944ffd1..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface16.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface18.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface18.png deleted file mode 100755 index c29f143a..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface18.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface19.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface19.png deleted file mode 100755 index 429633a8..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface19.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface2.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface2.png deleted file mode 100755 index 3f7bcdf1..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface2.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface20.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface20.png deleted file mode 100755 index d298b249..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface20.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface3.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface3.png deleted file mode 100755 index b91cc89b..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface3.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface4.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface4.png deleted file mode 100755 index d467524a..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface4.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface5.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface5.png deleted file mode 100755 index 6a759e8d..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface5.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface6.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface6.png deleted file mode 100755 index d6605b42..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface6.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface7.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface7.png deleted file mode 100755 index 286b47cc..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface7.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface8.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface8.png deleted file mode 100755 index 2b9c3a23..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface8.png and /dev/null differ diff --git a/pages/04.Matrix/01.usage-basics/pt/riot_interface9.png b/pages/04.Matrix/01.usage-basics/pt/riot_interface9.png deleted file mode 100755 index 64ead895..00000000 Binary files a/pages/04.Matrix/01.usage-basics/pt/riot_interface9.png and /dev/null differ diff --git a/pages/04.Matrix/docs.en.md b/pages/04.Matrix/docs.en.md deleted file mode 100755 index 03eed041..00000000 --- a/pages/04.Matrix/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: matrix -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/04.Matrix/docs.es.md b/pages/04.Matrix/docs.es.md deleted file mode 100644 index 3a241206..00000000 --- a/pages/04.Matrix/docs.es.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: matrix -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/04.Matrix/docs.fr.md b/pages/04.Matrix/docs.fr.md deleted file mode 100755 index 3a241206..00000000 --- a/pages/04.Matrix/docs.fr.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: matrix -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/04.Matrix/docs.pt.md b/pages/04.Matrix/docs.pt.md deleted file mode 100755 index 3a241206..00000000 --- a/pages/04.Matrix/docs.pt.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: matrix -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/05.Social/01.DisHub/00.Contents/docs.en.md b/pages/05.Social/01.DisHub/00.Contents/docs.en.md new file mode 100644 index 00000000..ae7531cb --- /dev/null +++ b/pages/05.Social/01.DisHub/00.Contents/docs.en.md @@ -0,0 +1,48 @@ +--- +title: Hubzilla: DisHub Guide +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](/social/dishub/en/round_logo.png)| +|:--:| +|**DisHub: Disroot's Hubzilla instance** how2| + +# Contents + +1. [Basics](basics) + - [How2 start really quick?](/social/dishub/basics) + - [User interface overview](/social/dishub/basics/user_interface) + - [Navigation bar](/social/dishub/basics/navigation_bar) +2. [Channels](dishub/channels) + - [What is a channel?](/social/dishub/channels) + - [Creating a channel](/social/dishub/channels/creation) + - [Profiles](/social/dishub/profiles) + - [Blocking a channel](/social/dishub/channels/blocking) + - [Ignoring a channel](/social/dishub/channels/ignoring) + - [Archiving a channel](/social/dishub/channels/archiving) + - [Hiding a channel](/social/dishub/channels/hiding) +3. [Connections](/social/dishub/connections) +4. [Permissions](/social/dishub/permissions) + - [Default channel permissions limits](/social/dishub/permissions/default_channel_permissions-limits) + - [Channel permissions roles](/social/dishub/permissions/channel_permission_roles) + - [Channel permissions limits](/social/dishub/permissions/channel_permission_limits) + - [ACL: Access Control List](/social/dishub/permissions/acl) + - [Guest Access Token](/social/dishub/permissions/guest_access_tokens) + - [Channel roles permissions table](/social/dishub/permissions/channel_roles) +5. [Posting and publishing](/social/dishub/posting) + - [Composing](/social/dishub/posting/composing) + - [Tags and mentions](/social/dishub/posting/tags_and_mentions) + - [Published post options](/social/dishub/posting/published_post_options) +6. [Wiki](/social/dishub/wiki) +7. [Features](/social/dishub/features) + - [Connections Filtering](/social/dishub/features/connection_filtering) + - [Personal Cloud Storage](/social/dishub/features/personal_cloud_storage) + - [Bookmarks](/social/dishub/features/bookmarks) + - [Chat](/social/dishub/features/chat) + - [Calendar](/social/dishub/features/calendar) + - [Photo album](/social/dishub/features/photo_album) +8. [FAQ](/social/dishub/faq) diff --git a/pages/05.Social/01.DisHub/01.Basics/01.User_interface/docs.en.md b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/docs.en.md new file mode 100644 index 00000000..28d7e3f4 --- /dev/null +++ b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/docs.en.md @@ -0,0 +1,49 @@ +--- +title: Hubzilla Basics: DisHub User Interface +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## User Interface Overview +After logging in, filled out your profile and created a channel, this is, almost for sure, how your channel will look like: + +![basics_interface](en/Basics_interface.png) + +Yes, it doesn’t look much pretty, huh? But, don’t get into a daze, by the end of this overview, you should be able to make your channel looks more like this... + +![basics_interface_improved](en/Basics_interface_improved.png) + +… (or even better) and know where are the most important tools and features, what are they for and what the possibilities of each one of them. And that would be just the beginning. + +Let’s start by knowing the spaces our new home first. Later you could decorated whatever you want. + +For the purpose of this tutorial we will name the parts, or blocks, of the User Interface (UI) in order to identify them later. + +![basics_UI](en/Basics_UI.png)
+ +01. **Navigation bar**: From here you access to your personal settings, the menu, the network and public streams, apps, the directory, wikis, the chat, etc. It is very customizable, and it functions like a shortcut and launch applications bar. [To know more about it...](../Navigation_bar) + +02. **Profile section**: Here there’s some basic information about your channel, like your name and hub address. You can add more info if you want. [To know more about it...](../../02.Channels/02.Profiles) + +03. **Share box**: The place where you write and share your thoughts, things you like, your photos, compose articles, etc. By clicking on it the post compositor opens. It’s a very well-suited editor to compose and edit your post or shares. [To know more about it...](../../05.Posts) + +04. **Activity Notifications**: It informs you about what is happening in the network stream, in the public stream and if you received a connection request, a mail, if someone commented a post you’ve created or a post that you’ve been following. We’ll see about it later. + +05. **Connections**: Here you can see some of your connections (those you interact the most) and the common connections you may have with other users while visiting a channel. [To know more about it...](../../03.Connections) + +06. **Channel stream**: It works like the “wall” of most social networks, it’s the place where you see your posts, the comments on them (if they’re enable), the posts you’ve re-shared, and those from the people you’ve give permissions to write on it, the posts of your connections. [To know more about it...](../../05.Posts) + +07. **Right side widgets**: This space can be used not only as a widget section, but almost anything you want to have accessible (information, apps, notes, sites, shortcuts, etc, as we’ll see later) can be setted to appear in this place. + + +**NOTE: On the mobile version, the sidebars are hidden.** If you want to show the left sidebar you have to click on the arrow icon.
+ +![MobileLeftBar](en/MobileLeftBar.gif)
+ +The right bar is limited to activity notifications only. If you want to see the notifications, click on the exclamation point icon.
+ +![MobileLeftBar](en/MobilerightBar.gif)
diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_UI.png b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_UI.png similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_UI.png rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_UI.png diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_add_things.gif b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_add_things.gif similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_add_things.gif rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_add_things.gif diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_basic_settings.png b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_basic_settings.png similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_basic_settings.png rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_basic_settings.png diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_interface.png b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_interface.png similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_interface.png rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_interface.png diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_interface_improved.png b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_interface_improved.png similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_interface_improved.png rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_interface_improved.png diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_profile_tools.png b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_profile_tools.png similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_profile_tools.png rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_profile_tools.png diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/Basics_things.png b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_things.png similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/Basics_things.png rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/Basics_things.png diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/MobileLeftBar.gif b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/MobileLeftBar.gif similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/MobileLeftBar.gif rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/MobileLeftBar.gif diff --git a/pages/10.DisHub/01.Basics/01.User_interface/en/MobilerightBar.gif b/pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/MobilerightBar.gif similarity index 100% rename from pages/10.DisHub/01.Basics/01.User_interface/en/MobilerightBar.gif rename to pages/05.Social/01.DisHub/01.Basics/01.User_interface/en/MobilerightBar.gif diff --git a/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/docs.en.md b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/docs.en.md new file mode 100644 index 00000000..893ed31b --- /dev/null +++ b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/docs.en.md @@ -0,0 +1,109 @@ +--- +title: Hubzilla Basics: Navigation Bar +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# Navigation bar + +Here is the navigation bar: +![Basics_navigation_ bar](en/Basics_navigation_bar.png) + +Here are some of the important icons you need to understand: +1. Profile: ![Profile](en/Basics_profile_icon.png) +2. Home Channel: ![home](en/Icon_home.png) +3. Network stream: ![home](en/Icon_network_stream.png) +4. Public stream: ![home](en/Icon_public_stream.png) +5. Connections: ![home](en/Icon_connections.png) +6. Directory: ![home](en/Icon_directory.png) + +**Note:** On mobile pinned apps are hidden and only accessible through the hamburger menu on the right ![MobileNavigationBar](en/MobileNavigationBar.png) + +![Profile](en/Basics_profile_icon.png) **Profile**: By clicking on it, you access to view and edit your profile, your channel manager, the general settings and to log out. + +## 1. Profile: ![Profile](en/Basics_profile_icon.png) +A profile is a collection of information about yourself so you can have different profiles depending on the data you want to share with different users or groups. For example: your public or default profile (which is always available to the general public and can’t be hidden) is GNU/Linux and FOSS related. You set the permissions and establish connections with those who may share those interests. But if you have your group of friends that don’t care about that much, and you don’t want to bore them with it, you can create a new profile with a new set of permissions called “friends”, that allow its members access only to another kind of information. + +When you click on the profile icon, you have access to different options. + +### View Profiles +Clicking on “View profile” you’ll see your public profile with the information you has submited, such as your name and tags. You can edit this public profile by clicking on the Edit option at the right of the profile title bar. +(See Profiles Settings for more information about configuration) +![basics_profile](en/Basics_profile.png) +[To know more about profiles and the available options...]((../../02.Channels/02.Profiles)) + +### Edit Profiles +Here you can see your default and created profiles if there any or create new ones. +(See Profiles Settings for more information about creating and managing profiles) +[To know more about profiles and the available options...]((../../02.Channels/02.Profiles)) + +### Channel Manager +From here you can manage your channels and create new ones.
+**Note: Channels are different from profiles.**
+**A profile** is a collection of information about yourself so you can have different profiles depending on the data you want to share with different users or groups. For example: your public or default profile (which is always available to the general public and can’t be hidden) is GNU/Linux and FOSS related. You set the permissions and establish connections with those who may share those interests. But if you have your group of friends that don’t care about that much, and you don’t want to bore them with it, you can create a new profile with a new set of permissions called “friends”, that allow its members access only to another kind of information.
+**A channel**, on the other hand, it’s the space on the web that contains collections of content stored in one place, that’s the stream (will see that later). What kind of content? Well, that’s exactly the point of it. You can create different channels for different kinds of content and specifies whose of your contacts or public can see it. In other words, a profile is information about you and a channel is the space where specific information it’s gathered and showed up. + +Click on the **Channel Manager** to access its options. + +![basics_channel_manager](en/Basics_channel_manager.png) + +From here you can create and switch between channels. The process to create a channel it’s the same as when you create your first one. + +[To know more about channels and the available options...](../../02.Channels) + +### Settings +By clicking on it, you will access to the Account, Channel, Features settings and other configurations. + +![basics_settings](en/Basics_settings.png) + +!!! The settings options are on the left sidebar. So if you want to show the options on mobile you have to clikc on the arrow icon in the nav bar. ![ArrowIcon](en/ArrowIcon.png) + +##### Account settings +In the **Account settings** you can change your email address, your password and set Your **technical skill level**. Every level sets different user features according to what you expect or want to do. By default, DisHub skill level is **4. Expert**, in orden to provide most of the features available. + +There are five levels. From level 1 on, each one of them progressively enables Additional features. +0. Beginner/Basic +1. Novice - not skilled but willing to learn +2. Intermediate - somewhat comfortable +3. Advanced - very comfortable +4. Expert - I can write computer code +5. Wizard - I probably know more than you do + +##### Channel settings: +This is one of the most important settings. These howtos will refer to it a lot. +![basics_channel_settings](en/Basics_channel_settings.png) + +## 2. Home Channel: ![home](en/Icon_home.png) +It works like the “wall” of most social networks, it’s the place where you see your posts, the comments on them (if they’re enable), the posts you’ve re-shared, and those from the people you’ve give permissions to write on it. +Everything is already pretty well explained [here](../01.Basics) + +## 3. Network stream: ![home](en/Icon_network_stream.png) +It looks a lot like the **Home Channel**. Except that here, you see not only your posts and comments, but also the posts and comments of your connections, if you allowed them to. + +![Network_stream](en/Network_stream.png) + +You can filter those posts in different ways. +1. You can use the Affinity tool bar  [More info about it](../../07.Features/01.Connection_filtering) +2. You can click on the different tabs. +![Filter_tabs](en/Filter_tabs.png) + +## 4. Public stream: ![home](en/Icon_public_stream.png) +Here, you can see ANYONE posts and comments published in the fediverse, so any Hubzilla, Mastodon, Diaspora, etc., servers. + +![Public_stream](en/Public_stream.png) + +You can filter those posts by clicking on the cloudwords in **Trending**. + +You can also use the **search box** to look for a tag, an user, etc. ![Search_box](en/Search_box.png) + +## 5. Connections: ![home](en/Icon_connections.png) +It allows to see your connections and to edit them [Informations here](../../03.Connections) + +## 6. Directory: ![home](en/Icon_directory.png) +It allows to see and search any channel on hubzilla (not just Dishub). To search a specific channel use the search engine on the upper left side of the directory page + +![Directory](en/Directory.png) diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/ArrowIcon.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/ArrowIcon.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/ArrowIcon.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/ArrowIcon.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_manager.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_manager.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_manager.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_manager.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_settings.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_settings.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_settings.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_channel_settings.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_navigation_bar.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_navigation_bar.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_navigation_bar.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_navigation_bar.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile_icon.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile_icon.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile_icon.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_profile_icon.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_settings.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_settings.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Basics_settings.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Basics_settings.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Directory.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Directory.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Directory.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Directory.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Filter_tabs.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Filter_tabs.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Filter_tabs.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Filter_tabs.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_connections.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_connections.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_connections.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_connections.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_directory.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_directory.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_directory.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_directory.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_home.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_home.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_home.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_home.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_network_stream.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_network_stream.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_network_stream.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_network_stream.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_public_stream.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_public_stream.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Icon_public_stream.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Icon_public_stream.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/MobileNavigationBar.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/MobileNavigationBar.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/MobileNavigationBar.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/MobileNavigationBar.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Network_stream.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Network_stream.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Network_stream.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Network_stream.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Public_stream.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Public_stream.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Public_stream.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Public_stream.png diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/en/Search_box.png b/pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Search_box.png similarity index 100% rename from pages/10.DisHub/01.Basics/02.Navigation_bar/en/Search_box.png rename to pages/05.Social/01.DisHub/01.Basics/02.Navigation_bar/en/Search_box.png diff --git a/pages/05.Social/01.DisHub/01.Basics/docs.en.md b/pages/05.Social/01.DisHub/01.Basics/docs.en.md new file mode 100644 index 00000000..5ab9dc22 --- /dev/null +++ b/pages/05.Social/01.DisHub/01.Basics/docs.en.md @@ -0,0 +1,32 @@ +--- +title: Hubzilla: DisHub Basics +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# How to start really quick? +1. Log in https://hub.disroot.org/ using your Disroot credential (**use the Disroot email, not just the username**) +2. Then, you have to **create a channel**. Indeed, you're not really an user on Hubzilla: you're a channel, or even several channels (a person, an organization, a theme, etc). That means that when you first log in with your Disroot account, you have to create a channel. [To create my channel](../channels/creation) +3. You will have to choose a **role for your channel**, that means a set of permissions. **Social - Mostly public** is the most typical one you may want to choose. [To know more about roles and permissions](../permissions) +4. When your new channel is created, you will have to **create a profile** for this channel. You can give as much informations about it as you want. Or as little as you want! You may even create different profiles for a same channel! [To know more about profiles](../channels/profiles) + +**You're done!** + +Now, you can **create post**: +
+![Share_box](en/Share_box.png) + +[To know how](../posts) + +Or you can **add friends** (called *connections* in hubzilla) that you can follow: +
+![Connections](en/Connections.png) + +[To know how](../connections) + + +!!! There is a nice quick howto start [here](https://hub.disroot.org/help/en/tutorials/personal_channel#Create_a_new_channel) diff --git a/pages/10.DisHub/01.Basics/en/Connections.png b/pages/05.Social/01.DisHub/01.Basics/en/Connections.png similarity index 100% rename from pages/10.DisHub/01.Basics/en/Connections.png rename to pages/05.Social/01.DisHub/01.Basics/en/Connections.png diff --git a/pages/10.DisHub/01.Basics/en/Share_box.png b/pages/05.Social/01.DisHub/01.Basics/en/Share_box.png similarity index 100% rename from pages/10.DisHub/01.Basics/en/Share_box.png rename to pages/05.Social/01.DisHub/01.Basics/en/Share_box.png diff --git a/pages/05.Social/01.DisHub/02.Channels/01.Creation/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/01.Creation/docs.en.md new file mode 100644 index 00000000..4fd5f494 --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/01.Creation/docs.en.md @@ -0,0 +1,55 @@ +--- +title: Hubzilla Channels: Creating a channel +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +## How2 create my first channel? + +When you log in for the first time after registering, you must create a channel. + +So you will be presented with the "Add a channel" screen. +![channel_create](en/channel_create.png) + +First, you have to **choose a channel role and privacy** (you can change it later though). For example, you can choose **Social, Mostly Public**. According to what you choose, the default permission will change. For example, *Can comment on or like my posts* is public by default for **Social, Federation** and for your connections only in **Social, Mostly public**. + +[See the permission page to understand channel roles better](../../permissions) + +Then, you have to choose a **Name or caption**. Normally, your first channel will be one that represents you - so using your own name (or pseudonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. This is how people with know and find your channel. + +The **choose a short nickname** box is similar to a **username** field. It is used to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This will look like an email address, and takes the form **nickname@hub.disroot.org**. It is automatically generated according to your **Name and caption**, checking if the username already exists and being transliterated (so that it federates well). Basically you can use only the same characters as email addresses. If the username suggested fits you, click on **Create** to create your channel. + +If you don't like the nickname chosen for you and want to change it, the **Create** button becomes blue and you can't click on it: that means you need to click on **Validate** to check if you can use the username you chose. If that's ok, the **Create** button becomes green and you can click on it to create your channel. +![channel_nickname](en/channel_nickname.gif) + + +After setting your Role, name (real or not) and your nickname, you will be redirected on the profile page of your new channel (or something else if your site admin decided otherwise). + +## How to create another channel? +You can also create an other channel, as you can have as many channels as you want. + +To do so, click on your avatar on the nav bar, and choose **Channel manager**. You then can click on **+ Create New**. +![channel_creation](en/channel_creation.gif) + +## How to switch between channels? +Click on your avatar in the nav bar and select your channel. +![switch_channel](en/avatar_menu.png) + +## How to make one of your channels your default one? +Click on your avatar on the nav bar, and choose **Channel manager**. You then can click on **Make default**. +![channel_default](en/channel_default.png) + +## How to make your channel a "Premium Channel" +Some channels are designated **Premium Channels** and may require some action before a connection can be established with it. The Connect button for these channels will open a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If the channel does not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on interactions with that channel. + +Here is an example of such a message: +![connections_premium_message](en/Connection_premium_message.png) + +To set a premium channel, go to your channel **Settings**, then on the same left side bar select **Premium Channel Settings** +![channel_premium](en/channel_premium.png) +Enable the premium channel restriction, enter your message and click on *Submit*. diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/Connection_premium_message.png b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/Connection_premium_message.png similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/Connection_premium_message.png rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/Connection_premium_message.png diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/Search.png b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/Search.png similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/Search.png rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/Search.png diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/avatar_menu.png b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/avatar_menu.png similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/avatar_menu.png rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/avatar_menu.png diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/channel_create.png b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_create.png similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/channel_create.png rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_create.png diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/channel_creation.gif b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_creation.gif similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/channel_creation.gif rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_creation.gif diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/channel_default.png b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_default.png similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/channel_default.png rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_default.png diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/channel_nickname.gif b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_nickname.gif similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/channel_nickname.gif rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_nickname.gif diff --git a/pages/10.DisHub/02.Channels/01.Creation/en/channel_premium.png b/pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_premium.png similarity index 100% rename from pages/10.DisHub/02.Channels/01.Creation/en/channel_premium.png rename to pages/05.Social/01.DisHub/02.Channels/01.Creation/en/channel_premium.png diff --git a/pages/05.Social/01.DisHub/02.Channels/02.Profiles/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/docs.en.md new file mode 100644 index 00000000..e7a6ad15 --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/docs.en.md @@ -0,0 +1,152 @@ +--- +title: Hubzilla Channels: Profiles +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +## What is a profile? +You have surely registered with some other internet services, such as forums or online communities. For all of them you provided some information about yourself, such as date of birth, country, age and the likes. Think of your profile as **the basic information about yourself you tell other people**. + +Here is an example of a profile with not much on it +![profile_view](en/Profile_view.png) + +And the same one, but seen from a directory research on "meaz" ! +![profile_view_directory](en/Profile_view_directory.png) + +Unlike other services Hubzilla offers you the **advantage of creating many more profiles**. That means you can decide to use different profiles to show different "sides of yourself" to different audiences. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing". + +You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. + +## How to create my first profile? +After setting your Role, name (real or not) and your nickname, you will be redirected on the profile page of your new channel (or something else if your site admin decided otherwise). + +Click on **Default Profile** if you want to customize your profile. +![Profile page](en/ProfilePage.png) + +From there you are free to complete information about yourself. There are at least two information that are required. There are in the **Personal tab**: +- **Profile name (required)**: it is the name you want to give to the profile. It helps when you have multiple profiles. For example you could call it "Public Profile", "Family Profile", etc. +- **Your full name (required)**: it is the name that will be shown to everyone. + +![Profile edit1](en/EditProfile.png) + +You can change the profile picture (cavatar). From the **Profile Tools** drop-down menu, select **Change profile photo**. + +![Profile edit2](en/EditProfile.gif) + +**Or simply click on your avatar!** + +![Profile_avatar_change](en/Profile_avatar_change.png) + +Upload your photo and size as necessary using the image editor. + +When you press **Done Editing** you will be redirected back to the profile editor (You might need to clear your browser cache if you have trouble seeing the new photo). + +Returning to your channel home page you will see that a post notifying others of your new profile pic has been automatically posted. + +You can also customize the cover photo. From the **Profile Tools** drop-down menu, select **Change cover photo**. + +![Profile edit2](en/EditProfile.gif) + +If you'd like to meet people that share some general interests with you, please take a moment and add some **Keywords** to your profile, such as "music, Linux, photography" or whatever. You can add as many keywords as you like. +To do so click on the **Miscellaneous** tab and add the keywords in **Keywords used in directory listings**. + +![Profile_keywords](en/Profile_keywords.png) + +## How to see my profile? +Click on your avatar in the nav bar and select **View Profile**. +![Profile_edit](en/avatar_menu.png) + + +## How to edit my profile? +You can edit your profile at anytime by clicking on the **pencil icon** next to your avatar image and then choosing the name of the profile you want to edit. + +![Profile](en/Profile.png) + +A better way (because you have more options) is to click on your **avatar** in the nav bar and select **Edit Profiles**. + +![Edit_profile](en/avatar_menu.png) + + +## Have more "Things" on profile +### What is it? +You can add more stuff that was is available on your profile. It is called things. You can for example add what you like, what you want, etc. It allows viewers of your profile to "like" the added items. + +![profile_things](en/Profile_things.png) + +### How to add "things" on my profile? +Go on the **Edit Profile Details"** : click on your **avatar** in the nav bar and select **Edit Profiles**. Choose the profile you want to edit. + +Click on the **Profile tool** and choose **Add profile thing** and complete it the way you want! + +![profile_add_things](en/Profile_add_things.gif) + +**Note**: the option **Post an activity** is activate per default. That means that it will create a post in your channel explaining what you like, want, etc. +![Profile_post_things](en/Profile_post_things.png) +As stated and as you can also see in this post, only the viewers of this profile can see the post (see the lock on the post, next to the avatar) + +### How to modify or delete "things" on my profile? +Go on your **profile** and click on the "thing" you want to remove. + +![profile_things](en/Profile_things.png) + +Click on the pencil to edit, on the trash can to remove it! + +![rofile_remove_things](en/Profile_remove_things.png) + + +## Clone / Export / Import / Delete a profile +### What is it? +Hubzilla gives you the possibility to: +- Create a **clone of an existing profile** if you only wish to change a few items but don't wish to enter all the information again. +- Backup a profile by choosing **Export profile to file**. It will create a .json file that you can save on your computer and import later if needed. +- Import a profile by choosing **Import profile from file**. You can import a .json file that you previously saved on your computer. +- **Delete*** a profile you don't use/want anymore. + + +### How to Clone / Export / Import / Delete a profile? + +The **Profile tools** box that you can find on the **Edit Profile Details** offers to you those additional options. SO you just need to click on what you want to do! + +![profile_tools](en/Profile_tools.png) + + +## How to add a profile? +Go on the **Edit Profile Details"** page: click on your **avatar** in the nav bar and select **Edit Profiles**. Just click on **Create New**. + +![Profile page](en/ProfilePage.png) + +**Note**: Multiple profiles are enabled and locked in the enabled state by default for DisHub. On other hub, Multiple profiles is a member preference that need to be enabled by going to Settings > Additional Features. + + +## The visibility of a profile +### What is it? +Your default profile is public by default and you can't change it. That means that anyone can see the information you added on it when they come on your channel. + +However, as explained before, you may create additional profiles to give more or less information about you to your connections. + +The "visibility" of a profile is the setting that organized who is going to see this profile. + +### How to change the visibility of my profile? +Click on the **Profile tools** from the **Edit Profile Details** and choose **Edit visibility**. + +**Important: this only available for the profiles that are not your default profile.** + +![profile_tools_visibility](en/Profile_tools_visibility.png) + +On the bottom, you have the list of your connections. Simply click on specific connections to add them to or remove them from the group of people who can see this profile. + +![profile_visibility](en/Profile_visibility.gif) + +Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile. + +If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished. + +## How to assign one of my profiles to new connections? +If you want to change which profile is assigned by default to new connections, go to **Channel Settings**, then **Miscellaneous Settings**. The **Profile to assign new connections** drop-down menu lets you choose between your profiles. + +![profile_assign](en/Profile_assign.png) diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/EditProfile.gif b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/EditProfile.gif similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/EditProfile.gif rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/EditProfile.gif diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/EditProfile.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/EditProfile.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/EditProfile.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/EditProfile.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/ProfilePage.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/ProfilePage.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/ProfilePage.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/ProfilePage.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_add_things.gif b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_add_things.gif similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_add_things.gif rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_add_things.gif diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_assign.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_assign.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_assign.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_assign.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_avatar_change.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_avatar_change.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_avatar_change.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_avatar_change.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_keywords.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_keywords.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_keywords.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_keywords.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_post_things.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_post_things.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_post_things.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_post_things.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_remove_things.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_remove_things.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_remove_things.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_remove_things.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_things.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_things.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_things.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_things.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_tools.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_tools.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_tools.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_tools.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_tools_visibility.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_tools_visibility.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_tools_visibility.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_tools_visibility.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_view.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_view.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_view.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_view.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_view_directory.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_view_directory.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_view_directory.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_view_directory.png diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/Profile_visibility.gif b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_visibility.gif similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/Profile_visibility.gif rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/Profile_visibility.gif diff --git a/pages/10.DisHub/02.Channels/02.Profiles/en/avatar_menu.png b/pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/avatar_menu.png similarity index 100% rename from pages/10.DisHub/02.Channels/02.Profiles/en/avatar_menu.png rename to pages/05.Social/01.DisHub/02.Channels/02.Profiles/en/avatar_menu.png diff --git a/pages/05.Social/01.DisHub/02.Channels/03.Blocking/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/docs.en.md new file mode 100644 index 00000000..85615d38 --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/docs.en.md @@ -0,0 +1,44 @@ +--- +title: Hubzilla Channels: Blocking a channel +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +## What does block a channel do? +Well, lets say you don't want any contact with somebody, for example because this somebody spams you or because their comments just disturb you, or because you don't want hi/her to read your post. You can simply block that contact. + +There are two way of blocking: +* Block a channel + * This means that the channel will not be able to read any of your items, and he will also not be able to write to your channel. Good to know is that it doesn't matter with what permission you post something, that channel will still be unable to see your activities. +* Block completely a channel + * It's like blocking a channel but it also make that you won't even see that channel (not only in your stream, but even you would go on the channel page). It's like the channel doesn't exist anymore. Except if that channel post something for example on a forum and you are also connected to that forum. You won't see his posts on your channel but you will see them if you are visiting the forum page. **TO BE CHECKED: I'm almost sure you don't see it even in a forum!** + +## How do I block a channel? +### Block a channel +This means that the channel will not be able to read any of your items, and he will also not be able to write to your channel. Good to know is that it doesn't matter with what permission you post something, that channel will still be unable to see your activities. + +To block a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to block. Then **Connections tools** and from the dropdown menu **Block**. +![BlockChannel](en/BlockChannel.gif) + +You can undo the block in the same way you blocked a channel. + +![UnBlockChannel](en/UnBlockChannel.gif) + +### Completely block a channel ("superblock") +It's like blocking a channel but it also make that you won't even see that channel (not only in your stream, but even you would go on the channel page). It's like the channel doesn't exist anymore. Except if that channel post something for example on a forum and you are also connected to that forum. You won't see his posts on your channel but you will see them if you are visiting the forum page. **TO BE CHECKED: I'm almost sure you don't see it even in a forum!** + +If you want to completely block a channel you have to do it from a post or comment from within your channel. +For example from your activity page or public stream. +There you click on the avatar of the channel you want to block an select **Completely Block**. +![CompletelyBlockChannel](en/CompletelyBlockChannel.gif) + +If you want to undo the completely block, you are not able anymore to see it anymore. So you need to use the superblock addon. Go on your [settings page](https://hub.disroot.org/settings), select **Addon settings** and then click on **Superblock settings**. Now you click on the trash bin icon of the channel you want to unblock. + +![CompletelyUnBlockChannel](en/CompletelyUnBlockChannel.gif) + +!!! on moblie the settings panel is hidden. To show the settings panel you gave to click on the arrow icon on the nav bar. ![MobileSuperblock](en/MobileSuperblock.gif) diff --git a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/BlockChannel.gif b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/BlockChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/BlockChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/BlockChannel.gif diff --git a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/CompletelyBlockChannel.gif b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/CompletelyBlockChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/CompletelyBlockChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/CompletelyBlockChannel.gif diff --git a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/CompletelyUnBlockChannel.gif b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/CompletelyUnBlockChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/CompletelyUnBlockChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/CompletelyUnBlockChannel.gif diff --git a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/MobileSuperblock.gif b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/MobileSuperblock.gif similarity index 100% rename from pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/MobileSuperblock.gif rename to pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/MobileSuperblock.gif diff --git a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/UnBlockChannel.gif b/pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/UnBlockChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/03.Blocking_a_channel/en/UnBlockChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/03.Blocking/en/UnBlockChannel.gif diff --git a/pages/05.Social/01.DisHub/02.Channels/04.Ignoring/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/04.Ignoring/docs.en.md new file mode 100644 index 00000000..62992705 --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/04.Ignoring/docs.en.md @@ -0,0 +1,24 @@ +--- +title: Hubzilla Channels: Ignoring a channel +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +## What does ignore a channel do? +When you ignore a channel, this channel can see your posts if it has permission (and if the post you write is also accessible for that channel, for example if you make it public). + +But you won't see anything that this channel will post in your network stream, and it won't be allowed to write on your channel (wall or @mention) + +## How do I ignore a channel? +To ignore a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to ignore. Then **Connections tools** and from the drop-down menu **Ignore**. + +![IgnoreChannel](en/IgnoreChannel.gif) + +You can undo the ignore in the same way you ignored a channel. + +![UnIgnoreChannel](en/UnIgnoreChannel.gif) diff --git a/pages/10.DisHub/02.Channels/04.Ignore_a_channel/en/IgnoreChannel.gif b/pages/05.Social/01.DisHub/02.Channels/04.Ignoring/en/IgnoreChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/04.Ignore_a_channel/en/IgnoreChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/04.Ignoring/en/IgnoreChannel.gif diff --git a/pages/10.DisHub/02.Channels/04.Ignore_a_channel/en/UnIgnoreChannel.gif b/pages/05.Social/01.DisHub/02.Channels/04.Ignoring/en/UnIgnoreChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/04.Ignore_a_channel/en/UnIgnoreChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/04.Ignoring/en/UnIgnoreChannel.gif diff --git a/pages/05.Social/01.DisHub/02.Channels/05.Archiving/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/05.Archiving/docs.en.md new file mode 100644 index 00000000..332785e6 --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/05.Archiving/docs.en.md @@ -0,0 +1,18 @@ +--- +title: Hubzilla Channels: Archiving a channel +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +## What does archive a channel do? +If a channel can't be reached for 30 days, it is automatically marked as archived. This keeps all the data but stops polling the channel for new information and removes it from auto-complete. If later you learn the channel has come back online, you may manually unarchive it. + +## So how do I unarchive a channel? +To unarchive a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to unarchive. Then **Connections tools** and from the dropdown menu **unarchive**. + +![UnArchiveChannel](en/UnArchiveChannel.gif) diff --git a/pages/10.DisHub/02.Channels/05.Archive_a_channel/en/UnArchiveChannel.gif b/pages/05.Social/01.DisHub/02.Channels/05.Archiving/en/UnArchiveChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/05.Archive_a_channel/en/UnArchiveChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/05.Archiving/en/UnArchiveChannel.gif diff --git a/pages/05.Social/01.DisHub/02.Channels/06.Hiding/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/06.Hiding/docs.en.md new file mode 100644 index 00000000..2fb31c1a --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/06.Hiding/docs.en.md @@ -0,0 +1,24 @@ +--- +title: Hubzilla Channels: Hiding a channel +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +## What does hide a channel do? +If you don't want to show you are connected to a channel, you can choose to hide this connection to others. No one can see you're connected (the channel does not show up in your profile's connections list). But beware people may still show up to your other connections, for example if you get a comment on a post from that channel. + +See it like this. You hide someone in your closet, people who comes by don't see him/her. But if you say something and that person who is hidden reacts, others in the room will hear it. Otherwise, if you say something on a public place. Like for example while waiting in a waiting room, and you try to hide the fact that you are in contact with someone, even if that person comments something you said people can't now if it is a stranger for you or if you know him. + +## So how do I hide a channel? +To hide a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to unarchive. Then **Connections tools** and from the dropdown menu **hide**. + +![HideChannel](en/HideChannel.gif) + +You can unhide in the same way you've hidden the channel. + +![UnHideChannel](en/UnHideChannel.gif) diff --git a/pages/10.DisHub/02.Channels/06.Hide_a_channel/en/HideChannel.gif b/pages/05.Social/01.DisHub/02.Channels/06.Hiding/en/HideChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/06.Hide_a_channel/en/HideChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/06.Hiding/en/HideChannel.gif diff --git a/pages/10.DisHub/02.Channels/06.Hide_a_channel/en/UnHideChannel.gif b/pages/05.Social/01.DisHub/02.Channels/06.Hiding/en/UnHideChannel.gif similarity index 100% rename from pages/10.DisHub/02.Channels/06.Hide_a_channel/en/UnHideChannel.gif rename to pages/05.Social/01.DisHub/02.Channels/06.Hiding/en/UnHideChannel.gif diff --git a/pages/05.Social/01.DisHub/02.Channels/docs.en.md b/pages/05.Social/01.DisHub/02.Channels/docs.en.md new file mode 100644 index 00000000..652d0376 --- /dev/null +++ b/pages/05.Social/01.DisHub/02.Channels/docs.en.md @@ -0,0 +1,25 @@ +--- +title: Hubzilla: Channels +page-toc: + active: false +published: true +visible: true +taxonomy: + category: + - docs +--- + +## What is a channel? +You can see a channel like being a Facebook wall, a timeline of posts like Tweeter or Mastodon, etc. It can be simply a collection of content stored in one place. Basically, info that you want to share (or not) with others, and that others may share (or not) with you. The great thing and difference with those services: with your disroot account you can create as many channels as you want! So if you want to have one channel about cooking and another one about animals, you can! + +For most people, their first channel with be "Me". + +The most important features for a channel that represents "me" are: +* Secure and private "spam free" communications +* Identity and "single-sign on" across the entire network +* Privacy controls and permissions which extend to the entire network +* Directory services (like a phone book) + +You can have as many channels as you want! Perhaps you are an avid book reader and many people are bored by that. So you open a second channel just for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just switch between both of them just like you would in real life switch when talking to people you meet on the street or people you meet specially to talk about books. + +Think of a channel as different spaces dedicated to different topics where you meet with different people. diff --git a/pages/05.Social/01.DisHub/03.Connections/docs.en.md b/pages/05.Social/01.DisHub/03.Connections/docs.en.md new file mode 100644 index 00000000..232090f6 --- /dev/null +++ b/pages/05.Social/01.DisHub/03.Connections/docs.en.md @@ -0,0 +1,117 @@ +--- +title: Hubzilla: Connections +page-toc: + active: true +published: true +visible: true +taxonomy: + category: + - docs +--- + +## What is a connection? +Making connections between channels to share things is what social communications are all about. + +Connections in Hubzilla can take on a great many different meanings. **A connection is more accurately defined as a set of permissions that you have granted to somebody else**. In traditional social network applications, all connections are granted the same permissions; or at most there two levels (friends and 'followers'). In Hubzilla, a range of separate permissions may be set/adjusted depending on the situation and relationship you have with the other channel. You can allow somebody to view your posts but not your photos. You can also deny them permission to comment on your posts or send private mail to you. + +[For more information about permissions....](../permissions/) + +## How to connect to a channel? +There are several way to connect to a channel: + +### You know the Hubzilla channel's address +If you already know somebody's channel address ("webbie") you can connect with them directly. A webbie looks just like an email address (for instance disroot@hub.disroot.org) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. + +Go to your **Connections page** by clicking on the connection icon on the nav bar + +![Icon](en/ConnectionIcon.png) + +From there, write down the channel address you want to connect to in the **search bar**, and then click on the **+** to connect +![connect](en/Connect1.gif) + +!!! Because the pinned apps are hidden on mobile you have to access your connections page from the hamburger menu. And beacouse the left bar is hidden to you have to show it by clicking on the arrow icon. ![MobileConnections](en/MobileConnections.gif) + +Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes. + +### You don't know the Hubzilla channel's address or you want to search an idea of channel +The directory is available on every Hubzilla website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword. + +Go to the directory search page by clicking on the **Directory icon** on the top navbar. +![Network](en/Network.png) + +!!! On mobile you go to the directory from the hamburger menu and from there directory. ![MobileDirectory](en/MobileDirectory.png) + +Use the **search bar** for names or interests and click on **+ Connect** with the desired channel. ![connect2](en/Connect2.gif) + +!!! On mobile the search bar is hidden, if you want to search connections on mobile you do it like this ![MobileConnect](en/MobileConnect.gif) + +### You see a channel that you want to connect to +You can also connect to a channel when you see it, for example in a post or comment. + +To do so, click on the **profile picture** of that channel and then choose **Connect**. + ![connect3](en/Connect3.gif) + +### You want to connect with channels on other networks +The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their "webbie" into the **Add New Connections** box on the **Connections page**. Before you do this however, please visit your **Settings** page, **Addon Settings** and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, ActivityPub, or others) is provided on your hub and activated for your channel. + +These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails. + +Some softwares you might have heard of might use a communication protocol with a different name. For example Mastodon, Pleroma, Peertube all use ActivityPub so if you want to connect with people on these softwares, ativate 'activitypub' protocol for communication. +Some softwares, like Mastodon and Pleroma also support the 'Osatus' protocol. +Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but Hubzilla will often choose the first protocol it discovers and this may not be the one you want. + +You may connect with somebody over a specific protocol the same way you would add a contact on hubzilla, but changing his/her address to point to the right protocol instance. + +For example if you want to connect to a mastodon user: **username@mastodon.instance**. + + +### You want to connect with RSS feeds +DisHub allows connecting to RSS feeds. The process for connecting to an RSS feed is the same, except type (or paste) the URL of the feed into the **Add New Connection** box. + +Feeds are processed every hour. + +DisHub admins may impose limits on how many feeds you may add, which is not the case at this time. + + +## Block/Ignore/Archive/Hide channels WIP +When someone adds you as a connection, you receive a connection message (except in two channel roles: Forum - Mostly public and Feed - Mostly public). +![connection_message](en/Connection_message.png) + +Here's their meaning: + +**Approve**: you accept this connection. It appears in your contact list. The default permissions set by your channel role to your connections applies. + +**Ignore**: the channel can see your stream if it has permission (according to your channel role) and if the post you write is also accessible for that channel (for example if you make it public). But you won't see anything that this channel will post in your network stream, and it won't be allowed to write on your channel (wall or @mention). + +This connection is not approved, as you can see on the message you get when you click on ignore: + +![connection_ignored](en/Connection_ignored.png) + +Here is what the other connection will see when going to the individual connection permissions: +![connection_permission](en/Connection_ignored_permission.png) +The permissions may changed according to your channel role. But you can see that this channel got some permissions. YOU CAN'T CHANGE THEM, unless you change the channel status, from Ignore to Approve. + +You appear in the ignored connection channel's connection list, but with a one-way sign + +![connection_refused](en/Connection_refused.png) + +This channel doesn't appear in your connections list on your profile, but appears in the connections page. That means that you can change its status any time you want. + + +**Delete**: you don't accept this connection, but you don't block it either. That means that this channel has the same permissions as any other channel that you don't have a connection with, the same rights as the general public. + +Here is what the other connection will see when going to the individual connection permissions: +![connection_permission](en/Connection_permission.png) +The permissions may changed according to your channel role. But you can see that this channel got some permissions. YOU CAN'T CHANGE THEM, unless you create a connection with this channel. + +You appear in the deleted connection channel's connection list, but with a one-way sign. + +![connection_refused](en/Connection_refused.png) + +This channel doesn't appear in your connections list on your profile, nor in the connections page. That means that if you want to set a connection with a channel that you previously deleted, you have to create it again on your side, like creating a new connection. The only difference will be that this channel won't have the approval message as the connection is already set on its side. + +## Premium Channels +Some channels are designated **Premium Channels** and may require some action on your part before a connection can be established. The Connect button for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel. + +Here is an example of such a message: +![connections_premium_message](en/Connection_premium_message.png) diff --git a/pages/10.DisHub/03.Connections/en/Connect1.gif b/pages/05.Social/01.DisHub/03.Connections/en/Connect1.gif similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connect1.gif rename to pages/05.Social/01.DisHub/03.Connections/en/Connect1.gif diff --git a/pages/10.DisHub/03.Connections/en/Connect2.gif b/pages/05.Social/01.DisHub/03.Connections/en/Connect2.gif similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connect2.gif rename to pages/05.Social/01.DisHub/03.Connections/en/Connect2.gif diff --git a/pages/10.DisHub/03.Connections/en/Connect3.gif b/pages/05.Social/01.DisHub/03.Connections/en/Connect3.gif similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connect3.gif rename to pages/05.Social/01.DisHub/03.Connections/en/Connect3.gif diff --git a/pages/10.DisHub/03.Connections/en/ConnectionIcon.png b/pages/05.Social/01.DisHub/03.Connections/en/ConnectionIcon.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/ConnectionIcon.png rename to pages/05.Social/01.DisHub/03.Connections/en/ConnectionIcon.png diff --git a/pages/10.DisHub/03.Connections/en/Connection_ignored.png b/pages/05.Social/01.DisHub/03.Connections/en/Connection_ignored.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connection_ignored.png rename to pages/05.Social/01.DisHub/03.Connections/en/Connection_ignored.png diff --git a/pages/10.DisHub/03.Connections/en/Connection_ignored_permission.png b/pages/05.Social/01.DisHub/03.Connections/en/Connection_ignored_permission.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connection_ignored_permission.png rename to pages/05.Social/01.DisHub/03.Connections/en/Connection_ignored_permission.png diff --git a/pages/10.DisHub/03.Connections/en/Connection_message.png b/pages/05.Social/01.DisHub/03.Connections/en/Connection_message.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connection_message.png rename to pages/05.Social/01.DisHub/03.Connections/en/Connection_message.png diff --git a/pages/10.DisHub/03.Connections/en/Connection_permission.png b/pages/05.Social/01.DisHub/03.Connections/en/Connection_permission.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connection_permission.png rename to pages/05.Social/01.DisHub/03.Connections/en/Connection_permission.png diff --git a/pages/10.DisHub/03.Connections/en/Connection_premium_message.png b/pages/05.Social/01.DisHub/03.Connections/en/Connection_premium_message.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connection_premium_message.png rename to pages/05.Social/01.DisHub/03.Connections/en/Connection_premium_message.png diff --git a/pages/10.DisHub/03.Connections/en/Connection_refused.png b/pages/05.Social/01.DisHub/03.Connections/en/Connection_refused.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Connection_refused.png rename to pages/05.Social/01.DisHub/03.Connections/en/Connection_refused.png diff --git a/pages/10.DisHub/03.Connections/en/MobileConnect.gif b/pages/05.Social/01.DisHub/03.Connections/en/MobileConnect.gif similarity index 100% rename from pages/10.DisHub/03.Connections/en/MobileConnect.gif rename to pages/05.Social/01.DisHub/03.Connections/en/MobileConnect.gif diff --git a/pages/10.DisHub/03.Connections/en/MobileConnections.gif b/pages/05.Social/01.DisHub/03.Connections/en/MobileConnections.gif similarity index 100% rename from pages/10.DisHub/03.Connections/en/MobileConnections.gif rename to pages/05.Social/01.DisHub/03.Connections/en/MobileConnections.gif diff --git a/pages/10.DisHub/03.Connections/en/MobileDirectory.png b/pages/05.Social/01.DisHub/03.Connections/en/MobileDirectory.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/MobileDirectory.png rename to pages/05.Social/01.DisHub/03.Connections/en/MobileDirectory.png diff --git a/pages/10.DisHub/03.Connections/en/Network.png b/pages/05.Social/01.DisHub/03.Connections/en/Network.png similarity index 100% rename from pages/10.DisHub/03.Connections/en/Network.png rename to pages/05.Social/01.DisHub/03.Connections/en/Network.png diff --git a/pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md new file mode 100644 index 00000000..df3a554b --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md @@ -0,0 +1,136 @@ +--- +title: Hubzilla: Default Channel Permission Limits +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +### What is it? +There are a set of default permission limits that apply to all items shared by a channel. This determines the first "limit" on who can access an item of your channel: a post, a wiki, a photo, etc. + +### What kind of permissions can be set? + +- **Can view my channel stream and posts.** + +This permision determines who can view your channel "stream": your non-private posts that appear on the *channel page* ![channel_icon](en/channel_icon.png) when you're logged in. + +- **Can send me their channel stream and posts.** + +This permission determines whose posts you will view. It's like follwing someone on Mastodon. + +- **Can view my default channel profile.** + +This permission determines who can view your default channel's profile (you can have more than one profile, but there is only one default profile). This refers to the *"about"* tab. + +- **Can view my connections.** + +This permission determines who can view the list of your contacts. These are the connections displayed in the *"connections"* section ![connection_icon](en/connection_icon.png). + +- **Can view my file storage and photos.** + +This permission determines who can view your public files stored in your cloud and your photo albums. Individual photographs may still be posted to a more private audience. + +- **Can upload/modify my file storage and photos** + +This determines who can post pictures in your albums or upload files to your public file storage, or 'cloud'. This is very useful for forum-like channels where connections may not be connected to each other. + +- **Can view my channel webpages.** + +This permission determines who can view your webpages. + +- **Can view my wiki pages.** + +This permission determines who can view your wiki. + +- **Can create/edit my channel webpages.** + +This determines who can edit your webpages. This is useful for sites with multiple editors. + +- **Can write to my wiki pages.** + +This determines who can edit your WiFi. This is useful for wikis with multiple editors. + +- **Can post on my channel (wall) page.** + +This permission determines who can write to your wall when clicking through to your channel. + +- **Can comment on or like my posts.** + +This permission determines who can comment on or like posts you create. Normally, you would want this to match your *"can view my public stream and posts"* permission + +- **Can send me private mail messages.** + +This determines who can send you private messages (zotmail). + +- **Can like/dislike profiles and profile things.** + +This determines who can like/dislike items on your profile. + +- **Can forward to all my channel connections via @+ mentions in posts.** + +Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way. + +- **Can chat with me.** + +This determines who can join the public chat rooms created by your channel. + +- **Can source my public posts in derived channels.** + +This determines who can share your post onto other channels. + +- **Can administer my channel.** + +This determines who can have full control of your channel. This should normally be set to *"nobody except myself"*. + + +**Note:** +Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here. + +If you have set any of these permissions to *"only those I specifically allow"*, you may specify individual permissions on the connnection edit screen. + +### What are the scopes of permissions that can be set with those limits? + +- **Nobody Except Yourself** + +Only you will be allowed access. + +- **Only those you specifically allow** + +By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on the connection edit screen. + +- **Approved connections** + +Only channels you have accepted/approved as connections will have this permission approved. This is the way most legacy platforms handle permissions. + +- **Any connections** + +Any channel that creates a connection with you, approved or not, will have this permission approved. + +- **Anybody on this website** + +Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied. + +- **Anybody in this network** + +Anybody in the Hubzilla network will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied. + +- **Anybody authenticated** + +This is similar to *"anybody in this network"* except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks. + +- **Anybody on the internet** + +Completely public. This permission will be approved for anybody at all. + +**Note**: Some scopes may not be available for some permissions. + +The limit applies to any published thing you create which you didn't set specific permission to (see Access Control List below). For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit you set. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, all of your photos will now be visible only to friends. + +### Where can those permissions be set? +There are two places: in the **Channel settings** or in the **Connections settings**. See further for more information. + +--- diff --git a/pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/en/channel_icon.png b/pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/en/channel_icon.png similarity index 100% rename from pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/en/channel_icon.png rename to pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/en/channel_icon.png diff --git a/pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/en/connection_icon.png b/pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/en/connection_icon.png similarity index 100% rename from pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/en/connection_icon.png rename to pages/05.Social/01.DisHub/04.Permissions/01.Default_channel_permission-limits/en/connection_icon.png diff --git a/pages/05.Social/01.DisHub/04.Permissions/02.Channel_permission_roles/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/02.Channel_permission_roles/docs.en.md new file mode 100644 index 00000000..0c89097c --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/02.Channel_permission_roles/docs.en.md @@ -0,0 +1,137 @@ +--- +title: Hubzilla: Channel permission roles +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +### What is it? +These permission limits (see previous section) can come in pre-configured sets to help you set them quickly. It is called **Channel permission roles**. +When you create a new channel, you will be asked to select a permission *role* based on how you envision using this channel. These create an entire family of permissions and privacy settings that are appropriate for that role. **Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public"** and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. For example, if you choose the "Social - Public" role, then your default permission limits set your posts to be public. So channel permission roles are primarily a way to reduce the complexity of setting all the default permission limits. + +Advanced configurations (**'Custom/Expert mode'**) are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". + +### How to select a channel role? +Go to your **settings** page, click on the **Channel settings** tab then on **Security and Privacy Settings**. From there, you can see a drop-down menu under **Channel role and privacy**. You can choose between: +- Social: + - Federation + - Mostly public + - Restricted + - Private +- Forum: + - Mostly public + - Restricted + - Private +- Feed: + - Public + - Restricted +- Special: + - Celebrity/Soapbox + - Group Repository +- Custom/Expert Mode + +![channel_roles](en/channel_roles.gif) + +### What are the differences between these roles? + +We highly recommend that you use the **"Social - Mostly Public"** settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around. + +[See this channel roles permissions table](../channel_roles) + +#### Social +##### Federation +This is the most public setting. This role is not generally recommended unless you need to interact regularly with members of other federated social networks. But it is the best choise if you want to connect as good as it can with all the networks. **It's also the only setting that permits that everybody is able to comment on your public post from the public activity page**. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. +Privacy is a lower priority than ease of access and connecting with others. + +What does it do?: +- You are listed in the directory. +- By default posts and published items are public, but you can over-ride this and restrict it. +- Anybody in the network can comment on your public posts, send you private mail and chat with you. +- Your online presence and connections are visible to others. +- Anyone can see your other connections. + + +##### Mostly Public +As a typical social networking profile, this is probably what most people want. The permission policies are similar to Facebook. But if you really want to public post it's still better to choose for *"Social - Federation"* + +What does it do?: +- You are listed in the directory. +- By default posts and published items are public, but you can choose to restrict it. +- Only your connections can comment on your public posts, send you private mail and chat with you. +- Your online presence and connections are visible to others. +- Anyone can see your other connections. + + +##### Restricted +In this role privacy is more important than the previous ones. This is what you want if you just prefer connect with others but still be able that others find you. You are still able to make public posts but interaction with others will be more difficult, as it requires that channel has to be connected with you. + +What does it do? +- You are listed in the directory. +- By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. you're still able to make posts more public if you want. +- Only your 'my "friends" privacy group' can comment on your public posts, send you private mail and chat with you. +- Your online presence (for chat) and your connections (friends) are visible to your profile viewers. +- Anyone can see your other connections. + +##### Private +Privacy is the most important for this role. You will have to handle more with permissions when you want more interactions with other channels. If others want to connect with you, they will need your full address (username@hub.disroot.org). So, if public activity is not your priority and only want to connect with people you know, than this is what you are searching for. + +What does it do? +- You are listed in the directory. +- By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. you're still able to make posts more public if you want. +- Only your 'my "friends" privacy group' can comment on your public posts, send you private mail and chat with you. +- Your online presence (for chat) and your connections (friends) is hidden. +- Only your connections can see your other connections. + +#### Forum +You can compare Hubzilla Forums as groups in Facebook. You can choose different privacy settings for that. + +##### Mostly Public +This setting is for typical forum. Anyone can see channel posts. So as the name says, use it for public forum. + +What does it do? +- The channel is visible in the directory. +- By default posts and published items are public. +- Members may post by !mention or wall-to-wall post and comment. +- Posting photos and other published items is blocked. +- Members are added automatically. + +##### Restricted +The most important difference with the mostly public setting is that only connections are allowed to see the forum stream and posts. + +What does it? +- The channel is visible in the directory. +- By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. +- Members may post by !mention or wall-to-wall post, but posts and replies may also be seen by other recipients of the top-level post who are not members. +- Members must be manually added by the forum owner. + +##### Private +Here the most important difference with the restricted setting is that mentions are disabled, and only your connections can see your other connections. + +What does it? +- The channel is NOT listed in the directory. +- By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. +- Your online presence is hidden. Members must be manually added by the forum owner. +- Posting by !mention is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible. + +#### Feed +##### Public +Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved. + +##### Restricted +Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner. + +#### Special +##### Celebrity/Soapbox +Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile. + +##### Group Repository +A public forum which allows members to post files/photos/webpages. + +#### Custom/Expert Mode +Set all the privacy and permissions manually to suit your specific needs. + +--- diff --git a/pages/10.DisHub/04.Permissions/02.Channel_permission_roles/en/channel_roles.gif b/pages/05.Social/01.DisHub/04.Permissions/02.Channel_permission_roles/en/channel_roles.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/02.Channel_permission_roles/en/channel_roles.gif rename to pages/05.Social/01.DisHub/04.Permissions/02.Channel_permission_roles/en/channel_roles.gif diff --git a/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/docs.en.md new file mode 100644 index 00000000..79d344fa --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/docs.en.md @@ -0,0 +1,74 @@ +--- +title: Hubzilla: Channel permission limits +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +### What is it? +When you have chosen a channel permission role, any connection made to your channel is set according to this role. However, you can change those default permissions limits. These allow you to customize the permission limits for individual connections, and set some permissions for one channel, and some others for another one. For example, you can grant or deny permission to individual channels to send you their posts such that they will automatically appear in your "network stream". + +### How to set different permissions limits for a connection? +If you want to change it, go on the **connection page** by clicking on the connection icon ![connection_icon](en/connection_icon.png) + +On the connection that you want to modify, click on *Edit* +![connection_disroot](en/connection_disroot.png) + +Then, click on **Individual Permissions**. The list of the permissions you "give" to that connection can be seen under "My settings". Just check / uncheck the permissions there. Don't forget to click on *Submit* when you're done. +![connection_permission](en/connection_permissions.gif) +**Note:** You can see what permissions you "received" from the other channel under "Their settings". + + +### Permission categories / Permission roles for connections +#### What is it? +It is a set of permissions that you want to store in order to be able to use it quickly. + +For example, there is a predefined *"follower"* permission category that denies the ability of a connection to send you their posts. You could choose this permission category as the one which is applied to new connections by default if you are the kind of person that does not want to clutter your network stream with the posts of all your connections and instead prefers to visit the channel pages of your connections individually to read their content. + +#### What are the already-existing permission categories? +- **Default**: the permissions set automatically according to your channel role. But you can change your default settings if you want. See below. + +- **Follower**: + +![follower](en/permission_follower.png) +- **Contributor**: + +![contributor](en/permission_contributor.png) +- **Publisher**: + +![publisher](en/permission_publisher.png) + +You can always edit these settings directly in this connection's settings by checking / unchecking the permissions, within the flexibility allowed by your channel permission role. + +#### How to create my own category? +Go to your **channel settings**, then click on **Permission groups** (this should be changed by "Permission Category" in next Hubzilla release). +Just choose a name for your category, then click on **Individual Permissions** and set your permissions by checking / unchecking what you want. Don't forget to click on *Submit*. +![permission_category_create](en/permission_category_create.gif) + +You can also use the **+ Add permission role** button directly from the connection Individual Permissions setting ![add_permission_category](en/permission_category_add.png) + +#### How to change or delete my categories? +You can change a category you created by simply clicking on its name, the on **Individual Permissions**. Don't forget to click on *Submit*. +![permission_category_change](en/permission_category_change.gif) + +To delete it, just click on the trash icon next to its name. +![permission_category_delete](en/permission_category_delete.png) + +#### How to use a personnal category of permissions with a connection? +Go on the **connection page** by clicking on the connection icon ![connection_icon](en/connection_icon.png) + +On the connection that you want to modify, click on *Edit* +![connection_disroot](en/connection_disroot.png) + +Then, click on **Individual Permissions**. You have a drop-down menu that lets you choose the category you want and automatically apply the settings of this category to the connection. +![permission_category_connection](en/permission_category_connection.gif) + +#### How to make one of my category the default one? +If you want all your new connections to be set with a default set of permissions that you want, first create this set of permissions ("category"). Then, go on your **channel settings**, in the **Security and Privacy Settings** tab. In the **Default Permissions Group** parameter, just choose your category. +![permission_category_default](en/permission_category_default.gif) + +---------- diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_disroot.png b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_disroot.png similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_disroot.png rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_disroot.png diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_icon.png b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_icon.png similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_icon.png rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_icon.png diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_permissions.gif b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_permissions.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_permissions.gif rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/connection_permissions.gif diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_change.gif b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_change.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_change.gif rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_change.gif diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_connection.gif b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_connection.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_connection.gif rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_connection.gif diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_create.gif b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_create.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_create.gif rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_create.gif diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_default.gif b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_default.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_default.gif rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_default.gif diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_delete.png b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_delete.png similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_delete.png rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_category_delete.png diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_contributor.png b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_contributor.png similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_contributor.png rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_contributor.png diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_follower.png b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_follower.png similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_follower.png rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_follower.png diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_publisher.png b/pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_publisher.png similarity index 100% rename from pages/10.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_publisher.png rename to pages/05.Social/01.DisHub/04.Permissions/03.Connection_permission_limits/en/permission_publisher.png diff --git a/pages/05.Social/01.DisHub/04.Permissions/04.ACL/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/04.ACL/docs.en.md new file mode 100644 index 00000000..dbb0c00c --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/04.ACL/docs.en.md @@ -0,0 +1,45 @@ +--- +title: Hubzilla: ACL: Access Control List +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +### What is it? +Access Control List is the preferred method of managing privacy in most cases, rather than using permission limits. It is a set of additional permission that you may want to set for very specific items. Unlike permission limits, if you change the ACL on a single photo (for example), it doesn't affect any of your other photos. + +An ACL is attached to everything you publish. + +**Important: permission limits are more important than ACL. For example, Hubzilla checks "can someone see your files/photos" before it checks "can someone see *this* photo". And if the first check fails you'll never get to the second. + +If your permission limits for Peter grant Peter permission to view your photos, but you set an ACL on a photo that excludes Peter, then Peter can't see that photo. + +If the connection with Peter doesn't allow him to see your pictures, even if you use ACL to give him this permission, it won't work. + +Hubzilla will take the most restrictive approach.** + + +### How to use it? +When you open the ACL (usually by clicking on a lock icon ![lock_icon](en/lock_icon.png) next to *Submit*) this open a popup with a list of possible scope of permissions. +![ACL_popup](en/ACL_popup.png) + +You have different choices: +1. **Public**: anyone can see / modify +2. **Friends**: only connections that are in your Friends privacy group can see / modify +3. **Only me** +4. **Custom selection**: you can choose on a per-connection basis who can see or modify. +5. **Guest Access Token**: This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be Hubzilla members. You can set an expiration for the Access Token. +[See here for more information...](../guest_access_tokens) + +**Note**: This list can be slightly different, depending of where you use the ACL. + +If you choose **Friends** or **Custom selection**, you then have a list of your connection. +![ACL_list](en/ACL_list.png) + +Just click on **Show** o **Don't show** for each connection to which to want to show or not show. + +--- diff --git a/pages/10.DisHub/04.Permissions/04.Access_control_list/en/ACL_list.png b/pages/05.Social/01.DisHub/04.Permissions/04.ACL/en/ACL_list.png similarity index 100% rename from pages/10.DisHub/04.Permissions/04.Access_control_list/en/ACL_list.png rename to pages/05.Social/01.DisHub/04.Permissions/04.ACL/en/ACL_list.png diff --git a/pages/10.DisHub/04.Permissions/04.Access_control_list/en/ACL_popup.png b/pages/05.Social/01.DisHub/04.Permissions/04.ACL/en/ACL_popup.png similarity index 100% rename from pages/10.DisHub/04.Permissions/04.Access_control_list/en/ACL_popup.png rename to pages/05.Social/01.DisHub/04.Permissions/04.ACL/en/ACL_popup.png diff --git a/pages/10.DisHub/04.Permissions/04.Access_control_list/en/lock_icon.png b/pages/05.Social/01.DisHub/04.Permissions/04.ACL/en/lock_icon.png similarity index 100% rename from pages/10.DisHub/04.Permissions/04.Access_control_list/en/lock_icon.png rename to pages/05.Social/01.DisHub/04.Permissions/04.ACL/en/lock_icon.png diff --git a/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/docs.en.md new file mode 100644 index 00000000..39a116a5 --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/docs.en.md @@ -0,0 +1,52 @@ +--- +title: Hubzilla: Guest Access Tokens +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +### What is it? +Guest access tokens (sometimes called "Zot access tokens") allow you to share a file, folder, photo, channel, etc., with a specific person or group of people **who are not Hubzilla members**. + +These tokens allow you to share individual items by sending a link that includes the token in the URL; alternatively, people can actually log in using the token credentials, after which they can seamlessly view whatever content has been shared with that token. + +[More details can be found here...](https://hub.disroot.org/help/en/feature/access_tokens) + +### How to create a guest access token? +To create and manage guest tokens, go to **Settings** page and open the **Guest Access Tokens** tab. + +Enter a **Login Name**. You can change the **Login Password** if don't want the one automatically attributed (**warning: it is the access token, it will be included in the URL you will later share**). You can set an **expiration date** in the form of "YYYY-MM-DD" but that's optionnal. When you're done, click on *Submit* +![tokens_creation](en/tokens_creation.gif) + +### Set or change permissions +Additional permissions may be granted to the guest token by expanding the **Individual Permissions** options when you create the guest access token. Check or uncheck the permissions you want to grant, then click on *Submit*. +![tokens_creation_permissions](en/tokens_creation_permissions.gif) +Some can't be changed: they are inherited from the chanel role you chose. + +Existing tokens are listed below the dialog and can be edited by selecting them. The form is automatically filled in. Click on the **Individual Permissions** options and check or uncheck the permissions you want to grant/ungrant. +![tokens_change_permissions](en/tokens_change_permissions.gif) +You can also change its login name, password and expiration date. + +### How to delete it? +You can delete an existing token by pressing the trash icon next to its name at the bottom of the page. +![tokens_delete](en/tokens_delete.png) + +### How to use a guest access token? +Any tokens you have created are added to the Access Control List selector and may be used anywhere that **Access Control Lists** are provided. + +Imagine you want a visitor (named "test") to be able to write to your wiki pages. +1. You set this permission in the **Guest Access Tokens** tab as previously explained. ![tokens_wiki_permission](en/tokens_wiki_permission.gif) +2. You go on your wiki. Fill in the needed information in order to create a wiki. Click on the lock icon to open the Access Control List. +3. Choose **Custom selection** and click on *Show* for the "test" user. You can now close the Access Control List. +4. Your visitor can now login to your channel, go to wifi page and edit the created wifi. + +![token_wifi](en/tokens_wiki.gif) + +Alternatively, you may share a **direct link** to the wiki (for this example, but that can be with files, photos, etc.) by **adding a parameter "?f=&zat=abc123" (or "&zat=abc123" which is the same but with less compatibility) to the URL**, where the string "abc123" is the access token or password for the temporary login. In our wiki example that could be something like: https://hub.disroot.org/wiki/meaz&zat=tertonti + +No further negotiation is required, and the wiki is presented. You can see an example at the bottom of the **Guest Access Tokens** page: +![tokens_links](en/tokens_links.png) diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_change_permissions.gif b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_change_permissions.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_change_permissions.gif rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_change_permissions.gif diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation.gif b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation.gif rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation.gif diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation_permissions.gif b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation_permissions.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation_permissions.gif rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_creation_permissions.gif diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_delete.png b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_delete.png similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_delete.png rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_delete.png diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_links.png b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_links.png similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_links.png rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_links.png diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki.gif b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki.gif rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki.gif diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki_permission.gif b/pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki_permission.gif similarity index 100% rename from pages/10.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki_permission.gif rename to pages/05.Social/01.DisHub/04.Permissions/05.Guest_access_tokens/en/tokens_wiki_permission.gif diff --git a/pages/10.DisHub/04.Permissions/Channel_roles/docs.en.markup.md b/pages/05.Social/01.DisHub/04.Permissions/Channel_roles/docs.en.markup.md similarity index 100% rename from pages/10.DisHub/04.Permissions/Channel_roles/docs.en.markup.md rename to pages/05.Social/01.DisHub/04.Permissions/Channel_roles/docs.en.markup.md diff --git a/pages/05.Social/01.DisHub/04.Permissions/Channel_roles/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/Channel_roles/docs.en.md new file mode 100644 index 00000000..067e9a5b --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/Channel_roles/docs.en.md @@ -0,0 +1,466 @@ +--- +title: Hubzilla: Channel roles permissions table +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + + + + + +++++++++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+PERMISSIONS ROLES
 SOCIALFORUMFEED
#Individual PermissionFederationMostly PublicRestrictedPrivateMostly PublicRestrictedPrivateMostly PublicRestricted
1Can view my channel stream and postsAnyone*Anyone*My 'Friends' privacy group*My 'Friends' privacy group*Anyone*My 'Friends' privacy group*My 'Friends' privacy group*Anyone*My 'Friends' privacy group*
2Can send me their channel stream and postsMy connectionsMy connectionsMy connectionsMy 'Friends' privacy groupOnly if permission given Only if permission given Only if permission given + Posts only via wall (!mention is disabled)My connectionsMy connections
3Can view my "public" channel profileAnyone*Anyone*Anyone*Anyone*Anyone*Anyone*AnyoneAnyone*Anyone*
4Can view my connectionsAnyone*Anyone*Anyone*My 'Friends' privacy groupAnyone*Anyone*My connectionsAnyone*Anyone*
5Can view my file storage and photosAnyone*Anyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group
6Can upload/modify my file storage and photosOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
7Can view my channel webpagesAnyone*Anyone*My 'Friends' privacy groupMy 'Friends' privacy groupAnyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group
8Can view my wiki pagesAnyone*Anyone*My 'Friends' privacy groupMy 'Friends' privacy groupAnyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group
9Can create/edit my channel webpagesOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
10Can write to my wiki pagesOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
11Can post on my channel (wall) pageMy connectionsMy connectionsMy connections, but they won't see it, except if in Privacy groupMy connections, but they won't see it, except if in Privacy groupMy connectionsMy connections, but they won't see it, except if in Privacy groupMy connections, but they won't see it, except if in Privacy group. They can't override that.My connectionsMy connections, but they won't see it, except if in Privacy group
12Can comment on or like my postsAnyone connected*My connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupMy connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupMy connectionsMy 'Friends' privacy group
13Can send me private mail messagesAnyone connected*My connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupMy connectionsMy connectionsMy connectionsMy connectionsMy 'Friends' privacy group
14Can like/dislike profiles and profile thingsAnyone connected*My connectionsMy connectionsMy connectionsMy connectionsMy connectionsMy connectionsMy connectionsMy connections
15Can forward to all my channel connections via @+ mentions in postsOnly if permission given Only if permission given Only if permission given Only if permission given My connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupOnly if permission given Only if permission given
16Can chat with meAnyone connected*My connectionsMy 'Friends' privacy groupOnly if permission given My connectionsMy connectionsMy connectionsMy connectionsOnly if permission given
17Can source my public posts in derived channelsAnyone connected*My connectionsOnly if permission given Only if permission given My connectionsOnly if permission given Only if permission given My connectionsMy connections
18Can administer my channelOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
#VISIBILITYFederationMostly PublicRestrictedPrivateMostly PublicRestrictedPrivateMostly PublicRestricted
1Listed in the directoryAnyoneAnyoneAnyoneNoAnyoneAnyoneNoAnyoneNo
2Your online presenceAnyoneAnyoneAnyoneNo oneNo oneNo oneNo oneNo oneNo one
#OTHERFederationMostly PublicRestrictedPrivateMostly PublicRestrictedPrivateMostly PublicRestricted
1New connections automatically added in "Friends" privacy groupNoNoYesYesNoYesYesNoYes
2New connections are approved automaticallyNoNoNoNoYesNoNoYesNo
           
*: means that this permission is inherited from channel role and can't be modified. Everything else can be modified
 Public, anyone can see or act
  Public, anyone connected can see or act
 Public, connections can see or act
  Partialy private, Friends group can see or act
 Private, only those permitted car view or act
 
Important:
- Changing from an opened channel role to a more restricted one doesn't change the permissions already set. 'For ex, viewing photo is for Friends privacy group in Social / Restricted. However, if a folder of picture was created before while the channel was set to Social / Federation role, then this folder and its files can be seen by anyone. But creating a new folder will get the new channel role, so for this example visible only to Friends privacy group
- Even if your posts are private by default (for example with Forum - Restricted) you can still choose to post "public"
diff --git a/pages/10.DisHub/04.Permissions/channel_roles.md b/pages/05.Social/01.DisHub/04.Permissions/channel_roles.md similarity index 100% rename from pages/10.DisHub/04.Permissions/channel_roles.md rename to pages/05.Social/01.DisHub/04.Permissions/channel_roles.md diff --git a/pages/10.DisHub/04.Permissions/channel_roles2.html b/pages/05.Social/01.DisHub/04.Permissions/channel_roles2.html similarity index 100% rename from pages/10.DisHub/04.Permissions/channel_roles2.html rename to pages/05.Social/01.DisHub/04.Permissions/channel_roles2.html diff --git a/pages/05.Social/01.DisHub/04.Permissions/docs.en.md b/pages/05.Social/01.DisHub/04.Permissions/docs.en.md new file mode 100644 index 00000000..815bc5f4 --- /dev/null +++ b/pages/05.Social/01.DisHub/04.Permissions/docs.en.md @@ -0,0 +1,16 @@ +--- +title: Hubzilla: Permissions +published: true +taxonomy: + category: + - docs +visible: true +page-toc: + active: true +--- + +Permissions in Hubzilla are more complete (and a little more complex) than you may be used to. This allows us to define a more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere. You can give almost any type of permission (view a photo, write on your channel, comment a post, etc.) to anything (file, post, wiki, etc.) to almost any person or groups of persons that you wish (those you specifically allow, anyone connected, etc.) +
+In the next pages, we'll see how permissions works. + +--- diff --git a/pages/05.Social/01.DisHub/05.Posting/01.Composing/docs.en.md b/pages/05.Social/01.DisHub/05.Posting/01.Composing/docs.en.md new file mode 100755 index 00000000..85979c9c --- /dev/null +++ b/pages/05.Social/01.DisHub/05.Posting/01.Composing/docs.en.md @@ -0,0 +1,96 @@ +--- +title: Hubzilla: Composing +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Basic composing +If you want to share something, just click on the **share bar** ![Share](en/Share.png) that you can find on the top of the **your Channel page**, your **Activity/Network page** and on most of the **others channels pages** (except if not allowed). + +This is what you will happen: +![Compising_composer](en/Composing_composer.gif) + +The first thing you probably want to do is setting a **title**. It's not obligatory, so it's up to you if you want to set one or not. However, it is a good practice to set one as it makes your post more visible. + +The same thing is for the **categories** part. Here you can add one or more categories, "tags", just separate each words/sentences you add by a comma. For example **How to, hubzilla**. +Here again, it's a good practise to use categories as it helps people to find your posts easier. Indeed, when there is a **Categories widget** on the channel that you visit, you can click on the category you're interested in so that if filters all the channel's posts that have been composed with this tag. +![Composing_categories](en/Composing_categories.png) + +Now the first basic options you have when composing your post are **Bold, Italic, Underline, Quote and Code**. +So when composing you want for example to write some text in bold, you click on the bold button and put the text you want in between the **[b]** tags. Or you can write your text first, then select what you want to change (for example select your text and click on **B** to set it bold). +![ShareExample](en/ShareExample.gif) + +And here is the result +![ExamplePreview](en/ExamplePreview.png) + +--- + +## Code button +This one needs some explanation. +If you have trouble with for example **bbcode**, and want to ask someone advise or maybe you want to give advise on how to write something, then you can the **code** button. It allows to show what you write in between **[code]my text[/code]** without it being rendered. Without this tag only the rendered version will be shown. + +Here is an example +![CodeExample](en/CodeeExample.gif) +As you an see, you can add the type of code you're writing. For example here, it is php: **[code=php]** + +--- + +## Adding something to the post + +With the next three buttons you can easily **attach a file** from your device, **insert a weblink** or **embed an image** from your photo album (the photo has to be in your folder before it can be added). +![AddButtons](en/AddButtons.png) +They are pretty self explanatory, so don't need further explanation. + +**Note**: If you want to embed an image without having to upload it first on one of your albums you can use the attach button and select an image from your device. If you're on a computer, you can also simply add your picture by dragging it directly in your post. + +--- + +## Options + +You can find the options on the next group of buttons. +![OptionButtons](en/OptionButtons.png) + +### The options are: +* **Set your location**: you are able to share your location with others. A popup opens asking you to set the location you want, so it's not using geolocalization ![compsing_location](en/Composing_location.png) +* **Set expiration date**: the post will auto destruct on the date set. +* **Set publish date**: the post will be published in a future date. +* **Encrypt text**: this let's you encrypt text. Therefore you need to set a passphrase and make sure the ones that you want to share with know the passphrase. +* **Toggle voting**: If you want others to vote for something. They will have those options ![voting](en/Voting.png) on your post when clicking on this icon. +* **Disabling comments**: if you don't want comments on your post. + + --- + +## Before sharing + +Before clicking on the **Share** button you may want to check the permissions and preview you post. These option are next to the **Share** button. +![BeforeSharing](en/BeforeSharing.png) + +### These options are: +* **Preview**: let you see a preview of your post. This preview appears just under your actual post. +* **Permission settings**: Here you choose with whom you share the post. Most of the time, you won't even click on that button as it is automatically set according to your channel role. However, you change who can see your post: to the public, to a group, more groups, or only one connection. You can also set it that one or several connections or groups are not allowed to view the post. YOU CAN'T CHANGE IT ONCE POSTED! +For more information it's recommended to visit [the permissions](../../permissions) section. + +--- + +## Markup languages +You can use BBcode or Markdown when composing a post or in a comment. You can also combine the codes. +Here is an example. + +![MarkupExample](en/MarkupExample.png) + +If you want to know more about bbcode you can visit the [Hubzilla help page](https://hub.disroot.org/help/en/member/bbcode). + +--- + +## Who can see my posts and where? +Well, it depends on a few things: your channel role, the permission settings of the post, the permissions you set for your connections, etc. + +Depending of these permissions: +- **Public** may see your posts in the **Public stream** or by visiting **your channel**. +- **Connections** may also see your posts in their **Network stream**. + +--- diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/AddButtons.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/AddButtons.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/AddButtons.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/AddButtons.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/BeforeSharing.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/BeforeSharing.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/BeforeSharing.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/BeforeSharing.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/CodeeExample.gif b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/CodeeExample.gif similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/CodeeExample.gif rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/CodeeExample.gif diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/Composing_categories.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Composing_categories.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/Composing_categories.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Composing_categories.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/Composing_composer.gif b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Composing_composer.gif similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/Composing_composer.gif rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Composing_composer.gif diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/Composing_location.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Composing_location.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/Composing_location.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Composing_location.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/ExamplePreview.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/ExamplePreview.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/ExamplePreview.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/ExamplePreview.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/MarkupExample.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/MarkupExample.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/MarkupExample.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/MarkupExample.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/OptionButtons.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/OptionButtons.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/OptionButtons.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/OptionButtons.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/Share.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Share.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/Share.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Share.png diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/ShareExample.gif b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/ShareExample.gif similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/ShareExample.gif rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/ShareExample.gif diff --git a/pages/10.DisHub/05.Posts/01.Composing/en/Voting.png b/pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Voting.png similarity index 100% rename from pages/10.DisHub/05.Posts/01.Composing/en/Voting.png rename to pages/05.Social/01.DisHub/05.Posting/01.Composing/en/Voting.png diff --git a/pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/docs.en.md b/pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/docs.en.md new file mode 100755 index 00000000..e436fa13 --- /dev/null +++ b/pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/docs.en.md @@ -0,0 +1,64 @@ +--- +title: Hubzilla: Tags and mentions +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +Like many other platforms, Hubzilla uses a special notation inside messages to indicate "tags" or contextual links to other entities. + + +## Mentions +You can mention a person in a post, so that the mentioned channel receives a notification. Using @mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. + +!!! In the permission settings, **Can forward to all my channel connections via @+ mentions in posts.** must be allowed by a channel to be able to mention it. + +To use mention, simply add **@** before the channel name you want to mention. For example **@dishubuser**. + +You can mention someone using another protocol. For example to mention someone on mastodon: **@{username@mastodon.instance}** + +If you write the channel's name manually, if there are only one space in the channel's name, there will be no problem. So, **@Robert Johnson** will tag **Robert Johnson**. If there are more than one space, for example **Blind Lemon Jefferson**, you have to enclose the entire name in double quotes or change the spaces to underscores, **@"Blind Lemon Jefferson"** or **@Blind_Lemon_Jefferson**. + +--- + +## Deliverable Mentions +The deliverable mention is only used for forums or special channel. This means that when you use the deliverable mention your post will be posted on that channel's wall, but also to this Forum or Channel "network" (e.g. send to all the forum members; if you have permission to do so). + +The deliverable mention is done by adding **!** before the channel name, for example **!disroot+516**. Here to the auto-complete box will show. + +![DeliverableMention](en/DeliverableMention.gif) + +--- + +## Private Mentions +Like already seen in the [Composing](../composing) part, you can choose to restrict the viewing of a post to a single person or a number of people. You can do this by selecting channels or privacy groups from the privacy tool. But if you prefer you can also just tag them with a privacy tag. + +A **privacy tag** is an username preceded by the two characters **@!**, for example **@!dishubuser**. + +In addition to tagging these channels, this will also change the privacy permissions of the post so that only the mentioned channels will have permission to see the post. +![PrivateMention](en/PrivateMention.gif) + +You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector. + +**Forums** may be mentioned also by adding **!!** before the forum name. For example **!!dishub** will post to the Dishub forum privately. The forum will redeliver the post to all the forum members, but your own followers will not see the post unless they are also members of the Dishub forum. + +You may also **tag privacy groups** which are "public" with **@!Name_of_the_group**. When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) **@!Friends**, the post will be restricted to the Friends group. Check that the group is public before doing this, as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it. + +--- + +## Mentions in comments +You can use mentions in comments. + +But using Deliverable or Private mentions has **no effect**, except that the mentioned channel may receive notification if they were already included as a recipient in the conversation. **TO BE CHECKED** + +--- + +## Topical Tags (also known as Hashtags) +You can set one or more topical tags. This will help others search for a specific topic. This is easily done by adding **#** before the topic. For example **#tutorial** + +**Note**: Topical tags are generally a minimum of three characters in length. Shorter search terms are not likely to yield any search results, although this depends on the database configuration. + +Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as **#2018-photos** diff --git a/pages/10.DisHub/05.Posts/02.Tags_and_mentions/en/DeliverableMention.gif b/pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/en/DeliverableMention.gif similarity index 100% rename from pages/10.DisHub/05.Posts/02.Tags_and_mentions/en/DeliverableMention.gif rename to pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/en/DeliverableMention.gif diff --git a/pages/10.DisHub/05.Posts/02.Tags_and_mentions/en/PrivateMention.gif b/pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/en/PrivateMention.gif similarity index 100% rename from pages/10.DisHub/05.Posts/02.Tags_and_mentions/en/PrivateMention.gif rename to pages/05.Social/01.DisHub/05.Posting/02.Tags_and_mentions/en/PrivateMention.gif diff --git a/pages/05.Social/01.DisHub/05.Posting/03.Published_post_options/docs.en.md b/pages/05.Social/01.DisHub/05.Posting/03.Published_post_options/docs.en.md new file mode 100644 index 00000000..2c27f209 --- /dev/null +++ b/pages/05.Social/01.DisHub/05.Posting/03.Published_post_options/docs.en.md @@ -0,0 +1,11 @@ +--- +title: Hubzilla: Published Post options +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +When a post has been published, there are several options: diff --git a/pages/05.Social/01.DisHub/05.Posting/docs.en.md b/pages/05.Social/01.DisHub/05.Posting/docs.en.md new file mode 100755 index 00000000..160085f7 --- /dev/null +++ b/pages/05.Social/01.DisHub/05.Posting/docs.en.md @@ -0,0 +1,11 @@ +--- +title: Hubzilla: Posting and publishing +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +In this section we will see the different options you have when posting or commenting. +It's recommended to understand the different [permission roles](../permissions) first, so the posts are delivered to those who are meant to. diff --git a/pages/05.Social/01.DisHub/06.Wiki/docs.en.md b/pages/05.Social/01.DisHub/06.Wiki/docs.en.md new file mode 100644 index 00000000..dc1ddb2c --- /dev/null +++ b/pages/05.Social/01.DisHub/06.Wiki/docs.en.md @@ -0,0 +1,156 @@ +--- +title: Hubzilla: Wiki +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## What is a wiki? +A wiki is a type of website that lets anyone who can access the wiki to create and change its pages. + +The wiki is stored only on your channel's hub and must be accessed in traditional way using a static URL: it is not "delivered" not "federated". + + +## How to access a channel's wiki? +You can access a channel's wiki by going on this channel, then clicking on the hamburger menu and on the "Wiki" app logo. + +![wiki_access](en/Wiki_access.gif) + +If you don't see the wiki logo app, the this channel hasn't enable the wiki feature. + +Then, you need to open the wiki you want to access by simply clicking on its name. + +![wiki_open](en/Wiki_open.png) + +If you don't see any wiki, then this channel may have viewing restrictions or simply hasn't created any wiki yet. + + +## Enable wiki creation +### 1st step: enable the wiki feature +If you want to be able to use the wiki feature, you have to enable it first. To do so, go to your channel **Settings**, click on the **Aditionnal features** tab. + +To see be able to enable the wiki feature, you need to set your skill to at least **"2. Intermediate..."**. (You can see any other level superior to 2) + +You will see the wiki feature in the **General Features** tab. Just click on **On** to enable it and *Submit*. + +![wiki_enable01](en/Wiki_enable_features.gif) + +Now your wiki is accessible at this address: https://hub.disroot.org/wiki/your_channel_name + +If you don't want to use this feature anymore, just do the opposite! + +You can disable this feature by doing the opposite. + +### 2nd step: enable the wiki app? (optional) +As explained just above, you wiki is accessible at this address: https://hub.disroot.org/wiki/your_channel_name + +However, you may want other people (or even yourself!) to be able to access your wiki easier. It can be done by enabling the wiki app. Like this, people visiting your channel will be able to go to your wiki by clicking the hamburger menu and selecting "wiki". + +![wiki_access](en/Wiki_access.gif) + +To do so, click on the **hamburger menu** and select **Add apps**. Go down to the wiki app and enable it by **clicking on its star**. You will now be able to see it in the hamburger menu (sometimes, you need to refresh the page so that the app appears in the menu). + +![wiki_enable_app](en/Wiki_enable_app.gif) + +If you don't want to use this app anymore, just do the opposite! + + +## Create a wiki and its content +### Create a wiki +You can go to your wiki page either by going to its direct address: https://hub.disroot.org/wiki/your_channel_name or by using the hamburger menu. + +To create a wiki, simply click on **Create New** and fill in the information requested. + +![wiki_create](en/Wiki_create.gif) + +There are a few options: +- **Wiki name** +- **Content type**: Hubzilla supports several markup languages for advanced formatting of content. You can choose between *Markdown*, *BBcode* or *Text*. [If you want to know about the special BBcode for Hubzilla...](https://hub.disroot.org/help/en/member/bbcode#Hubzilla_specific_codes) +- **Lock content type**: when activated, this option will lock the way you can write wiki page to either *Markdown*, *BBcode* or *Text*. ![wiki_create_content_type](en/Wiki_create_content_type.png) +On this image, you can see that "my_wiki" isn't locked to any type of content, whereas "my_wiki2" can be written to markdown only and "my_wiki3" only in plain text. +- **Create a status post for this wiki**: if you activate this option, then a post will be created on your wall saying that a wiki has been created. +![wiki_post_message](en/Wiki_post_message.png) + +If there are some permissions set (see the following paragraph), there is lock icon next to your username. If you click on it, you'll see the channels that can see this post annd that you allowed to see your wiki. +![wiki_post_lock](en/Wiki_post_lock.gif) + +- There is also a **lock icon** next to *Submit* ![lock_icon](en/lock_icon.png). It allows you to decide who can see your wiki. It opens the ACL: Access Control List. [To have more information about permissions...](../permissions) + +If you want to change your wiki's name, go on your wiki list page. Click on the pencil icon, change the name of the wiki and *Submit*. +![wiki_change_name](en/Wiki_change_name.gif) + +If you want to change who can see it, click on the lock icon ![lock_icon](pages/10.DisHub/06.Wiki/en/lock_icon.png). + +### Create pages +To create a wiki page, go on your wiki list page, and on the left, there is the "Wiki Pages" panel. + +Click on **+ Add new page**. Choose a **page name**. You can click on **Options** to choose a **page content type** if you want. Click on *Submit*. + +![wiki_create_page](en/Wiki_create_page.gif) + +### Create content in pages +When you edit a page to add content, there are three tabs: **Edit**, **View**, **History**. +![wiki_edit](en/Wiki_edit.gif) + +In the **Edit page**, you write you text. Prior to saving page edits, you may enter a custom message to be displayed in the Page History viewer along with the revision. When you're done, click on **Save**. + +In the **View page**, you see what those that will be allowed to visit your wiki will see. + +In the **History page**, you have a list of the changes made on the page. You have the author name, the sort description of the change, and its date. You can compare what has been changed between the actual version and an older on by clicking on **Compare**. +The **Revert** button will load the selected revision but will not automatically save the page. + +**Work in Progress: problem with REVERT.** + + +## Wiki accessibility +### Who can see my wiki? +There are three of ways of managing who can see your wiki, three levels of permissions. + +#### Channel role +Depending on the channel role you chose, your wiki may be viewable by either anyone or the members of your Privacy group only. + +If you want anyone to be able to see your wiki pages, you have to make sure that you choose a role accordingly. [See the permissions page to know more...](05.Permissions) + +#### Connection permission +You can edit your connection permissions if you want to give/remove a specific permission the right to see your wiki. + +To get there, click on the **connections icon**, ![connection_icon](en/connection_icon.png), then click on **Edit** next to the connection you want to change permission with. Click on **Individual Permissions**. Check the **Can view my wiki pages** box to give that permission, and click on *Submit*. +![wiki_connections](en/Wiki_connection.gif) + +**Note**: if you choose a channel role that allows anyone to view your wiki, you can't change any permission in the channel permission settings. It is possible only if you chose a channel role that allows only members of your privacy group to see your wiki. Like this, you can give the right to see your wiki to connections that are not members of this group (but you also need to use the ACL, see the following section) + +#### Access Control List on wiki creation +When you create a wiki, you can restrain who can see it. There is a **lock icon** ![lock_icon](en/lock_icon.png). It allows you to decide who can see your wiki. It opens the ACL: Access Control List: +![wiki_ACL](en/Wiki_ACL.gif) + +**Note**: if you choose a channel role that allows only Privacy group members to view your wiki, then, when you create a wiki, the visibility is per default only to this group ("Public" otherwise). But you can override that and make it visible to "Your default audience" or to connections that you previously allowed to view your wiki (see previous section). + +[To have more information about permissions...](../04.Permissions) + +### Who can edit my wiki? +#### Connection permission +There is only place where you can set who can edit your wiki: it is in the individual Connection page. To get there, click on the **connections icon**, ![connection_icon](en/connection_icon.png), then click on **Edit** next to the connection you want to change permission with. Click on **Individual Permissions**. Check/Uncheck the **Can write to my wiki pages** box to give/remove that permission, and click on *Submit*. +![wiki_connections](en/Wiki_connection.gif) + + +## How to share a wiki page? +You can share a wiki page in a post on hubzilla. To do so, go on the wiki page you want to share, click on the top-right share icon. It brings you to the post edition page. You can complete like any other posts that you would write. +![wiki_share](en/Wiki_share.gif) +Obviously, if your wiki as some restriction on viewing permissions, the viewers of your post may not be able to access the wiki page. + + +## How to download a wiki? +You can download a wiki with all its files on your computer by going on the wiki page and clicking on the save icon ![wiki_save_icon](en/Wiki_save_icon.png). It will create a .zip file. +![wiki_save](en/Wiki_save.png) + +## How to delete? +### Delete a whole wiki +Go our the your wiki page. You see the list of all your wikis. Simply click on the trash can. +![wiki_delete](en/Wiki_delete.png) + +### Delete a page +On the "Wiki Pages" panel, if you move you mouse over the pages names, you'll see a trash can appearing. Click on it to remove the page. +![wiki_delete_page](en/Wiki_delete_page.png) diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_ACL.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_ACL.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_ACL.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_ACL.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_access.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_access.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_access.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_access.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_access_who.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_access_who.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_access_who.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_access_who.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_change_name.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_change_name.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_change_name.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_change_name.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_connection.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_connection.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_connection.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_connection.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_create.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_create.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_create.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_create.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_create_content_type.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_create_content_type.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_create_content_type.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_create_content_type.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_create_page.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_create_page.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_create_page.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_create_page.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_delete.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_delete.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_delete.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_delete.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_delete_page.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_delete_page.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_delete_page.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_delete_page.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_edit.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_edit.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_edit.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_edit.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_enable_app.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_enable_app.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_enable_app.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_enable_app.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_enable_features.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_enable_features.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_enable_features.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_enable_features.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_open.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_open.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_open.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_open.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_post_lock.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_post_lock.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_post_lock.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_post_lock.gif diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_post_message.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_post_message.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_post_message.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_post_message.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_save.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_save.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_save.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_save.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_save_icon.png b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_save_icon.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_save_icon.png rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_save_icon.png diff --git a/pages/10.DisHub/06.Wiki/en/Wiki_share.gif b/pages/05.Social/01.DisHub/06.Wiki/en/Wiki_share.gif similarity index 100% rename from pages/10.DisHub/06.Wiki/en/Wiki_share.gif rename to pages/05.Social/01.DisHub/06.Wiki/en/Wiki_share.gif diff --git a/pages/10.DisHub/06.Wiki/en/connection_icon.png b/pages/05.Social/01.DisHub/06.Wiki/en/connection_icon.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/connection_icon.png rename to pages/05.Social/01.DisHub/06.Wiki/en/connection_icon.png diff --git a/pages/10.DisHub/06.Wiki/en/lock_icon.png b/pages/05.Social/01.DisHub/06.Wiki/en/lock_icon.png similarity index 100% rename from pages/10.DisHub/06.Wiki/en/lock_icon.png rename to pages/05.Social/01.DisHub/06.Wiki/en/lock_icon.png diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/docs.en.md b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/docs.en.md similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/docs.en.md rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/docs.en.md diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/ConnectionFilter.gif b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/ConnectionFilter.gif similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/ConnectionFilter.gif rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/ConnectionFilter.gif diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/activate_affinity.gif b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/activate_affinity.gif similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/activate_affinity.gif rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/activate_affinity.gif diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/affinity_filter.gif b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/affinity_filter.gif similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/affinity_filter.gif rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/affinity_filter.gif diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/connection_disroot.png b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/connection_disroot.png similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/connection_disroot.png rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/connection_disroot.png diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/connection_icon.png b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/connection_icon.png similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/connection_icon.png rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/connection_icon.png diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/network_icon.png b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/network_icon.png similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/network_icon.png rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/network_icon.png diff --git a/pages/10.DisHub/07.Features/01.Connection_filtering/en/set_affinity.gif b/pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/set_affinity.gif similarity index 100% rename from pages/10.DisHub/07.Features/01.Connection_filtering/en/set_affinity.gif rename to pages/05.Social/01.DisHub/07.Features/01.Connection_filtering/en/set_affinity.gif diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/docs.en.md b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/docs.en.md similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/docs.en.md rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/docs.en.md diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/AddButtons.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/AddButtons.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/AddButtons.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/AddButtons.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/CLoud_default_folder.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/CLoud_default_folder.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/CLoud_default_folder.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/CLoud_default_folder.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_access_menu.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_access_menu.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_access_menu.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_access_menu.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_attachement.gif b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_attachement.gif similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_attachement.gif rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_attachement.gif diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete_file.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete_file.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete_file.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_delete_file.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_create.gif b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_create.gif similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_create.gif rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_create.gif diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_edit.gif b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_edit.gif similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_edit.gif rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_edit.gif diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_navigate.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_navigate.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_navigate.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_folder_navigate.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_grid_view.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_grid_view.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_grid_view.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_grid_view.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_list_view.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_list_view.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_list_view.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_list_view.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_options.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_options.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_options.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_options.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_share_file.png b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_share_file.png similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_share_file.png rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_share_file.png diff --git a/pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_upload.gif b/pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_upload.gif similarity index 100% rename from pages/10.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_upload.gif rename to pages/05.Social/01.DisHub/07.Features/02.Personal_Cloud_Storage/en/Cloud_upload.gif diff --git a/pages/10.DisHub/07.Features/03.Bookmarks/docs.en.md b/pages/05.Social/01.DisHub/07.Features/03.Bookmarks/docs.en.md similarity index 100% rename from pages/10.DisHub/07.Features/03.Bookmarks/docs.en.md rename to pages/05.Social/01.DisHub/07.Features/03.Bookmarks/docs.en.md diff --git a/pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_activate.png b/pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_activate.png similarity index 100% rename from pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_activate.png rename to pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_activate.png diff --git a/pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_folder.png b/pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_folder.png similarity index 100% rename from pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_folder.png rename to pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_folder.png diff --git a/pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save.gif b/pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save.gif similarity index 100% rename from pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save.gif rename to pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save.gif diff --git a/pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save_text.png b/pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save_text.png similarity index 100% rename from pages/10.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save_text.png rename to pages/05.Social/01.DisHub/07.Features/03.Bookmarks/en/Bookmarks_save_text.png diff --git a/pages/10.DisHub/07.Features/04.Chat_room/docs.en.md b/pages/05.Social/01.DisHub/07.Features/04.Chat/docs.en.md similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/docs.en.md rename to pages/05.Social/01.DisHub/07.Features/04.Chat/docs.en.md diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_activate.gif b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_activate.gif similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_activate.gif rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_activate.gif diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_app.png b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_app.png similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_app.png rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_app.png diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_create.gif b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_create.gif similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_create.gif rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_create.gif diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_delete.png b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_delete.png similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_delete.png rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_delete.png diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_enter.gif b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_enter.gif similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_enter.gif rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_enter.gif diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_icons.png b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_icons.png similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_icons.png rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_icons.png diff --git a/pages/10.DisHub/07.Features/04.Chat_room/en/Chat_icons2.png b/pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_icons2.png similarity index 100% rename from pages/10.DisHub/07.Features/04.Chat_room/en/Chat_icons2.png rename to pages/05.Social/01.DisHub/07.Features/04.Chat/en/Chat_icons2.png diff --git a/pages/10.DisHub/07.Features/05.Calendar/docs.en.md b/pages/05.Social/01.DisHub/07.Features/05.Calendar/docs.en.md similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/docs.en.md rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/docs.en.md diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_access.png b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_access.png similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_access.png rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_access.png diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_attendance.png b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_attendance.png similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_attendance.png rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_attendance.png diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_create_event.gif b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_create_event.gif similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_create_event.gif rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_create_event.gif diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_event_view.png b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_event_view.png similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_event_view.png rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_event_view.png diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_event_view_click.png b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_event_view_click.png similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_event_view_click.png rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_event_view_click.png diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_post.png b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_post.png similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_post.png rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_post.png diff --git a/pages/10.DisHub/07.Features/05.Calendar/en/Calendar_post_disroot.png b/pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_post_disroot.png similarity index 100% rename from pages/10.DisHub/07.Features/05.Calendar/en/Calendar_post_disroot.png rename to pages/05.Social/01.DisHub/07.Features/05.Calendar/en/Calendar_post_disroot.png diff --git a/pages/10.DisHub/07.Features/06.Photo_album/docs.en.md b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/docs.en.md similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/docs.en.md rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/docs.en.md diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_01.jpg b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_01.jpg similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_01.jpg rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_01.jpg diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_02.jpg b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_02.jpg similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_02.jpg rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_02.jpg diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_03.png b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_03.png similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_03.png rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Lubuntu_03.png diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Nautilus_01.gif b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Nautilus_01.gif similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_Nautilus_01.gif rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_Nautilus_01.gif diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_add_Nautilus_01.gif b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_add_Nautilus_01.gif similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_Album_add_Nautilus_01.gif rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_Album_add_Nautilus_01.gif diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_access.png b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_access.png similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_access.png rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_access.png diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_add.gif b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_add.gif similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_add.gif rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_add.gif diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_edit.png b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_edit.png similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_edit.png rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_edit.png diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_settings.png b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_settings.png similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_settings.png rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_settings.png diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_tools.png b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_tools.png similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_tools.png rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_tools.png diff --git a/pages/10.DisHub/07.Features/06.Photo_album/en/Photo_view.png b/pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_view.png similarity index 100% rename from pages/10.DisHub/07.Features/06.Photo_album/en/Photo_view.png rename to pages/05.Social/01.DisHub/07.Features/06.Photo_album/en/Photo_view.png diff --git a/pages/05.Social/01.DisHub/07.Features/docs.en.md b/pages/05.Social/01.DisHub/07.Features/docs.en.md new file mode 100755 index 00000000..21fa7044 --- /dev/null +++ b/pages/05.Social/01.DisHub/07.Features/docs.en.md @@ -0,0 +1,18 @@ +--- +title: Hubzilla: Features +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# Contents + +1. [Connections Filtering](connection_filtering) +2. [Personal Cloud Storage](personal_cloud_storage) +3. [Bookmarks](bookmarks) +4. [Chat](chat) +5. [Calendar](calendar) +6. [Photo album](photo_album) diff --git a/pages/10.DisHub/08.FAQ/docs.en.md b/pages/05.Social/01.DisHub/08.FAQ/docs.en.md similarity index 100% rename from pages/10.DisHub/08.FAQ/docs.en.md rename to pages/05.Social/01.DisHub/08.FAQ/docs.en.md diff --git a/pages/10.DisHub/08.FAQ/en/Background.png b/pages/05.Social/01.DisHub/08.FAQ/en/Background.png similarity index 100% rename from pages/10.DisHub/08.FAQ/en/Background.png rename to pages/05.Social/01.DisHub/08.FAQ/en/Background.png diff --git a/pages/10.DisHub/08.FAQ/en/Background_setting.png b/pages/05.Social/01.DisHub/08.FAQ/en/Background_setting.png similarity index 100% rename from pages/10.DisHub/08.FAQ/en/Background_setting.png rename to pages/05.Social/01.DisHub/08.FAQ/en/Background_setting.png diff --git a/pages/05.Social/01.DisHub/docs.en.md b/pages/05.Social/01.DisHub/docs.en.md new file mode 100755 index 00000000..f6c3be28 --- /dev/null +++ b/pages/05.Social/01.DisHub/docs.en.md @@ -0,0 +1,23 @@ +--- +title: Hubzilla +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](en/round_logo.png)| +|:--:| +|**DisHub: Disroot's Hubzilla instance** how2| + +[**Hubzilla**](https://project.hubzilla.org/page/hubzilla/hubzilla-project) is a powerful, free and open source software to create decentralized and federated web platforms which includes webpages tools, wikis, forums, cloud storage, social networks and more. Any attempt to accurately define Hubzilla may end up being inadequate.
+While it shares similarity with other web services software, **Hubzilla** offers some very particular features that no others do, like full and precise permission system that gives you control about the privacy of the information and content you may share; nomadic identity (which means you own your online identity and can take/migrate it across the network, no matter the hubs, instance, servers); multiple profiles and channels; account cloning; among other features. + +At **Disroot**, we think it’s an awesome piece of software and that everybody should try it because of its potential and the power it’s giving to decentralization and federation services. So we built **DisHub**, the **Disroot’s Hubzilla instance**. But, due to the amount of features, apps, services and user control settings, and because Hubzilla is beyond comparison, it may be kind of difficult until you fully get it. That’s why we made this Howto. + +Think of Hubzilla as your new digital house: You have many rooms that you can arrange and decorate as you want, it’s your place to talk and share whatever you want with the people you want. And more than that, because you can even take your home wherever (other hubzilla instances) you want. + +So, exercise your freedom, your imagination and welcome to DisHub. + +*We can only show you the door. You're the one that has to walk through it...* diff --git a/pages/10.DisHub/en/.gitkeep b/pages/05.Social/01.DisHub/en/.gitkeep similarity index 100% rename from pages/10.DisHub/en/.gitkeep rename to pages/05.Social/01.DisHub/en/.gitkeep diff --git a/pages/10.DisHub/en/registration_00.png b/pages/05.Social/01.DisHub/en/registration_00.png similarity index 100% rename from pages/10.DisHub/en/registration_00.png rename to pages/05.Social/01.DisHub/en/registration_00.png diff --git a/pages/10.DisHub/en/registration_01.png b/pages/05.Social/01.DisHub/en/registration_01.png similarity index 100% rename from pages/10.DisHub/en/registration_01.png rename to pages/05.Social/01.DisHub/en/registration_01.png diff --git a/pages/10.DisHub/en/round_logo.png b/pages/05.Social/01.DisHub/en/round_logo.png similarity index 100% rename from pages/10.DisHub/en/round_logo.png rename to pages/05.Social/01.DisHub/en/round_logo.png diff --git a/pages/05.Social/02.Nomad/docs.en.md b/pages/05.Social/02.Nomad/docs.en.md new file mode 100644 index 00000000..516385fa --- /dev/null +++ b/pages/05.Social/02.Nomad/docs.en.md @@ -0,0 +1,14 @@ +--- +title: Nomad +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## NOMAD:
The Disroot's Hubzilla App +|![](/start/icons/nomad.png)| +|:--:| +|NOMAD is an unofficial client for the distributed social network Hubzilla and it's based on the Dandelion* app.
The is a webview based app developed as a WebApp| diff --git a/pages/05.Social/docs.en.md b/pages/05.Social/docs.en.md new file mode 100644 index 00000000..b429b968 --- /dev/null +++ b/pages/05.Social/docs.en.md @@ -0,0 +1,15 @@ +--- +title: Social +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# DisHub + +|**WEB**|**MOBILE**| +|:--:|:--:| +|[Disroot's Hubzilla Instance](dishub)|[Nomad](nomad)| diff --git a/pages/05.XMPP/01.Desktop/01.pidgin/docs.en.md b/pages/05.XMPP/01.Desktop/01.pidgin/docs.en.md deleted file mode 100755 index edeb3cbf..00000000 --- a/pages/05.XMPP/01.Desktop/01.pidgin/docs.en.md +++ /dev/null @@ -1,44 +0,0 @@ ---- -title: Pidgin -published: true -visible: true -taxonomy: - category: - - docs ---- - -Pidgin is multi-platform (runs on most operating systems) and multi-protocol messaging application. It supports a lot of different messaging protocols such as: xmpp, skype, AIM, TOX, Whatsapp, facebook etc, so you can have all your messaging done with just one app. - -To setup disroot chat on pidgin, follow those easy steps: - -1. **Install Pidgin.** -If you use windows/macos check [pidgin's website](http://pidgin.im/download/) and download a version for you. -If you are a linux user, check your package repository and get it. (check for some additional plugins while you're at it. - -2. **Fire it up.** -You will be greeted with a welcome message like this: - -![](en/pidgin1.png) - -To Proceed, we need to **add an account**. -If it's not the first time you run pidgin you should use menu: - -![](en/pidgin2.png) - -3. **Setup account.** -First of, choose xmpp protocol from the drop-down list: - -![](en/pidgin3.png) - -Next fill in the information needed: - -![](en/pidgin4.png) - -!Note! If you wish to use avatar (optional) you can select "Use this buddy icon for this account" and browse your local filesystem (computer) for the picture you want to use. - -4. Hit "**Add**" and you are done! -Now you are ready to start preaching people to ditch corporate evil apps and jump on the federation *Starship*. - -![](en/pidgin5.png) - -**All your contacts are synced between all the clients, so you can use disroot chat on all the devices at the same time.** diff --git a/pages/05.XMPP/01.Desktop/02.Gajim/docs.en.md b/pages/05.XMPP/01.Desktop/02.Gajim/docs.en.md deleted file mode 100644 index e2695c1b..00000000 --- a/pages/05.XMPP/01.Desktop/02.Gajim/docs.en.md +++ /dev/null @@ -1,89 +0,0 @@ ---- -title: Gajim -published: true -visible: true -taxonomy: - category: - - docs ---- - -Gajim is multi-platform (runs on most operating systems) messaging application. - -To setup disroot chat on Gajim, follow those easy steps: - -## Install Gajim -If you use windows/macos check [Gajim's website](https://gajim.org/downloads.php) and download a version for you. -If you are a linux user, check your package repository and get it. (check for some additional plugins while you're at it.) - -## Fire it up -You will be greeted with a welcome message like this: - -![](en/01_creation.png) - -- If you want to use your Disroot account then choose **"I already have an acccount I want to use"**. -- If you want to create a new account, choose **"I want to register for a new account"** - -## Setup account -Next fill in the information needed: - -![](en/02_creation.png) - -Replace **username** by either your Disroot username, or by the username you have already created. - -![](en/03_creation.png) - -Click on **Finish**. - -**All your contacts are synced between all the clients, so you can use disroot chat on all the devices at the same time.** - -## Single window -Instead of having several windows (for contacts, for conversations, etc.), you can have a single window for everything. - -Go to the **Preferences**. It depends on either you’re using Windows or Linux. -You may find it at the top bar menu. Or you may have to right-click on the Gajim icon in the app list. - -In the **Preferences** window, in **Chat Appearance**, change the **Window behavior** to **“Single window for everything”**. - -![](en/04_windows.png) - -## Plugins -We also need to set up a few plugins. -Depending of your OS, you may have to install them first. [See that page](https://dev.gajim.org/gajim/gajim-plugins) - -Then, in the same place you found the **Preferences**, you should find **Plugins**. We need two plugins: - - OMEMO - - URL image preview - -So go to the **Available** tab and check those two plugins. Click on **Install/Upgrade** when you’re done. - -![](en/05_plugins.png) - -Then, go to the **Installed** tab. Check the plugins to make them active. Then close the windows. - -![](en/06_plugins.png) - -## Join a room -Room are also called group conversations or MUC (Multiple Chat Users). - -To join one, click on **Accounts**, then on **Join Group Chat**. - -There, some group conversations may appear. If not, click again on **Join Group Chat**. - -![](en/07_join.png) - -- **Nickname**: you can set whatever you want, it doesn't have to be your username! -- **Room**: the name of the room you want to join. If the room doesn't exist, it will then be created, and you will be its admin. -- **Server**: enter **chat.disroot.org** -- **Password**: useful only if the room you're trying to join is password protected. -- **Bookmark**: very useful, it allows to remember room you joined, so that you can easily and quickly find them again. And it allows also to keep them from one device to another one! -- **Autojoin**: if enabled, then on startup, Gajim will automatically open the room. - - -## History -As soon as you close Gajim, the rooms are cleaned of messages that you've already read. -However, you can still read a group conversation history. - -![](en/08_history.png) - -Click on the **three vertical dots** next to the attach file icon and choose **History**. -You can navigate through history by date. diff --git a/pages/05.XMPP/01.Desktop/03.dino/docs.en.md b/pages/05.XMPP/01.Desktop/03.dino/docs.en.md deleted file mode 100644 index d353ee99..00000000 --- a/pages/05.XMPP/01.Desktop/03.dino/docs.en.md +++ /dev/null @@ -1,87 +0,0 @@ ---- -title: Dino -published: true -visible: true -taxonomy: - category: - - docs ---- -![](en/dino.svg)
- -Dino is an open source chat client for the desktop. It has support for [OMEMO](https://en.wikipedia.org/wiki/OMEMO) and [OpenPGP](https://en.wikipedia.org/wiki/Pretty_Good_Privacy#OpenPGP), which means that once you enable encryption, only you and the other person can read your messages and no one else. - -1. **Installing Dino**
-**Dino** is available for GNU/Linux users only. You can check if there's a compiled package version for your distro by clicking [here](https://github.com/dino/dino/wiki/Distribution-Packages). Or build it yourself by downloading the code and compiling it from the command line: -``` -./configure -make -build/dino -``` - -2. **Starting Dino**
-First time you launch Dino, it'll appear a screen like this: - -![](en/01.png) - -To continue, select **Manage accounts** and then **Add an account**. - -![](en/02.png) - -3. **Setting up an account**
-Sign in with your information...:
-``` -JID: your_username@disroot.org -Password: your Disroot password -Local alias: the name you want to use -``` -... and then **Save** - -![](en/03.png) - -Once you've completed the previous step, the next box will appear: - -![](en/04.png) - -Connect by clicking the Connection button next to the username. - -![](en/05.png) - -To change the avatar, just click on the user icon, browse your local system and select the image you want to use. - -![](en/06.png) - - -4. **Starting a conversation**
-If you want to start a communication with other user, just click on **Start Conversation**. However, if you want to join a chat room then click on **Join a channel**. - -![](en/08.png) - -The procedure will be the same in both cases: enter the username or the chatroom's name and then click **Next**... - -![](en/09.png) - -... and a confirmation request will appear. - -![](en/10.png) - -By clicking on the **Join** button you will access the room or start a conversation with another user. - -![](en/12.png) - -Encryption is very uncommon at chatrooms, but it is recommended to enable it on one to one user conversations. To do it, just click on the lock icon at the right of the text box. - -![](es/13.png) - -5. **Settings and Preferences**
-If you want to add more accounts, start conversations with other users, join chatrooms or adjust some preferences, just click on the left icon at the top bar... - -![](en/13.png) - - -![](en/14.png) - - -![](en/15.png) - - -... and that's it. diff --git a/pages/05.XMPP/01.Desktop/03.dino/en/06.png b/pages/05.XMPP/01.Desktop/03.dino/en/06.png deleted file mode 100644 index 9c3be40c..00000000 Binary files a/pages/05.XMPP/01.Desktop/03.dino/en/06.png and /dev/null differ diff --git a/pages/05.XMPP/01.Desktop/docs.en.md b/pages/05.XMPP/01.Desktop/docs.en.md deleted file mode 100755 index 62c88cda..00000000 --- a/pages/05.XMPP/01.Desktop/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Desktop Clients -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/05.XMPP/02.Mobile/docs.en.md b/pages/05.XMPP/02.Mobile/docs.en.md deleted file mode 100755 index 187c56b9..00000000 --- a/pages/05.XMPP/02.Mobile/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Mobile clients -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/05.XMPP/docs.en.md b/pages/05.XMPP/docs.en.md deleted file mode 100755 index babe3ef1..00000000 --- a/pages/05.XMPP/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: xmpp -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/05.XMPP/docs.fr.md b/pages/05.XMPP/docs.fr.md deleted file mode 100755 index 4e8912f2..00000000 --- a/pages/05.XMPP/docs.fr.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: xmpp -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/05.XMPP/docs.pt.md b/pages/05.XMPP/docs.pt.md deleted file mode 100755 index 4e8912f2..00000000 --- a/pages/05.XMPP/docs.pt.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: xmpp -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/06.Pads_and_Bins/01.privatebin/docs.en.md b/pages/06.Pads_and_Bins/01.privatebin/docs.en.md deleted file mode 100755 index 9781fa90..00000000 --- a/pages/06.Pads_and_Bins/01.privatebin/docs.en.md +++ /dev/null @@ -1,113 +0,0 @@ ---- -title: PrivateBin -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- -Disroot provides PrivateBin as a service. A minimalist, open-source online pastebin and discussion board with zero knowledge. Meaning nor server and it's administrators can decrypt the content of the paste. - -Here is some of the things you can use it for: - -* Quickly share content of a text file with anyone without a need of copy/pasting large chunk of text or sending email with the content -* Publish information/documents online so that others can access -* Using it as a disposable message board, using it's message board feature -* Sending information to someone, via a url link that needs to be "burned after reading" -* Send someone a copy of a script or piece of code, note or confidential information you dont want anyone else to see - -In this tutorial we'll show you how to use it. You can access PrivateBin at [bin.disroot.org](https://bin.disroot.org) - -Note: PrivateBin is not a collaborative text editing tool, for that you have [etherpad and ethercalc](https://disroot.org/pad/) - --------- -# The interface - -The interface is super easy. You have the textbox to write or paste your text and above, you have your option buttons: - -* New (Paste) -* Set expiration time -* Burn after reading -* Open discussion -* Password protection of paste -* Format (Plain Text, Markdown, Source code -* Language -* Send (create the link to share) - - -![](en/privatebin01.gif) - ----------- - - -# How to paste and share content - -Just write or paste your text in the text box and press the "send" button ![](en/privatebin01.png?resize=38,18). After that a URL link will appear in the center of the screen. Copy it and share/send it to whomever you want however you want: shared in social networks, a website, via a email, chat, etc. - -![](en/privatebin02.gif) - -To create a new paste after that just press the "new" button ![](en/privatebin02.png?resize=38,18) - ----------- - -# Read only once -You can set your paste to be deleted after it's being opened for the first time by selecting the **"Burn after reading"** option ![](en/privatebin03.png?resize=166,41) - -When the recipient of the URL link opens the page, the content will appear with the following message: -![](en/privatebin04.png?resize=606,50) - -If the person opens the link in a new tab or refreshes the page the content will no longer be available. - -This option is good if you have information to send to a specific person and that should not be public or spread around. - -![](en/privatebin03.gif) - ----------- - -# Setting an expiration date to your paste - -Setting an expiration date to your paste is very easy. When you are creating your paste, just press the expires button and select in how long you want your paste to expire: - -![](en/privatebin04.gif) - ----------- -# Discussion board - -PrivateBin features a Discussion board that can be used by anyone that receives the URL link of the paste. It's very easy to enable the Discussion Board, just select "open discussion" ![](en/privatebin05.png?resize=151,41) when you are creating your paste. - -When you and people that receive the link open it you will see comments and be able to add yours just like a typical forum/chat: - -![](en/privatebin06.png) - -from there you can write a message and others can reply to it. - -![](en/privatebin05.gif) - - - -**Note:** -This is not a Instant Message system where a reply appears automatically. To see a reply you may need to refresh your page. -This is a very simple and basic discussion board that you can use to communicate in a more private way with others. None except people you shared the link with (not even system administrators of disroot) will be able to read your discussion. After set expiry, the entire conversation will be erased leaving no trace of it. - ----------- -# Using PrivateBin as a disposable discussion board - -Like mentioned above PrivateBin features a discussion board. If you add to this the "set expiration date" option to delete your paste after some time, then you have the equivalent to a disposable discussion board that you can use with other people to communicate. - -Since PrivateBin works in a logic of zero knowledge the pastes are encrypted so that the server and it's administrators don't know it's content, only the people the have the URL link. -When the expiration date is reached the paste along with the conversation will be destroyed. - -To do this just select the options "open discussion" ![](en/privatebin07.png?resize=151,41) and "Expires" when creating a paste. - -![](en/privatebin06.gif) - -Set the expiration date to a realistic time so that the paste isn't deleted in the middle of the conversation. - ----------- - -# Protect Paste with a password -This is pretty easy. Just write a password in the password field in the paste. When someone opens the link with the paste, that person will be prompted to type the password to unlock the Paste. - -![](en/privatebin07.gif) diff --git a/pages/06.Pads_and_Bins/docs.en.md b/pages/06.Pads_and_Bins/docs.en.md deleted file mode 100755 index e0bbbe30..00000000 --- a/pages/06.Pads_and_Bins/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: 'Pads and Bins' -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/06.Pads_and_Bins/docs.es.md b/pages/06.Pads_and_Bins/docs.es.md deleted file mode 100644 index 40b4ad33..00000000 --- a/pages/06.Pads_and_Bins/docs.es.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: 'Pads y bins' -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/06.Pads_and_Bins/docs.fr.md b/pages/06.Pads_and_Bins/docs.fr.md deleted file mode 100755 index bf704ca0..00000000 --- a/pages/06.Pads_and_Bins/docs.fr.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Pads et Bins -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/06.Pads_and_Bins/docs.pt.md b/pages/06.Pads_and_Bins/docs.pt.md deleted file mode 100755 index 65d36af1..00000000 --- a/pages/06.Pads_and_Bins/docs.pt.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Pads e Bins -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/06.Projects_Office/01.Taiga/docs.en.md b/pages/06.Projects_Office/01.Taiga/docs.en.md new file mode 100644 index 00000000..b67c4881 --- /dev/null +++ b/pages/06.Projects_Office/01.Taiga/docs.en.md @@ -0,0 +1,13 @@ +--- +title: Taiga +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|![](/start/icons/taiga.png)| +|:--:| +|Taiga is a project management tool, developed for programmers, designers and startups working with agile methodology in mind. It can however be applied to virtually any project or group, even outside of IT realm. It creates a clear, visual overview of the current state of your project to anyone involved. It makes planning very easy and it keeps you and your team focused on tasks. Taiga can be adjusted to fit any type of project due to its customization. From complex software development projects to simple household chores. The limitation is your imagination.
If you never used such tool, you will be surprised how your life can be improved with Taiga. Simply create a project, invite your group members, create tasks and put them on the board. Decide who will take responsibility for the tasks, follow progress, comment, decide and see your project flourish.| diff --git a/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/docs.en.md b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/docs.en.md new file mode 100644 index 00000000..e0fe2f3e --- /dev/null +++ b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/docs.en.md @@ -0,0 +1,33 @@ +--- +title: 'Pads: Ownpad' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +## Pad plugin for Disroot cloud instance +---- + +# Creating new pads +Creating new pad works the same as creating new file. Click on "+" icon and choose to create either pad (text editor) or calc (spreadsheet). Once you give it a name a new file with .pad/.calc extension will be created. You can move, share that file just like any other file you have on your cloud account. + +![](en/pads_add.gif) + +# Opening new pad +To open the newly created pad, just click on it's name. The application will open up your pad using pad.disroot.org/calc.disroot.org within the cloud interface. You can now easily work on your document and once you're done, use the red icon on your right to close it. All changes are written the moment you start typing so there is no need to save the file before hand. Since the file lives in the web, you can come back to it any time you want. + +![](en/pads_inapp_name.gif) + +# Sharing + +Sharing pads with other disroot users is the same as sharing normal files. Click on "sharing" icon and select with whom you want to share the file with. Note: Using public link will not work as easy since these are not normal files. + +![](en/pads_inapp_name2.gif) + +In order to share with someone outside disroot cloud, you should share the actual link to the pad. You can do it by opening your pad in the browser and hovering above it's name. You will see the actual link to the pad, which you can then copy and send it to anyone you wish to share the pad with. + +# Deleting pads +It is impossible to delete pads. Once created they stay online. In fact anyone who could guess the url could look it up. That's why disroot cloud's plugin creates links to your pads using random strings instead of the name you specify when creating the file. In that way the links to the pads are impossible to guess making them safe from anyone but you and users you share the pads with. diff --git a/pages/02.nextcloud/02.Apps/Pads/en/pad_add_file.png b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pad_add_file.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/en/pad_add_file.png rename to pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pad_add_file.png diff --git a/pages/02.nextcloud/02.Apps/Pads/en/pad_add_icon.png b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pad_add_icon.png similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/en/pad_add_icon.png rename to pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pad_add_icon.png diff --git a/pages/02.nextcloud/02.Apps/Pads/en/pads_add.gif b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pads_add.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/en/pads_add.gif rename to pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pads_add.gif diff --git a/pages/02.nextcloud/02.Apps/Pads/en/pads_inapp_name.gif b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pads_inapp_name.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/en/pads_inapp_name.gif rename to pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pads_inapp_name.gif diff --git a/pages/02.nextcloud/02.Apps/Pads/en/pads_inapp_name2.gif b/pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pads_inapp_name2.gif similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/en/pads_inapp_name2.gif rename to pages/06.Projects_Office/02.Pads/00.Pad_Disroot/en/pads_inapp_name2.gif diff --git a/pages/06.Projects_Office/02.Pads/01.Etherpad/docs.en.md b/pages/06.Projects_Office/02.Pads/01.Etherpad/docs.en.md new file mode 100644 index 00000000..5b894bfa --- /dev/null +++ b/pages/06.Projects_Office/02.Pads/01.Etherpad/docs.en.md @@ -0,0 +1,14 @@ +--- +title: 'Pads: Etherpad' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: true +--- + +|![](/start/icons/etherpad.png)| +|:--:| +|Etherpad and Ethercalc are collaborative applications for multi-user real-time document edition. You can reach them directly from your browser at: https://pad.disroot.org and https://calc.disroot.org.
No user account is needed to make use of them. However our cloud comes with very handy plugin that helps you keep track of all your pads, just as if they are one of your files.| diff --git a/pages/06.Projects_Office/02.Pads/02.Ethercalc/docs.en.md b/pages/06.Projects_Office/02.Pads/02.Ethercalc/docs.en.md new file mode 100644 index 00000000..5835c7b0 --- /dev/null +++ b/pages/06.Projects_Office/02.Pads/02.Ethercalc/docs.en.md @@ -0,0 +1,13 @@ +--- +title: 'Pads: EtherCalc' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](/start/icons/ethercalc.png)| +|:--:| +|Ethercalc| diff --git a/pages/06.Projects_Office/02.Pads/docs.en.md b/pages/06.Projects_Office/02.Pads/docs.en.md new file mode 100755 index 00000000..ff449cef --- /dev/null +++ b/pages/06.Projects_Office/02.Pads/docs.en.md @@ -0,0 +1,24 @@ +--- +title: 'Pads' +published: true +visible: true +taxonomy: + category: + - docs +page-toc: + active: false +--- +|![](/start/icons/etherpad.png)| +|:--:| +|**Etherpad** and **Ethercalc** are collaborative applications for multi-user real-time document edition. You can reach them directly from your browser at: [https://pad.disroot.org](https://pad.disroot.org) and [https://calc.disroot.org](https://calc.disroot.org).
No user account is needed to make use of them. However our cloud comes with very handy plugin that helps you keep track of all your pads, just as if they are one of your files.| + +|![](en/note.png) **Note**| +|:--:| +|"Pads" and "calcs" aren't files containing your data but are links to your work stored on either https://pad.disroot.org or https://calc.disroot.org.| + +# Idea behind pads +The idea behind this software is very simple. It's a text/spreadsheet editor that lives in the web. Everything you type in gets written to your pad automatically. You can work on a document with multiple people at the same time without a need to save and pass copies of the documents to each other. Once your work is done, you can export the pad to a format of your choice. + +|[**Ownpad**](pad_disroot)|[**Etherpad**](etherpad)|[**EtherCalc**](ethercalc)| +|:--:|:--:|:--:| +|Pad plugin for Disroot cloud|Collaborative text documents|Collaborative spreadsheet| diff --git a/pages/02.nextcloud/02.Apps/Pads/docs.es.md b/pages/06.Projects_Office/02.Pads/docs.es.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/docs.es.md rename to pages/06.Projects_Office/02.Pads/docs.es.md diff --git a/pages/02.nextcloud/02.Apps/Pads/docs.fr.md b/pages/06.Projects_Office/02.Pads/docs.fr.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/docs.fr.md rename to pages/06.Projects_Office/02.Pads/docs.fr.md diff --git a/pages/02.nextcloud/02.Apps/Pads/docs.pt.md b/pages/06.Projects_Office/02.Pads/docs.pt.md similarity index 100% rename from pages/02.nextcloud/02.Apps/Pads/docs.pt.md rename to pages/06.Projects_Office/02.Pads/docs.pt.md diff --git a/pages/06.Projects_Office/02.Pads/en/note.png b/pages/06.Projects_Office/02.Pads/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/06.Projects_Office/02.Pads/en/note.png differ diff --git a/pages/06.Projects_Office/03.Padland/docs.en.md b/pages/06.Projects_Office/03.Padland/docs.en.md new file mode 100644 index 00000000..44d2fad2 --- /dev/null +++ b/pages/06.Projects_Office/03.Padland/docs.en.md @@ -0,0 +1,13 @@ +--- +title: Pads: Padland +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +|![](/start/icons/padland.png)| +|:--:| +|Padland is a tool to manage, share, remember and read collaborative documents based on the Etherpad technology in Android.| diff --git a/pages/06.Projects_Office/04.Bin/01.Privatebin/docs.en.md b/pages/06.Projects_Office/04.Bin/01.Privatebin/docs.en.md new file mode 100644 index 00000000..8f7d4c6b --- /dev/null +++ b/pages/06.Projects_Office/04.Bin/01.Privatebin/docs.en.md @@ -0,0 +1,103 @@ +--- +title: PrivateBin +page-toc: + active: true +published: true +visible: true +taxonomy: + category: + - docs +--- + +|![](/start/icons/privatebin.png)| +|:--:| +|PrivateBin is a minimalist, open-source online pastebin and discussion board with zero knowledge. Meaning nor server and it's administrators can decrypt the content of the paste.| +
+ +# The interface + +The interface is super easy. You have the textbox to write or paste your text and above, you have your option buttons: + +* New (Paste) +* Set expiration time +* Burn after reading +* Open discussion +* Password protection of paste +* Format (Plain Text, Markdown, Source code +* Language +* Send (create the link to share) + + +![](en/privatebin01.gif) + +---------- + + +# How to paste and share content + +Just write or paste your text in the text box and press the "send" button ![](en/privatebin01.png?resize=38,18). After that a URL link will appear in the center of the screen. Copy it and share/send it to whomever you want however you want: shared in social networks, a website, via a email, chat, etc. + +![](en/privatebin02.gif) + +To create a new paste after that just press the "new" button ![](en/privatebin02.png?resize=38,18) + +---------- + +# Read only once +You can set your paste to be deleted after it's being opened for the first time by selecting the **"Burn after reading"** option ![](en/privatebin03.png?resize=166,41) + +When the recipient of the URL link opens the page, the content will appear with the following message: +![](en/privatebin04.png?resize=606,50) + +If the person opens the link in a new tab or refreshes the page the content will no longer be available. + +This option is good if you have information to send to a specific person and that should not be public or spread around. + +![](en/privatebin03.gif) + +---------- + +# Setting an expiration date to your paste + +Setting an expiration date to your paste is very easy. When you are creating your paste, just press the expires button and select in how long you want your paste to expire: + +![](en/privatebin04.gif) + +---------- +# Discussion board + +PrivateBin features a Discussion board that can be used by anyone that receives the URL link of the paste. It's very easy to enable the Discussion Board, just select "open discussion" ![](en/privatebin05.png?resize=151,41) when you are creating your paste. + +When you and people that receive the link open it you will see comments and be able to add yours just like a typical forum/chat: + +![](en/privatebin06.png) + +from there you can write a message and others can reply to it. + +![](en/privatebin05.gif) + + +|![](en/note.png) **Note**| +|:--:| +|This is not an Instant Message system where a reply appears automatically. To see a reply you may need to refresh your page.
This is a very simple and basic discussion board that you can use to communicate in a more private way with others. None except people you've shared the link with (not even system administrators of Disroot) will be able to read your discussion. After set expiry, the entire conversation will be erased leaving no trace of it.| + +---------- +# Using PrivateBin as a disposable discussion board + +Like it was mentioned above, PrivateBin features a discussion board. If you add to this the "set expiration date" option to delete your paste after some time, then you have the equivalent to a disposable discussion board that you can use with other people to communicate. + +Since PrivateBin works in a logic of zero knowledge the pastes are encrypted so that the server and it's administrators don't know it's content, only the people the have the URL link. +When the expiration date is reached the paste along with the conversation will be destroyed. + +To do this just select the options "open discussion" ![](en/privatebin07.png?resize=151,41) and "Expires" when creating a paste. + +![](en/privatebin06.gif) + +Set the expiration date to a realistic time so that the paste isn't deleted in the middle of the conversation. + +---------- + +# Protect Paste with a password +This is pretty easy. Just write a password in the password field in the paste. When someone opens the link with the paste, that person will be prompted to type the password to unlock the Paste. + +![](en/privatebin07.gif) diff --git a/pages/06.Projects_Office/04.Bin/01.Privatebin/en/note.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/note.png differ diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin01.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin01.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin01.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin01.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin01.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin01.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin01.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin01.png diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin02.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin02.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin02.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin02.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin02.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin02.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin02.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin02.png diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin03.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin03.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin03.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin03.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin03.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin03.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin03.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin03.png diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin04.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin04.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin04.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin04.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin04.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin04.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin04.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin04.png diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin05.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin05.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin05.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin05.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin05.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin05.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin05.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin05.png diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin06.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin06.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin06.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin06.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin06.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin06.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin06.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin06.png diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin07.gif b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin07.gif old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin07.gif rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin07.gif diff --git a/pages/06.Pads_and_Bins/01.privatebin/en/privatebin07.png b/pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin07.png old mode 100755 new mode 100644 similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/en/privatebin07.png rename to pages/06.Projects_Office/04.Bin/01.Privatebin/en/privatebin07.png diff --git a/pages/06.Projects_Office/04.Bin/docs.en.md b/pages/06.Projects_Office/04.Bin/docs.en.md new file mode 100755 index 00000000..631ce680 --- /dev/null +++ b/pages/06.Projects_Office/04.Bin/docs.en.md @@ -0,0 +1,28 @@ +--- +title: Pastebin +page-toc: + active: true +published: true +visible: true +taxonomy: + category: + - docs +--- +|What is a pastebin?| +|:--:| +|A pastebin is a content hosting service that allows you to upload and share text online.| + +**Some of the things you can use it for**: + +- Quickly share content of a text file with anyone without a need of copy/pasting large chunk of text or sending email with the content +- Publish information/documents online so that others can access +- Using it as a disposable message board, using it's message board feature +- Sending information to someone, via a url link that needs to be "burned after reading" +- Send someone a copy of a script or piece of code, note or confidential information you dont want anyone else to see| + + +In this how2 we'll see how to use PrivateBin at [bin.disroot.org](https://bin.disroot.org) + +|![](en/note.png) **Note**| +|:--:| +|PrivateBin is not a collaborative text editing tool, for that you have [Etherpad and EtherCalc](projects_office/pads/)| diff --git a/pages/06.Pads_and_Bins/01.privatebin/docs.es.md b/pages/06.Projects_Office/04.Bin/docs.es.md similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/docs.es.md rename to pages/06.Projects_Office/04.Bin/docs.es.md diff --git a/pages/06.Pads_and_Bins/01.privatebin/docs.fr.md b/pages/06.Projects_Office/04.Bin/docs.fr.md similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/docs.fr.md rename to pages/06.Projects_Office/04.Bin/docs.fr.md diff --git a/pages/06.Pads_and_Bins/01.privatebin/docs.pt.md b/pages/06.Projects_Office/04.Bin/docs.pt.md similarity index 100% rename from pages/06.Pads_and_Bins/01.privatebin/docs.pt.md rename to pages/06.Projects_Office/04.Bin/docs.pt.md diff --git a/pages/06.Projects_Office/04.Bin/en/note.png b/pages/06.Projects_Office/04.Bin/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/06.Projects_Office/04.Bin/en/note.png differ diff --git a/pages/06.Projects_Office/05.Polls/01.How2/docs.en.md b/pages/06.Projects_Office/05.Polls/01.How2/docs.en.md new file mode 100644 index 00000000..2e665058 --- /dev/null +++ b/pages/06.Projects_Office/05.Polls/01.How2/docs.en.md @@ -0,0 +1,97 @@ +--- +title: Polls How2 +page-toc: + active: true +published: true +taxonomy: + category: + - docs +--- + +# How to create a poll + +Creating a poll is very easy, just go to [poll.disroot.org](https://poll.disroot.org/). You can choose the language of your poll in the upper right corner, and choose if you want a standard poll, or a poll to schedule an event/appointment. + +![](en/polls1.png) + +The main differences between "Schedule an event" and "Make a standard poll" are: + +* **Schedule an event**, like the name suggests is better suited to schedule meetings, actions, because it permits to set the proposals with multiple dates and times. + +* **Standard poll** is better suited do surveys. *If you want to do a poll about an event that spans over several days (with no options on starting hour), Standard Poll is also better suited.* + +Once you choose which type of poll you prefer, the first step in making a poll is common to both, in the first page you need to fill: + +* Your name (which will be publicly shown as the creator of the poll, choose whatever name you like) +* Poll title +* Description + +And pressing in the button "Optional Parameters" ![](en/polls07.png?resize=40,18) + +You can chose the following options: + +* Poll link (personalized URL, for example: polls.disroot.org/big-decision) +* Password (to restrict the access to the poll) +* All voters can modify any vote +* Voters can modify their vote themselves +* Votes cannot be modified +* Only the poll maker can see the poll results + +After that continue to step 2, by pressing the green button on the bottom of the page. + +![](en/polls2.gif) + +In step 2 you will have to set the choices in either your "Standard poll" or your "Schedule an event" poll. + +## Set choices in Standard Poll +You can choose the number of choices you want by using the + and - buttons ![](en/polls2.png?resize=40,18), and fill the text you want. Once you are done press next, select the expiration date of your poll, and press "create poll" + +![](en/polls3.gif) + +![](en/polls4.gif) + +You can also add pictures and links to the options you create, but in the case of pictures they need to be uploaded elsewhere and you need URL link to them: + +![](en/polls5.gif) + +## Set choices in "Schedule an event" +You can choose the number of choices you want by using the + and - buttons ![](en/polls2.png?resize=40,18) Select the dates in each choice and the times. Once you are done press next, select the expiration date of your poll and press "create poll". + +![](en/polls6.gif) + +---------- + +# Share your poll + +Once your poll is created you will see in the left side of the screen the public link to the poll, just copy it and send it to people you want to participate in the poll. + +![](en/polls7.gif) + +---------- +# Administer your poll +To administer your poll after it was created you need the "Admin link for the poll", which you can see and copy on the center part of the screen. **(don't lose it or else you wont be able to enter the admin panel)** + +![](en/polls3.png) + +With this admin link you can return to this page whenever you want and edit the options of the poll. + +# Check the results of the poll +Just press the "Display the chart of the results" or export it to a .csv file + +![](en/polls8.gif) + +---------- + +# Participate in the poll + + +* Write your name (or whatever name you want) +* Select in each choice one of three options; yes ![](en/polls4.png?resize=32,22), If need be ![](en/polls5.png?resize=31,20), and no ![](en/polls6.png?resize=32,21) +* And press save at the end + +## Using the comment section +Users of the poll can use the "comment section" in the bottom of the poll page to send messages to each other. + +![](en/polls9.gif) + +Users can see the results of the poll (if that option was enabled by the creator of the poll) beneath the list of people that voted, or by pressing the Display the Chart of the results. diff --git a/pages/07.Polls/en/polls07.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls07.png similarity index 100% rename from pages/07.Polls/en/polls07.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls07.png diff --git a/pages/07.Polls/en/polls1.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls1.png similarity index 100% rename from pages/07.Polls/en/polls1.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls1.png diff --git a/pages/07.Polls/en/polls2.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls2.gif similarity index 100% rename from pages/07.Polls/en/polls2.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls2.gif diff --git a/pages/07.Polls/en/polls2.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls2.png similarity index 100% rename from pages/07.Polls/en/polls2.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls2.png diff --git a/pages/07.Polls/en/polls3.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls3.gif similarity index 100% rename from pages/07.Polls/en/polls3.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls3.gif diff --git a/pages/07.Polls/en/polls3.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls3.png similarity index 100% rename from pages/07.Polls/en/polls3.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls3.png diff --git a/pages/07.Polls/en/polls4.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls4.gif similarity index 100% rename from pages/07.Polls/en/polls4.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls4.gif diff --git a/pages/07.Polls/en/polls4.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls4.png similarity index 100% rename from pages/07.Polls/en/polls4.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls4.png diff --git a/pages/07.Polls/en/polls5.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls5.gif similarity index 100% rename from pages/07.Polls/en/polls5.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls5.gif diff --git a/pages/07.Polls/en/polls5.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls5.png similarity index 100% rename from pages/07.Polls/en/polls5.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls5.png diff --git a/pages/07.Polls/en/polls6.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls6.gif similarity index 100% rename from pages/07.Polls/en/polls6.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls6.gif diff --git a/pages/07.Polls/en/polls6.png b/pages/06.Projects_Office/05.Polls/01.How2/en/polls6.png similarity index 100% rename from pages/07.Polls/en/polls6.png rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls6.png diff --git a/pages/07.Polls/en/polls7.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls7.gif similarity index 100% rename from pages/07.Polls/en/polls7.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls7.gif diff --git a/pages/07.Polls/en/polls8.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls8.gif similarity index 100% rename from pages/07.Polls/en/polls8.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls8.gif diff --git a/pages/07.Polls/en/polls9.gif b/pages/06.Projects_Office/05.Polls/01.How2/en/polls9.gif similarity index 100% rename from pages/07.Polls/en/polls9.gif rename to pages/06.Projects_Office/05.Polls/01.How2/en/polls9.gif diff --git a/pages/06.Projects_Office/05.Polls/docs.en.md b/pages/06.Projects_Office/05.Polls/docs.en.md new file mode 100755 index 00000000..44261a9b --- /dev/null +++ b/pages/06.Projects_Office/05.Polls/docs.en.md @@ -0,0 +1,16 @@ +--- +title: Polls +page-toc: + active: true +published: true +taxonomy: + category: + - docs +--- + +Disroot polls is an online service for appointment planning and decision making. +No registration is required. You can use it even if you don't have a disroot account. + +This service is made possible thanks to [Framadate](https://framadate.org/). + +Let's see how to work with Disroot polls. diff --git a/pages/07.Polls/docs.es.md b/pages/06.Projects_Office/05.Polls/docs.es.md similarity index 100% rename from pages/07.Polls/docs.es.md rename to pages/06.Projects_Office/05.Polls/docs.es.md diff --git a/pages/07.Polls/docs.fr.md b/pages/06.Projects_Office/05.Polls/docs.fr.md similarity index 100% rename from pages/07.Polls/docs.fr.md rename to pages/06.Projects_Office/05.Polls/docs.fr.md diff --git a/pages/07.Polls/docs.pt.md b/pages/06.Projects_Office/05.Polls/docs.pt.md similarity index 100% rename from pages/07.Polls/docs.pt.md rename to pages/06.Projects_Office/05.Polls/docs.pt.md diff --git a/pages/06.Projects_Office/06.Lufi/01.How2/docs.en.md b/pages/06.Projects_Office/06.Lufi/01.How2/docs.en.md new file mode 100644 index 00000000..7a342423 --- /dev/null +++ b/pages/06.Projects_Office/06.Lufi/01.How2/docs.en.md @@ -0,0 +1,147 @@ +--- +title: 'Upload: Lufi How2' +page-toc: + active: true +published: true +visible: true +taxonomy: + category: + - docs +--- + +# How safe is Lufi and how it works + +When you use Lufi to upload files, "All the files are encrypted by your the browser! It means that your files never leave your computer unencrypted. The administrator of the Lufi instance you use will not be able to see what is in your file, neither will your network administrator, or your ISP". + +When someone downloads your file, it is decrypted locally in that person's browser after the download. Meaning, the network administrator, or the ISP will not be able to see what's in the downloaded file. + +You can read more about it [here](https://git.framasoft.org/luc/lufi). + +The whole encryption/decryption process is done automatically by the browsers, so no need of manually encrypt the files before, or manually decrypt at the download. + +The encryption key (the thing that permits whomever downloads the file to decrypt it) is a part of the link that is presented to you by your browser after you have uploaded a file. + +It's an anchor (Cf. Fragment Identifier). That means this part (the encryption key) is only processed client-side (in your computer) and does not reach the server of your Lufi provider, so they cannot decrypt the file. + +**Only persons that have the full link will be able to download and decrypt the file.** + +For example this is a link to a file in upload.disroot.org: + +[https://upload.disroot.org/r/FA7MHOOL#AgsmqnJEyUZAcybZmOGKljqYRtDhJKsvZC/Qt05N8dE=](https://upload.disroot.org/r/FA7MHOOL#AgsmqnJEyUZAcybZmOGKljqYRtDhJKsvZC/Qt05N8dE=) + +It has two components: + +* Left of the **#** symbol in the link is the URL to the file: +"https://upload.disroot.org/r/FA7MHOOL" + +* Right of the **#** symbol in the link is the encryption key of the file: +"#AgsmqnJEyUZAcybZmOGKljqYRtDhJKsvZC/Qt05N8dE=" + + +If you try to use just, [https://upload.disroot.org/r/FA7MHOOL](https://upload.disroot.org/r/FA7MHOOL) +Without the second part you will get this message: + +![](en/lufi01.png) + + + +---------- +# The Interface + +The interface is pretty straightforward, when you upload a file you have the following options: + +* Choose how many days it stays online. **The maximum is 60 days, (for smaller files)** +* Choose if you want the file to be deleted after it was downloaded for the first time + +In the upper centre part of the panel you can set the options mentioned above. In the upper right part you have the menu to go "My files" and manage your uploads. The centre is where you upload your files. + +![](en/lufi02.png) + +---------- + +# Maximum file size + +There is no size limit to the files you can upload. But the maximum amount of time that a file stays stored in Lufi varies according to it's size. After that time expired the file is deleted. + +Larger files will be stored for a shorter time. "The expiration delay of your file will be the minimum between what you choose and the following limitations": + +* between 0 and 48M, the file will be kept 60 day(s) +* between 48M and 96M, the file will be kept 30 day(s) +* between 96M and 954M, the file will be kept 15 day(s) +* for 954M and more, the file will be kept 2 day(s) + +You can also check this information any time you want by pressing the ![](en/lufi03.png?resize=30,24) button in the main interface in Lufi. + +---------- + +# How to upload and download + +To upload a file just choose the options you want (if delete after download or not, and how many days it stays online) and "click to open the file browser" in the centre of the screen, and navigate to your file and select it, or just drag your file to the center of the screen. + +After the upload is complete you will be presented by your browser with the link (URL and encryption key) of the uploaded file, copy it to somewhere else. + +You will also get the deletion link which permits you to delete the uploaded file from the server at any time you want. + +![](en/lufi1.gif) + +To download the file just use the link in the browser: + +![](en/lufi2.gif) + + + +---------- + + +# How to share a file + +Well this is also very simple, you can either: + +* copy the link manually to your email or a text file, or any other option + +* send it directly by email from Lufi + +For the last option (if you have an email client in your machine e.g Thunderbird, Evolution, etc.), just click the ![](lufi04.png?resize=200,30) button, after your file is successfully uploaded. Write the email address and text, and press ![](lufi05.png?resize=280,30). You email client will pop-up with the email ready to send. + +![](en/lufi3.gif) + +**The option** ![](en/lufi06.png?resize=180,25) **should not be used as a matter of principle.** + +The reason is, if you use this option the link is sent using an email of your Lufi provider, not your personal email. Which means the administrators of that Lufi instance can see the full link, and thus are able to download it, and decrypt it if they want to. + +In this case disroot is a privacy conscious provider, but as a matter of principle you should avoid it. + + + +---------- + +# How manage/delete your uploads + +You can manage your uploads by pressing the button ![](en/lufi07.png?resize=60,40) in the main panel. + +There you will see all your uploads and you can: + +* See the download links of all your uploads +* See which ones where set to delete after the first download +* Choose which uploads you want to delete from the server + + This list of uploads is kept locally in your browser in a .json file. Which leaves a record in your browser of the files you uploaded. Thus, you will not be able to see the list of your uploaded files when using different browser or different computer. + +If you want, in this panel you can also: + +* Purge the this information from your browser local storage (it will wipe the information of the uploaded files and their links from your browser, but it wont delete the files from the server, and link is still valid) + +* Export to your computer the json file with these information + +* Import to your browser local storage a json file with information about uploads and links + +![](en/lufi4.gif) + +Another way to delete a file from the server any time you want is to use the deletion link, provided when you first upload the file. Copy it and keep it in a text file for whenever you want to use it. +To use it just put it in your browser and press enter. + +![](en/lufi08.png) + +If you delete a file or the expiration date that was set passed, anyone trying to download the file will see a message like this: + +![](en/lufi09.png) diff --git a/pages/09.Lufi/en/lufi01.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi01.png similarity index 100% rename from pages/09.Lufi/en/lufi01.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi01.png diff --git a/pages/09.Lufi/en/lufi02.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi02.png similarity index 100% rename from pages/09.Lufi/en/lufi02.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi02.png diff --git a/pages/09.Lufi/en/lufi03.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi03.png similarity index 100% rename from pages/09.Lufi/en/lufi03.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi03.png diff --git a/pages/09.Lufi/en/lufi04.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi04.png similarity index 100% rename from pages/09.Lufi/en/lufi04.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi04.png diff --git a/pages/09.Lufi/en/lufi05.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi05.png similarity index 100% rename from pages/09.Lufi/en/lufi05.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi05.png diff --git a/pages/09.Lufi/en/lufi06.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi06.png similarity index 100% rename from pages/09.Lufi/en/lufi06.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi06.png diff --git a/pages/09.Lufi/en/lufi07.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi07.png similarity index 100% rename from pages/09.Lufi/en/lufi07.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi07.png diff --git a/pages/09.Lufi/en/lufi08.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi08.png similarity index 100% rename from pages/09.Lufi/en/lufi08.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi08.png diff --git a/pages/09.Lufi/en/lufi09.png b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi09.png similarity index 100% rename from pages/09.Lufi/en/lufi09.png rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi09.png diff --git a/pages/09.Lufi/en/lufi1.gif b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi1.gif similarity index 100% rename from pages/09.Lufi/en/lufi1.gif rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi1.gif diff --git a/pages/09.Lufi/en/lufi2.gif b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi2.gif similarity index 100% rename from pages/09.Lufi/en/lufi2.gif rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi2.gif diff --git a/pages/09.Lufi/en/lufi3.gif b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi3.gif similarity index 100% rename from pages/09.Lufi/en/lufi3.gif rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi3.gif diff --git a/pages/09.Lufi/en/lufi4.gif b/pages/06.Projects_Office/06.Lufi/01.How2/en/lufi4.gif similarity index 100% rename from pages/09.Lufi/en/lufi4.gif rename to pages/06.Projects_Office/06.Lufi/01.How2/en/lufi4.gif diff --git a/pages/06.Projects_Office/06.Lufi/docs.en.md b/pages/06.Projects_Office/06.Lufi/docs.en.md new file mode 100755 index 00000000..69117f1f --- /dev/null +++ b/pages/06.Projects_Office/06.Lufi/docs.en.md @@ -0,0 +1,30 @@ +--- +title: 'Upload: Lufi' +page-toc: + active: true +published: true +visible: true +taxonomy: + category: + - docs +--- +|![](/start/icons/lufi.png)| +|:--:| +|Lufi is an open-source online software to upload and share files in a secure and private way with other people, as an alternative to services such as wetransfer.| + +Lufi works in a zero knowledge logic. + +Meaning the files are encrypted before they leave your computer, so that your Internet Service Provider and "the administrator of disroot" can not see the file's content. The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc). + +**You "don't need to register yourself to upload files".** + +Amongst other things you can use it to: + + - Store (temporarily) files online, download them, share them with other people + - Send someone files that will delete themselves from the server after the first download + +In this tutorial we'll show you how to use it. You can access Uploads/Lufi at [upload.disroot.org](https://upload.disroot.org) + +|![](en/note.png) **Note**| +|:--:| +|Lufi is not a cloud service (files are only stored online for a certain time, after that they are deleted). For cloud services you have your [cloud](https//:cloud.disroot.org) provided by Disroot.

It's different from [PrivateBin](projects_office/bin/privatebin). Pastebin can only share text, while Lufi can be used to share and download any type of file.| diff --git a/pages/09.Lufi/docs.es.md b/pages/06.Projects_Office/06.Lufi/docs.es.md similarity index 100% rename from pages/09.Lufi/docs.es.md rename to pages/06.Projects_Office/06.Lufi/docs.es.md diff --git a/pages/09.Lufi/docs.fr.md b/pages/06.Projects_Office/06.Lufi/docs.fr.md similarity index 100% rename from pages/09.Lufi/docs.fr.md rename to pages/06.Projects_Office/06.Lufi/docs.fr.md diff --git a/pages/09.Lufi/docs.pt.md b/pages/06.Projects_Office/06.Lufi/docs.pt.md similarity index 100% rename from pages/09.Lufi/docs.pt.md rename to pages/06.Projects_Office/06.Lufi/docs.pt.md diff --git a/pages/06.Projects_Office/06.Lufi/en/note.png b/pages/06.Projects_Office/06.Lufi/en/note.png new file mode 100644 index 00000000..e4ba6a4e Binary files /dev/null and b/pages/06.Projects_Office/06.Lufi/en/note.png differ diff --git a/pages/06.Projects_Office/07.DisApp/docs.en.md b/pages/06.Projects_Office/07.DisApp/docs.en.md new file mode 100644 index 00000000..1e2e627a --- /dev/null +++ b/pages/06.Projects_Office/07.DisApp/docs.en.md @@ -0,0 +1,17 @@ +--- +title: DisApp +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# The Disroot's Community application +|![](/start/icons/disapp.png)| +|:--:| +|***One App to rule them all***| +
+Disrooter Massimiliano saw the potential of a Disroot app and decided to take the challenge with an unexpected approach. He developed the Disroot "Swiss army knife" app that helps and guides disrooters to recommended apps, tips and tutorials on how to set everything up. The app will pick the best (in our opinion) app for email, chat, etc, and for those services that don't have a dedicated app it will open them in the webview window. The app also provides directions to all community tutorials we've gathered over the years to help people use provided services.
+The app is available from the one and only truly Free/Libre Android store: [here](https://f-droid.org/en/packages/org.disroot.disrootapp/). diff --git a/pages/06.Projects_Office/docs.en.md b/pages/06.Projects_Office/docs.en.md new file mode 100644 index 00000000..8cba534b --- /dev/null +++ b/pages/06.Projects_Office/docs.en.md @@ -0,0 +1,21 @@ +--- +title: Collaboratory +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# Collaborative tools + +Here's a bunch of collaborative web tools you may want to give them a try. + +|Project Board|Pads|Bin|Polls|File Sharing| +|:--:|:--:|:--:|:--:|:--:| +|[Taiga](taiga)|**WEB**:
01.[Etherpad](pads/etherpad)
02.[Ethercalc](pads/ethercalc)

**MOBILE**:
[Padland](padland)|[PrivateBin](bin)|[Polls](polls)|[Upload](lufi)| + +|[**DisApp**](disapp)| +|:--:| +|The Disroot app that gather all this tools and other Disroot services| diff --git a/pages/07.Glossary/docs.en.md b/pages/07.Glossary/docs.en.md new file mode 100644 index 00000000..e3d4740c --- /dev/null +++ b/pages/07.Glossary/docs.en.md @@ -0,0 +1,11 @@ +--- +title: Glossary +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +## Under construction diff --git a/pages/07.Polls/docs.en.md b/pages/07.Polls/docs.en.md deleted file mode 100755 index 70360efc..00000000 --- a/pages/07.Polls/docs.en.md +++ /dev/null @@ -1,106 +0,0 @@ ---- -title: Polls -page-toc: - active: true -published: true -taxonomy: - category: - - docs ---- - -Disroot polls is an online service for appointment planning and decision making. -No registration is required. You can use it even if you don't have a disroot account. - -This service is made possible thanks to [Framadate](https://framadate.org/). - -In this tutorial we will show you how to work with disroot polls. - ----------- - -# How to create a poll - -Creating a poll is very easy, just go to [poll.disroot.org](https://poll.disroot.org/). You can choose the language of your poll in the upper right corner, and choose if you want a standard poll, or a poll to schedule an event/appointment. - -![](en/polls1.png) - -The main differences between "Schedule an event" and "Make a standard poll" are: - -* **Schedule an event**, like the name suggests is better suited to schedule meetings, actions, because it permits to set the proposals with multiple dates and times. - -* **Standard poll** is better suited do surveys. *If you want to do a poll about an event that spans over several days (with no options on starting hour), Standard Poll is also better suited.* - -Once you choose which type of poll you prefer, the first step in making a poll is common to both, in the first page you need to fill: - -* Your name (which will be publicly shown as the creator of the poll, choose whatever name you like) -* Poll title -* Description - -And pressing in the button "Optional Parameters" ![](en/polls07.png?resize=40,18) - -You can chose the following options: - -* Poll link (personalized URL, for example: polls.disroot.org/big-decision) -* Password (to restrict the access to the poll) -* All voters can modify any vote -* Voters can modify their vote themselves -* Votes cannot be modified -* Only the poll maker can see the poll results - -After that continue to step 2, by pressing the green button on the bottom of the page. - -![](en/polls2.gif) - -In step 2 you will have to set the choices in either your "Standard poll" or your "Schedule an event" poll. - -## Set choices in Standard Poll -You can choose the number of choices you want by using the + and - buttons ![](en/polls2.png?resize=40,18), and fill the text you want. Once you are done press next, select the expiration date of your poll, and press "create poll" - -![](en/polls3.gif) - -![](en/polls4.gif) - -You can also add pictures and links to the options you create, but in the case of pictures they need to be uploaded elsewhere and you need URL link to them: - -![](en/polls5.gif) - -## Set choices in "Schedule an event" -You can choose the number of choices you want by using the + and - buttons ![](en/polls2.png?resize=40,18) Select the dates in each choice and the times. Once you are done press next, select the expiration date of your poll and press "create poll". - -![](en/polls6.gif) - ----------- - -# Share your poll - -Once your poll is created you will see in the left side of the screen the public link to the poll, just copy it and send it to people you want to participate in the poll. - -![](en/polls7.gif) - ----------- -# Administer your poll -To administer your poll after it was created you need the "Admin link for the poll", which you can see and copy on the center part of the screen. **(don't lose it or else you wont be able to enter the admin panel)** - -![](en/polls3.png) - -With this admin link you can return to this page whenever you want and edit the options of the poll. - -# Check the results of the poll -Just press the "Display the chart of the results" or export it to a .csv file - -![](en/polls8.gif) - ----------- - -# Participate in the poll - - -* Write your name (or whatever name you want) -* Select in each choice one of three options; yes ![](en/polls4.png?resize=32,22), If need be ![](en/polls5.png?resize=31,20), and no ![](en/polls6.png?resize=32,21) -* And press save at the end - -## Using the comment section -Users of the poll can use the "comment section" in the bottom of the poll page to send messages to each other. - -![](en/polls9.gif) - -Users can see the results of the poll (if that option was enabled by the creator of the poll) beneath the list of people that voted, or by pressing the Display the Chart of the results. diff --git a/pages/08.Contribute/01.git/how-to-use-git/docs.en.md b/pages/08.Contribute/01.git/how-to-use-git/docs.en.md new file mode 100755 index 00000000..ddff85fa --- /dev/null +++ b/pages/08.Contribute/01.git/how-to-use-git/docs.en.md @@ -0,0 +1,105 @@ +--- +title: Contribute: Git +published: true +visible: true +taxonomy: + category: + - docs +--- + +This article will try to explain the basics of using git to contribute to translations as well as submitting new tutorials. + +In order to follow all the changes and work with multiple people at the same time, we have chosen to use **git** as our version control system. Git is very popular tool among developers and system administrators but it's features can be easily applicable everywhere where history of changes and ability to submit content and collaborate in a group is required. + + +In this tutorial we will not cover all the aspects of using git. It's very complex and powerfull tool with tons of in-depth tutorials and books written about it. What we are aiming at is providing a short and easy way to contribute to tutorials and translations. + +# How to Create account on git instance +First of you need an account on the git instance used by disroot.org. Unfortunately git is not yet a federated service so you need to have a account. Thanks to our friends at **FOSS Community India** we host all our work on their gitlab instance. +To create an account just go over to https://git.fosscommunity.in and register. Additionally to registering new account you can choose to use one of the ID providers such as gitlab.com, github, twitter, gitbucket, google given you have already an account on one of those platforms. + +# Installing Git +Since all the modifications will happen on your local machine, you need to [install git](https://gist.github.com/derhuerst/1b15ff4652a867391f03) to be able to send your changes as well as sync changes of others. Depending on your platform the ways to install git may vary so check the link above or refer to your platform specific documentation. + +# Installing Atom editor +If you haven't yet, it's time to install [Atom](https://atom.io). Atom is a feature rich text editor with special git integration. If your Operating system is not automatically detected or listed when going to [Atoms](https://atom.io) website, check [Other platforms](https://github.com/atom/atom/releases/latest). For all Arch users, you can simply install it using `pacman -S atom` or other package manager of your choice. + +# Cloning repository +Git is created with collaboration in it's core. First thing we need to do is get a copy of all files within the project (git repository) onto your local harddrive. All modifications are done on your local machine (you work offline). Only when you decide, the changes (new tutorial, translation) are finished you can decide to sent/sync (push) them back to the repository on the server. + +The easiest way to clone the repository is opening your terminal, navigating to the directory you would like to clone the repository to, and run `git clone ` command, where ** is basically the address of the repository you want to clone. In our case it would be: + +`git clone https://git.fosscommunity.in/disroot/howto` + +Once the repository is copied to your harddrive you will see a `howto` directory that consists all the file you could previously browse in your webbrowser when on our repository's url. + +You can move that directory later to any place on your harddrive you wish. + +# Request access to howto git repository +In order to be able to commit changes to disroots git repository, you need to request access. Once admins grant you the access, you can push your changes to the server (note that you can start working without access granted as all the changes happen on your local computer). + +![](en/git-request_access.png) + +# Now the work can begin. +Now you can start Atom and `Open Folder` that you just cloned (*howto*). The interface of Atom is clean and easy to understand. The left sidebar is your project's navigation tree, the middle window is where you edit files and bottom bar indicates number of changed files, current branch, quick pull/push to git. + +![](en/atom1.png) + +You can open and work on multiple files in tabs or as split screen side by side. +Unsaved files with local modifications are marked with a blue dot (depending on the theme you use of course) +To save the file changes use the *File* menu or *Ctrl+s* shortcut. + +**But** before you start working on files you need to create your own: **branch** + +# Git Branches +Branches are basically your own private workspaces. Each git project has it's own **master** branch. Master branch is the main, *production* copy of the project. This branch is automatically synced with the website, so any change made to that branch are instantly visible on the website. That is also why adding any changes to the **master** branch is restricted only to the owners of the project. +In order for you to start working is, create your own branch. This will basically make a clone of the **master** branch. + +![](en/atom-branch1.gif) + +Switching between branches can also be done from that menu. Current working branch is visible on the bottom bar. + +![](en/atom-branch2.gif) + +Once branch is created and changed, you can create new files, modify existing ones etc. + +# Commiting your changes +Hokay, so you're working on your computer creating new tutorials or translating existing ones. Apart from saving changes to your laptop, you can/should also commit your changes. Commiting changes syncs the work you've done on your branch to the git server. If the branch does not exist on the server, it will be created and all your modifications and new files will be uploaded to the server. In that case you can work on your files on multiple machines, or other people can take over, help working on your branch. + +To commit your changes need to: + - make sure all files are saved + - stage all the files you've modified and want to commit to the server + - Write a commit message - write short summary of what has been changed (not too long), + - Hit commit button + ![]() + Once files are commited, it's time to push them to the server: + - Open push/pull popup window + - Press push + +# Merge request +Once you think your work is finished and ready to be published on the website, its time to merge it to the **master branch**. + +- First of course you need to make sure all the changes are commited. +- Login to https://git.fosscommunity.in +- if you pushed any changes to the server on your branch, in the top right you will see **"Create Merge Request"** button +- This will open Merge request form. +- Add title +- Add descripton +- make sure **source branch** is the one you want to merge from (one you worked on) +- make sure **target branch** is the one you want to merge to (usually master branch) + +![](en/git-merge_request.gif) + +Once you created merge request, it will be reviewed by Disroot admins. Admins can then aprove your commit which means it will be merged with the master branch and therefor visible on the website or request you to correct something. Once all the corrections are made and Disroot *"overlords"* are satified, your merge request will be pulled to the master. + +# Pulling changes from the server +If you want to keep the local **master** branch and your local branch up to date, you need to pull changes from the server. Each time someones gets his merge request pulled in to the master, everyone should also pull the changes to their local branches. Then you can easily see what's new and what has changed recently. On the master branch we keep a file called "CHANGELOG" where we note all significant changes to Howtos. +Pulling should be done on regular basis (specially before you start working on new branch). + + - Open push / pull popup window + - Press **pull** + + +# Some vocabulary and explanation + +**git repository** - Directory that consists all the files belonging to the project diff --git a/pages/11.Contribute/how-to-use-git/docs.es.md b/pages/08.Contribute/01.git/how-to-use-git/docs.es.md similarity index 100% rename from pages/11.Contribute/how-to-use-git/docs.es.md rename to pages/08.Contribute/01.git/how-to-use-git/docs.es.md diff --git a/pages/11.Contribute/how-to-use-git/docs.fr.md b/pages/08.Contribute/01.git/how-to-use-git/docs.fr.md similarity index 100% rename from pages/11.Contribute/how-to-use-git/docs.fr.md rename to pages/08.Contribute/01.git/how-to-use-git/docs.fr.md diff --git a/pages/11.Contribute/how-to-use-git/docs.pt.md b/pages/08.Contribute/01.git/how-to-use-git/docs.pt.md similarity index 100% rename from pages/11.Contribute/how-to-use-git/docs.pt.md rename to pages/08.Contribute/01.git/how-to-use-git/docs.pt.md diff --git a/pages/11.Contribute/how-to-use-git/en/atom-branch1.gif b/pages/08.Contribute/01.git/how-to-use-git/en/atom-branch1.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom-branch1.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/atom-branch1.gif diff --git a/pages/11.Contribute/how-to-use-git/en/atom-branch2.gif b/pages/08.Contribute/01.git/how-to-use-git/en/atom-branch2.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom-branch2.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/atom-branch2.gif diff --git a/pages/11.Contribute/how-to-use-git/en/atom-commit.gif b/pages/08.Contribute/01.git/how-to-use-git/en/atom-commit.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom-commit.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/atom-commit.gif diff --git a/pages/11.Contribute/how-to-use-git/en/atom-pull.gif b/pages/08.Contribute/01.git/how-to-use-git/en/atom-pull.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom-pull.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/atom-pull.gif diff --git a/pages/11.Contribute/how-to-use-git/en/atom-pull_push.png b/pages/08.Contribute/01.git/how-to-use-git/en/atom-pull_push.png similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom-pull_push.png rename to pages/08.Contribute/01.git/how-to-use-git/en/atom-pull_push.png diff --git a/pages/11.Contribute/how-to-use-git/en/atom-push.gif b/pages/08.Contribute/01.git/how-to-use-git/en/atom-push.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom-push.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/atom-push.gif diff --git a/pages/11.Contribute/how-to-use-git/en/atom1.png b/pages/08.Contribute/01.git/how-to-use-git/en/atom1.png similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom1.png rename to pages/08.Contribute/01.git/how-to-use-git/en/atom1.png diff --git a/pages/11.Contribute/how-to-use-git/en/atom_interface1.png b/pages/08.Contribute/01.git/how-to-use-git/en/atom_interface1.png similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/atom_interface1.png rename to pages/08.Contribute/01.git/how-to-use-git/en/atom_interface1.png diff --git a/pages/11.Contribute/how-to-use-git/en/git-merge_request.gif b/pages/08.Contribute/01.git/how-to-use-git/en/git-merge_request.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/git-merge_request.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/git-merge_request.gif diff --git a/pages/11.Contribute/how-to-use-git/en/git-request_access.png b/pages/08.Contribute/01.git/how-to-use-git/en/git-request_access.png similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/git-request_access.png rename to pages/08.Contribute/01.git/how-to-use-git/en/git-request_access.png diff --git a/pages/11.Contribute/how-to-use-git/en/howto-duplicate1.gif b/pages/08.Contribute/01.git/how-to-use-git/en/howto-duplicate1.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/howto-duplicate1.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/howto-duplicate1.gif diff --git a/pages/11.Contribute/how-to-use-git/en/howto-fork.gif b/pages/08.Contribute/01.git/how-to-use-git/en/howto-fork.gif similarity index 100% rename from pages/11.Contribute/how-to-use-git/en/howto-fork.gif rename to pages/08.Contribute/01.git/how-to-use-git/en/howto-fork.gif diff --git a/pages/11.Contribute/contribute.png b/pages/08.Contribute/contribute.png similarity index 100% rename from pages/11.Contribute/contribute.png rename to pages/08.Contribute/contribute.png diff --git a/pages/08.Contribute/docs.en.md b/pages/08.Contribute/docs.en.md new file mode 100755 index 00000000..9fa87fda --- /dev/null +++ b/pages/08.Contribute/docs.en.md @@ -0,0 +1,22 @@ +--- +title: How2 Contribute +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +We think that knowledge is a collective construction. In other words, knowledge is the result of working together and cooperatively, as a community. + +Disroot platform cost money besides our most precious value: time. While the costs of maintaining all the services working on started being covered a few months ago thanks to donations, documentation requires time. +*"A lot of precious time..."* + +For those users who may want to contribute to Disroot by donating their time and knowhow, we've tried to channel all the efforts through this section. +Here you'll find basic information and guidelines for different ways to contribute, from feedback to write a how-to or translate them to your language. + +Thanks to all of you who support and collaborate with Disroot. + + +![](contribute.png) diff --git a/pages/11.Contribute/docs.es.md b/pages/08.Contribute/docs.es.md similarity index 100% rename from pages/11.Contribute/docs.es.md rename to pages/08.Contribute/docs.es.md diff --git a/pages/11.Contribute/docs.fr.md b/pages/08.Contribute/docs.fr.md similarity index 100% rename from pages/11.Contribute/docs.fr.md rename to pages/08.Contribute/docs.fr.md diff --git a/pages/11.Contribute/docs.pt.md b/pages/08.Contribute/docs.pt.md similarity index 100% rename from pages/11.Contribute/docs.pt.md rename to pages/08.Contribute/docs.pt.md diff --git a/pages/08.Forum/01.basic-usage/docs.en.md b/pages/08.Forum/01.basic-usage/docs.en.md deleted file mode 100755 index c0181849..00000000 --- a/pages/08.Forum/01.basic-usage/docs.en.md +++ /dev/null @@ -1,151 +0,0 @@ ---- -title: Discourse - Basic usage -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - -The Discourse forum provides a simple and intuitive user interface. Even if you are using Discourse primarily as a mailing list, it is recommended to check the web-interface for a superior user experience. Here are some tips to get you started: - - ----------- - - -# Log in first -You can log in to the forum with your Discourse account or your All-in-one Disroot account, if you have one. -Go to https://forum.disroot.org/ and click ![](en/forum_basics1.png?resize=64,25) on the top right corner. -**If you have a Disroot account make sure to select Login with disroot account before entering your credentials.** - -If you don't have an account yet, you can register a Disroot account via https://user.disroot.org, which will give you additionaly access to cloud storage, email, xmpp and project board. You can also decide to create a forum only account - you will find the Sign up button at the top right of the forum page. - -# The menu -The icon buttons on the top right include the search and your personal settings: - -![](en/forum_basics2.png) - -Click on your user icon (the first letter of your name until you change your avatar) to see your messages and notifications and to enter your personal setting and see your user page. - -The little numbers on top of your avatar mark how many notifications (on the right) and messages (left) you have. When you click on your avatar you will see all unread notification and messages listed below. You can also access all you messages via the ![](en/forum_basics3.png?resize=30,25) icon. - -Click on your avatar and then on the ![](en/forum_basics4.png?resize=23,24) to enter your personal settings. There you can change you avatar, adjust the level of notifications, your viewed categories and much more. - -# Navigation -When you first log in to the forum (or click ![](en/forum_basics5.png?resize=100,20) icon to get back to home page at any time), you will find a list of the categories you are following. Categories are like sub-forums. If you are a member of a private forum group, the categories of that group will be listed first and all public categories will be listed below. More on how to follow and hide certain categories will be posted soon in another tutorial. - -~[](en/forum_basics6.png) - -The bar on top allows you to quickly navigate between latest, new, unread and most active posts. You can also filter which categories you wish to view under the ![](en/forum_basics7.png?resize=133,30) button. -On the far right you find a tab button for starting a new discussion thread (topic). - -The latest topics are also listed in your home page, right of the categories. Any topic title you select to view will take you to the next unread post. - -# Keep scrolling - -Once you are in the topic thread you can scroll down to read through. There are no next page buttons or page numbers – to read more, just keep scrolling down! - -As new posts come in, they will appear automatically. - -# Replying to posts - -To reply to the overall topic, use the ![](en/forum_basics8.png?resize=80,29) button at the very bottom of the page. - -To reply to a specific post within the thread, use the ![](en/forum_basics9.png?resize=82,30) button on that post. - -To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes! - -To notify someone about your reply, mention their name. Type @ to begin selecting a username. - -You can also like, share, flag or bookmark a post. - -![](en/forum_basics1.gif) - - -# Creating a new topic -You can create a new topic in a category (Howtos, support, changelog, etc) by either navigating to the category and then pressing the new topic button ![](en/forum_basics10.png?resize=121,26), or by just pressing the button and in the compose topic/message panel select the category it goes to. Topics need to have a minimum of 8 letters in the subject and 10 letters in the topic, otherwise the message won't be sent. - -![](en/forum_basics2.gif) - -# The interface -The interface is relatively simple. - -![](en/forum_basics11.png) - -Discourse supports Markdown and HTML to compose messages, on the left side of the panel you write your topic, and on the right side you can preview how the topic will be presented. - -![](en/forum_basics3.gif) - -But you don't need to learn Markdown or HTML to write a topic, you can just use the formatting options presented in the top bar, Blockquote **Strong**, **Emphasis**, **Bulleted List**, **Numbered List**, **Heading**, **Horizontal Rule**, **Emojis**. Commands like CTRL+b or CTRL+I also work. - -![](en/forum_basics4.gif) - -## Inserting pictures and videos -You can insert pictures into your topic by dragging them to the message to the part where you want them to be. - -![](en/forum_basics5.gif) - -To insert a video it's the same process. - -## Uploading files to your topic -You can upload files by pressing the upload button and then browsing until you reach and select the file you want. - -![](en/forum_basics6.gif) - -## Moving files, pictures and videos from one place to another in the message -File, pictures, and videos will be presented on the left side of the screen (where all the code is) like this: - -**Files** -> < a class="attachment" href="/uploads/default/original/1X/ffd8f38b235dbf199a919f0187ae63a183d22ada.odt">hello world.odt (8.0 KB) - -**Pictures** -> < img src="/uploads/default/original/1X/019a9706a4676128e452b81f450851353f36175c.png" width="690" height="347"> - -**Videos** ->https ://forum.disroot.org/uploads/default/original/1X/59b17ec97a8daabcb96a787b4900f3d3221083da.mp4 - -To move them just cut the line and paste it where you want it. Also in the case of pictures you can adjust their size by changing the values for "height" and "width" in the line. - -## Adding tags to your topic -Adding a tag makes it easier for people looking for topics or threads about a certain subject. Adding them is super easy. - -![](en/forum_basics7.gif) - -Once your done with composing your topic just press "Create Topic" ![](en/forum_basics14.png) - -# How to mute or watch categories -In Discourse it's possible for you regulate the stream of posts you receive via the forum board or via email. You can mute categories or just a sub-category you are not interested or set categories to watch which will guarantee you will always receive notifications and emails of every post in a category or sub-category you are interested in. - -If you just mute a category you will be muting all sub-categories, unless you select a specific sub-category to watch. If you mute a category or sub-category you will still be able to access it in the message board, if you want to check it from time to time. You simply just don't receive any emails or notifications about it. - -The current categories and sub-categories in the Disroot Forum are: - -* disroot - * disroot-Changelog - * support - * feature - * main - * FAQ -* Open Talks -* TOFU -* Engineering Yuvasamithi - -The best way to watch/mute categories is in your preferences, from there you can set all your mute and watch preferences from one single place. - -![](en/forum_basics12.png) - -Just scroll down to **Categories** , you will see the **fields** for **Mute** and **Watched**, write the categories you want in each and in the end **save your settings** for them to take effect. - -![](en/forum_basics8.gif) - -The other method is to navigate to each category or sub-category one by one and do it from there, by pressing the button that is to right of "new topic" ![](en/forum_basics13.png?resize=50,25) - -![](en/forum_basics9.gif) - ----------- - - - - You can find more tips at [Discourse's welcome message](https://forum.disroot.org/t/welcome-to-discourse) diff --git a/pages/08.Forum/docs.en.md b/pages/08.Forum/docs.en.md deleted file mode 100755 index 3735e09a..00000000 --- a/pages/08.Forum/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: 'Discourse - Forum' -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/09.Licensing/docs.en.md b/pages/09.Licensing/docs.en.md new file mode 100644 index 00000000..bdd9025b --- /dev/null +++ b/pages/09.Licensing/docs.en.md @@ -0,0 +1,33 @@ +--- +title: How2: License +published: true +taxonomy: + category: + - docs +page-toc: + active: false +--- + +# Licensing of the tutorials +|![](en/copyleft.png)| +|:--:| +|All How2 site documentation is under a
Creative Commons Attribution-ShareAlike 4.0 International License
Creative Commons License| +
+ +We think that knowledge should be shared and, because of that, we've decided to make all the documents at Disroot How2 available to be used by others and improved or adapted to their needs.
+We also think that the documentation we write on this page about how to use our services might be useful for other Free and Open Source Software service providers and/or individuals that use the same software and/or share the same ethicals choices as Disroot. + +By using a Creative Commons license we make it publicly clear that all documentation (how-to's) published at [howto.disroot.org](https://howto.disroot.org) are free to adapt, improve, distribute and/or share the adaptations. + +**Therefore, we ask to all those people that wish to contribute with a new tutorial to our [How2](https://howto.disroot.org) page, that accept to release it under the Creative Commons License BY-SA.** + +The **Creative Commons BY-SA**, allows anyone to modify and share a tutorial freely as long as the publishing conditions are in accordance with the following: +- Recognition of adaptation and references to the original work and/or author. +- Share the modified version with the same license (BY-SA), allowing others to share and modify the work too. + + +You can read more about **Copyleft** concept [here](https://en.wikipedia.org/wiki/Copyleft). + +And more about the **Creative Commons licenses** [here](https://creativecommons.org/). + +----- diff --git a/pages/09.Licensing/en/copyleft.png b/pages/09.Licensing/en/copyleft.png new file mode 100644 index 00000000..c1447f24 Binary files /dev/null and b/pages/09.Licensing/en/copyleft.png differ diff --git a/pages/09.Lufi/docs.en.md b/pages/09.Lufi/docs.en.md deleted file mode 100755 index 14c6f240..00000000 --- a/pages/09.Lufi/docs.en.md +++ /dev/null @@ -1,169 +0,0 @@ ---- -title: 'Using Lufi' -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - -Disroot provides Lufi, an open-source online software to upload and share files in a secure and private way with other people, as an alternative to services such as wetransfer. - -Lufi works in a zero knowledge logic. - -Meaning the files are encrypted before they leave your computer, so that your Internet Service Provider and "the administrator of disroot" can not see the file's content. The administrator can only see the file's name, its size and its mimetype (what kind of file it is: video, text, etc). - -**You "don't need to register yourself to upload files".** - -Amongst other things you can use it to: - - - Store (temporarily) files online, download them, share them with other people - - Send someone files that will delete themselves from the server after the first download - -In this tutorial we'll show you how to use it. You can access Uploads/Lufi at [upload.disroot.org](https://upload.disroot.org) - -Notes: - -- Lufi is not a cloud service (files are only stored online for a certain time, after that they are deleted). For cloud services you have your [cloud](https//:cloud.disroot.org) provided by disroot. -- It's different from PrivateBin. Bin can only share text, while Lufi can be used to share and download any type of file. - ----------- - -# How safe is Lufi and how it works - -When you use Lufi to upload files, "All the files are encrypted by your the browser! It means that your files never leave your computer unencrypted. The administrator of the Lufi instance you use will not be able to see what is in your file, neither will your network administrator, or your ISP". - -When someone downloads your file, it is decrypted locally in that person's browser after the download. Meaning, the network administrator, or the ISP will not be able to see what's in the downloaded file. - -You can read more about it [here](https://git.framasoft.org/luc/lufi). - -The whole encryption/decryption process is done automatically by the browsers, so no need of manually encrypt the files before, or manually decrypt at the download. - -The encryption key (the thing that permits whomever downloads the file to decrypt it) is a part of the link that is presented to you by your browser after you have uploaded a file. - -It's an anchor (Cf. Fragment Identifier). That means this part (the encryption key) is only processed client-side (in your computer) and does not reach the server of your Lufi provider, so they cannot decrypt the file. - -**Only persons that have the full link will be able to download and decrypt the file.** - -For example this is a link to a file in upload.disroot.org: - -[https://upload.disroot.org/r/FA7MHOOL#AgsmqnJEyUZAcybZmOGKljqYRtDhJKsvZC/Qt05N8dE=](https://upload.disroot.org/r/FA7MHOOL#AgsmqnJEyUZAcybZmOGKljqYRtDhJKsvZC/Qt05N8dE=) - -It has two components: - -* Left of the **#** symbol in the link is the URL to the file: -"https://upload.disroot.org/r/FA7MHOOL" - -* Right of the **#** symbol in the link is the encryption key of the file: -"#AgsmqnJEyUZAcybZmOGKljqYRtDhJKsvZC/Qt05N8dE=" - - -If you try to use just, [https://upload.disroot.org/r/FA7MHOOL](https://upload.disroot.org/r/FA7MHOOL) -Without the second part you will get this message: - -![](en/lufi01.png) - - - ----------- -# The Interface - -The interface is pretty straightforward, when you upload a file you have the following options: - -* Choose how many days it stays online. **The maximum is 60 days, (for smaller files)** -* Choose if you want the file to be deleted after it was downloaded for the first time - -In the upper centre part of the panel you can set the options mentioned above. In the upper right part you have the menu to go "My files" and manage your uploads. The centre is where you upload your files. - -![](en/lufi02.png) - ----------- - -# Maximum file size - -There is no size limit to the files you can upload. But the maximum amount of time that a file stays stored in Lufi varies according to it's size. After that time expired the file is deleted. - -Larger files will be stored for a shorter time. "The expiration delay of your file will be the minimum between what you choose and the following limitations": - -* between 0 and 48M, the file will be kept 60 day(s) -* between 48M and 96M, the file will be kept 30 day(s) -* between 96M and 954M, the file will be kept 15 day(s) -* for 954M and more, the file will be kept 2 day(s) - -You can also check this information any time you want by pressing the ![](en/lufi03.png?resize=30,24) button in the main interface in Lufi. - ----------- - -# How to upload and download - -To upload a file just choose the options you want (if delete after download or not, and how many days it stays online) and "click to open the file browser" in the centre of the screen, and navigate to your file and select it, or just drag your file to the center of the screen. - -After the upload is complete you will be presented by your browser with the link (URL and encryption key) of the uploaded file, copy it to somewhere else. - -You will also get the deletion link which permits you to delete the uploaded file from the server at any time you want. - -![](en/lufi1.gif) - -To download the file just use the link in the browser: - -![](en/lufi2.gif) - - - ----------- - - -# How to share a file - -Well this is also very simple, you can either: - -* copy the link manually to your email or a text file, or any other option - -* send it directly by email from Lufi - -For the last option (if you have an email client in your machine e.g Thunderbird, Evolution, etc.), just click the ![](lufi04.png?resize=200,30) button, after your file is successfully uploaded. Write the email address and text, and press ![](lufi05.png?resize=280,30). You email client will pop-up with the email ready to send. - -![](en/lufi3.gif) - -**The option** ![](en/lufi06.png?resize=180,25) **should not be used as a matter of principle.** - -The reason is, if you use this option the link is sent using an email of your Lufi provider, not your personal email. Which means the administrators of that Lufi instance can see the full link, and thus are able to download it, and decrypt it if they want to. - -In this case disroot is a privacy conscious provider, but as a matter of principle you should avoid it. - - - ----------- - -# How manage/delete your uploads - -You can manage your uploads by pressing the button ![](en/lufi07.png?resize=60,40) in the main panel. - -There you will see all your uploads and you can: - -* See the download links of all your uploads -* See which ones where set to delete after the first download -* Choose which uploads you want to delete from the server - - This list of uploads is kept locally in your browser in a .json file. Which leaves a record in your browser of the files you uploaded. Thus, you will not be able to see the list of your uploaded files when using different browser or different computer. - -If you want, in this panel you can also: - -* Purge the this information from your browser local storage (it will wipe the information of the uploaded files and their links from your browser, but it wont delete the files from the server, and link is still valid) - -* Export to your computer the json file with these information - -* Import to your browser local storage a json file with information about uploads and links - -![](en/lufi4.gif) - -Another way to delete a file from the server any time you want is to use the deletion link, provided when you first upload the file. Copy it and keep it in a text file for whenever you want to use it. -To use it just put it in your browser and press enter. - -![](en/lufi08.png) - -If you delete a file or the expiration date that was set passed, anyone trying to download the file will see a message like this: - -![](en/lufi09.png) diff --git a/pages/10.DisHub/01.Basics/01.User_interface/docs.en.md b/pages/10.DisHub/01.Basics/01.User_interface/docs.en.md deleted file mode 100644 index 81e4505d..00000000 --- a/pages/10.DisHub/01.Basics/01.User_interface/docs.en.md +++ /dev/null @@ -1,49 +0,0 @@ ---- -title: User Interface -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -## User Interface Overview -After logging in, filled out your profile and created a channel, this is, almost for sure, how your channel will look like: - -![basics_interface](en/Basics_interface.png) - -Yes, it doesn’t look much pretty, huh? But, don’t get into a daze, by the end of this overview, you should be able to make your channel looks more like this... - -![basics_interface_improved](en/Basics_interface_improved.png) - -… (or even better) and know where are the most important tools and features, what are they for and what the possibilities of each one of them. And that would be just the beginning. - -Let’s start by knowing the spaces our new home first. Later you could decorated whatever you want. - -For the purpose of this tutorial we will name the parts, or blocks, of the User Interface (UI) in order to identify them later. - -![basics_UI](en/Basics_UI.png)
- -01. **Navigation bar**: From here you access to your personal settings, the menu, the network and public streams, apps, the directory, wikis, the chat, etc. It is very customizable, and it functions like a shortcut and launch applications bar. [To know more about it...](../Navigation_bar) - -02. **Profile section**: Here there’s some basic information about your channel, like your name and hub address. You can add more info if you want. [To know more about it...](../../02.Channels/02.Profiles) - -03. **Share box**: The place where you write and share your thoughts, things you like, your photos, compose articles, etc. By clicking on it the post compositor opens. It’s a very well-suited editor to compose and edit your post or shares. [To know more about it...](../../05.Posts) - -04. **Activity Notifications**: It informs you about what is happening in the network stream, in the public stream and if you received a connection request, a mail, if someone commented a post you’ve created or a post that you’ve been following. We’ll see about it later. - -05. **Connections**: Here you can see some of your connections (those you interact the most) and the common connections you may have with other users while visiting a channel. [To know more about it...](../../03.Connections) - -06. **Channel stream**: It works like the “wall” of most social networks, it’s the place where you see your posts, the comments on them (if they’re enable), the posts you’ve re-shared, and those from the people you’ve give permissions to write on it, the posts of your connections. [To know more about it...](../../05.Posts) - -07. **Right side widgets**: This space can be used not only as a widget section, but almost anything you want to have accessible (information, apps, notes, sites, shortcuts, etc, as we’ll see later) can be setted to appear in this place. - - -**NOTE: On the mobile version, the sidebars are hidden.** If you want to show the left sidebar you have to click on the arrow icon.
- -![MobileLeftBar](en/MobileLeftBar.gif)
- -The right bar is limited to activity notifications only. If you want to see the notifications, click on the exclamation point icon.
- -![MobileLeftBar](en/MobilerightBar.gif)
diff --git a/pages/10.DisHub/01.Basics/02.Navigation_bar/docs.en.md b/pages/10.DisHub/01.Basics/02.Navigation_bar/docs.en.md deleted file mode 100644 index 138f143a..00000000 --- a/pages/10.DisHub/01.Basics/02.Navigation_bar/docs.en.md +++ /dev/null @@ -1,109 +0,0 @@ ---- -title: Navigation Bar -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -# Navigation bar - -Here is the navigation bar: -![Basics_navigation_ bar](en/Basics_navigation_bar.png) - -Here are some of the important icons you need to understand: -1. Profile: ![Profile](en/Basics_profile_icon.png) -2. Home Channel: ![home](en/Icon_home.png) -3. Network stream: ![home](en/Icon_network_stream.png) -4. Public stream: ![home](en/Icon_public_stream.png) -5. Connections: ![home](en/Icon_connections.png) -6. Directory: ![home](en/Icon_directory.png) - -**Note:** On mobile pinned apps are hidden and only accessible through the hamburger menu on the right ![MobileNavigationBar](en/MobileNavigationBar.png) - -![Profile](en/Basics_profile_icon.png) **Profile**: By clicking on it, you access to view and edit your profile, your channel manager, the general settings and to log out. - -## 1. Profile: ![Profile](en/Basics_profile_icon.png) -A profile is a collection of information about yourself so you can have different profiles depending on the data you want to share with different users or groups. For example: your public or default profile (which is always available to the general public and can’t be hidden) is GNU/Linux and FOSS related. You set the permissions and establish connections with those who may share those interests. But if you have your group of friends that don’t care about that much, and you don’t want to bore them with it, you can create a new profile with a new set of permissions called “friends”, that allow its members access only to another kind of information. - -When you click on the profile icon, you have access to different options. - -### View Profiles -Clicking on “View profile” you’ll see your public profile with the information you has submited, such as your name and tags. You can edit this public profile by clicking on the Edit option at the right of the profile title bar. -(See Profiles Settings for more information about configuration) -![basics_profile](en/Basics_profile.png) -[To know more about profiles and the available options...]((../../02.Channels/02.Profiles)) - -### Edit Profiles -Here you can see your default and created profiles if there any or create new ones. -(See Profiles Settings for more information about creating and managing profiles) -[To know more about profiles and the available options...]((../../02.Channels/02.Profiles)) - -### Channel Manager -From here you can manage your channels and create new ones.
-**Note: Channels are different from profiles.**
-**A profile** is a collection of information about yourself so you can have different profiles depending on the data you want to share with different users or groups. For example: your public or default profile (which is always available to the general public and can’t be hidden) is GNU/Linux and FOSS related. You set the permissions and establish connections with those who may share those interests. But if you have your group of friends that don’t care about that much, and you don’t want to bore them with it, you can create a new profile with a new set of permissions called “friends”, that allow its members access only to another kind of information.
-**A channel**, on the other hand, it’s the space on the web that contains collections of content stored in one place, that’s the stream (will see that later). What kind of content? Well, that’s exactly the point of it. You can create different channels for different kinds of content and specifies whose of your contacts or public can see it. In other words, a profile is information about you and a channel is the space where specific information it’s gathered and showed up. - -Click on the **Channel Manager** to access its options. - -![basics_channel_manager](en/Basics_channel_manager.png) - -From here you can create and switch between channels. The process to create a channel it’s the same as when you create your first one. - -[To know more about channels and the available options...](../../02.Channels) - -### Settings -By clicking on it, you will access to the Account, Channel, Features settings and other configurations. - -![basics_settings](en/Basics_settings.png) - -!!! The settings options are on the left sidebar. So if you want to show the options on mobile you have to clikc on the arrow icon in the nav bar. ![ArrowIcon](en/ArrowIcon.png) - -##### Account settings -In the **Account settings** you can change your email address, your password and set Your **technical skill level**. Every level sets different user features according to what you expect or want to do. By default, DisHub skill level is **4. Expert**, in orden to provide most of the features available. - -There are five levels. From level 1 on, each one of them progressively enables Additional features. -0. Beginner/Basic -1. Novice - not skilled but willing to learn -2. Intermediate - somewhat comfortable -3. Advanced - very comfortable -4. Expert - I can write computer code -5. Wizard - I probably know more than you do - -##### Channel settings: -This is one of the most important settings. These howtos will refer to it a lot. -![basics_channel_settings](en/Basics_channel_settings.png) - -## 2. Home Channel: ![home](en/Icon_home.png) -It works like the “wall” of most social networks, it’s the place where you see your posts, the comments on them (if they’re enable), the posts you’ve re-shared, and those from the people you’ve give permissions to write on it. -Everything is already pretty well explained [here](../01.Basics) - -## 3. Network stream: ![home](en/Icon_network_stream.png) -It looks a lot like the **Home Channel**. Except that here, you see not only your posts and comments, but also the posts and comments of your connections, if you allowed them to. - -![Network_stream](en/Network_stream.png) - -You can filter those posts in different ways. -1. You can use the Affinity tool bar  [More info about it](../../07.Features/01.Connection_filtering) -2. You can click on the different tabs. -![Filter_tabs](en/Filter_tabs.png) - -## 4. Public stream: ![home](en/Icon_public_stream.png) -Here, you can see ANYONE posts and comments published in the fediverse, so any Hubzilla, Mastodon, Diaspora, etc., servers. - -![Public_stream](en/Public_stream.png) - -You can filter those posts by clicking on the cloudwords in **Trending**. - -You can also use the **search box** to look for a tag, an user, etc. ![Search_box](en/Search_box.png) - -## 5. Connections: ![home](en/Icon_connections.png) -It allows to see your connections and to edit them [Informations here](../../03.Connections) - -## 6. Directory: ![home](en/Icon_directory.png) -It allows to see and search any channel on hubzilla (not just Dishub). To search a specific channel use the search engine on the upper left side of the directory page - -![Directory](en/Directory.png) diff --git a/pages/10.DisHub/01.Basics/docs.en.md b/pages/10.DisHub/01.Basics/docs.en.md deleted file mode 100644 index a5b2376f..00000000 --- a/pages/10.DisHub/01.Basics/docs.en.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -title: Basics -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -# How to start really quick? -1. Log in https://hub.disroot.org/ using your Disroot credential (**use the Disroot email, not just the username**) -2. Then, you have to **create a channel**. Indeed, you're not really an user on Hubzilla: you're a channel, or even several channels (a person, an organization, a theme, etc). That means that when you first log in with your Disroot account, you have to create a channel. [To create my channel](../channels/creation) -3. You will have to choose a **role for your channel**, that means a set of permissions. **Social - Mostly public** is the most typical one you may want to choose. [To know more about roles and permissions](../permissions) -4. When your new channel is created, you will have to **create a profile** for this channel. You can give as much informations about it as you want. Or as little as you want! You may even create different profiles for a same channel! [To know more about profiles](../channels/profiles) - -**You're done!** - -Now, you can **create post**: -
-![Share_box](en/Share_box.png) - -[To know how](../posts) - -Or you can **add friends** (called *connections* in hubzilla) that you can follow: -
-![Connections](en/Connections.png) - -[To know how](../connections) - - -!!! There is a nice quick howto start [here](https://hub.disroot.org/help/en/tutorials/personal_channel#Create_a_new_channel) diff --git a/pages/10.DisHub/02.Channels/01.Creation/docs.en.md b/pages/10.DisHub/02.Channels/01.Creation/docs.en.md deleted file mode 100644 index 2f380565..00000000 --- a/pages/10.DisHub/02.Channels/01.Creation/docs.en.md +++ /dev/null @@ -1,55 +0,0 @@ ---- -title: 'Creation' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -## How to create my first channel? - -When you log in for the first time after registering, you must create a channel. - -So you will be presented with the "Add a channel" screen. -![channel_create](en/channel_create.png) - -First, you have to **choose a channel role and privacy** (you can change it later though). For example, you can choose **Social, Mostly Public**. According to what you choose, the default permission will change. For example, *Can comment on or like my posts* is public by default for **Social, Federation** and for your connections only in **Social, Mostly public**. - -[See the permission page to understand channel roles better](../../permissions) - -Then, you have to choose a **Name or caption**. Normally, your first channel will be one that represents you - so using your own name (or pseudonym) as the channel name is a good idea. The channel name should be thought of as a title, or brief description of your channel. This is how people with know and find your channel. - -The **choose a short nickname** box is similar to a **username** field. It is used to create a channel address, which other people will use to connect to you, and you will use to log in to other sites. This will look like an email address, and takes the form **nickname@hub.disroot.org**. It is automatically generated according to your **Name and caption**, checking if the username already exists and being transliterated (so that it federates well). Basically you can use only the same characters as email addresses. If the username suggested fits you, click on **Create** to create your channel. - -If you don't like the nickname chosen for you and want to change it, the **Create** button becomes blue and you can't click on it: that means you need to click on **Validate** to check if you can use the username you chose. If that's ok, the **Create** button becomes green and you can click on it to create your channel. -![channel_nickname](en/channel_nickname.gif) - - -After setting your Role, name (real or not) and your nickname, you will be redirected on the profile page of your new channel (or something else if your site admin decided otherwise). - -## How to create another channel? -You can also create an other channel, as you can have as many channels as you want. - -To do so, click on your avatar on the nav bar, and choose **Channel manager**. You then can click on **+ Create New**. -![channel_creation](en/channel_creation.gif) - -## How to switch between channels? -Click on your avatar in the nav bar and select your channel. -![switch_channel](en/avatar_menu.png) - -## How to make one of your channels your default one? -Click on your avatar on the nav bar, and choose **Channel manager**. You then can click on **Make default**. -![channel_default](en/channel_default.png) - -## How to make your channel a "Premium Channel" -Some channels are designated **Premium Channels** and may require some action before a connection can be established with it. The Connect button for these channels will open a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If the channel does not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on interactions with that channel. - -Here is an example of such a message: -![connections_premium_message](en/Connection_premium_message.png) - -To set a premium channel, go to your channel **Settings**, then on the same left side bar select **Premium Channel Settings** -![channel_premium](en/channel_premium.png) -Enable the premium channel restriction, enter your message and click on *Submit*. diff --git a/pages/10.DisHub/02.Channels/02.Profiles/docs.en.md b/pages/10.DisHub/02.Channels/02.Profiles/docs.en.md deleted file mode 100644 index 84f73f3d..00000000 --- a/pages/10.DisHub/02.Channels/02.Profiles/docs.en.md +++ /dev/null @@ -1,152 +0,0 @@ ---- -title: 'Profiles' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -## What is a profile? -You have surely registered with some other internet services, such as forums or online communities. For all of them you provided some information about yourself, such as date of birth, country, age and the likes. Think of your profile as **the basic information about yourself you tell other people**. - -Here is an example of a profile with not much on it -![profile_view](en/Profile_view.png) - -And the same one, but seen from a directory research on "meaz" ! -![profile_view_directory](en/Profile_view_directory.png) - -Unlike other services Hubzilla offers you the **advantage of creating many more profiles**. That means you can decide to use different profiles to show different "sides of yourself" to different audiences. For example, your default public profile might say "Hello, I'm Fred, and I like laughing". You may show your close friends a profile that adds "and I also enjoy dwarf tossing". - -You always have a profile known as your "default" or "public" profile. This profile is always available to the general public and cannot be hidden (there may be rare exceptions on privately run or disconnected sites). You may, and probably should restrict the information you make available on your public profile. - -## How to create my first profile? -After setting your Role, name (real or not) and your nickname, you will be redirected on the profile page of your new channel (or something else if your site admin decided otherwise). - -Click on **Default Profile** if you want to customize your profile. -![Profile page](en/ProfilePage.png) - -From there you are free to complete information about yourself. There are at least two information that are required. There are in the **Personal tab**: -- **Profile name (required)**: it is the name you want to give to the profile. It helps when you have multiple profiles. For example you could call it "Public Profile", "Family Profile", etc. -- **Your full name (required)**: it is the name that will be shown to everyone. - -![Profile edit1](en/EditProfile.png) - -You can change the profile picture (cavatar). From the **Profile Tools** drop-down menu, select **Change profile photo**. - -![Profile edit2](en/EditProfile.gif) - -**Or simply click on your avatar!** - -![Profile_avatar_change](en/Profile_avatar_change.png) - -Upload your photo and size as necessary using the image editor. - -When you press **Done Editing** you will be redirected back to the profile editor (You might need to clear your browser cache if you have trouble seeing the new photo). - -Returning to your channel home page you will see that a post notifying others of your new profile pic has been automatically posted. - -You can also customize the cover photo. From the **Profile Tools** drop-down menu, select **Change cover photo**. - -![Profile edit2](en/EditProfile.gif) - -If you'd like to meet people that share some general interests with you, please take a moment and add some **Keywords** to your profile, such as "music, Linux, photography" or whatever. You can add as many keywords as you like. -To do so click on the **Miscellaneous** tab and add the keywords in **Keywords used in directory listings**. - -![Profile_keywords](en/Profile_keywords.png) - -## How to see my profile? -Click on your avatar in the nav bar and select **View Profile**. -![Profile_edit](en/avatar_menu.png) - - -## How to edit my profile? -You can edit your profile at anytime by clicking on the **pencil icon** next to your avatar image and then choosing the name of the profile you want to edit. - -![Profile](en/Profile.png) - -A better way (because you have more options) is to click on your **avatar** in the nav bar and select **Edit Profiles**. - -![Edit_profile](en/avatar_menu.png) - - -## Have more "Things" on profile -### What is it? -You can add more stuff that was is available on your profile. It is called things. You can for example add what you like, what you want, etc. It allows viewers of your profile to "like" the added items. - -![profile_things](en/Profile_things.png) - -### How to add "things" on my profile? -Go on the **Edit Profile Details"** : click on your **avatar** in the nav bar and select **Edit Profiles**. Choose the profile you want to edit. - -Click on the **Profile tool** and choose **Add profile thing** and complete it the way you want! - -![profile_add_things](en/Profile_add_things.gif) - -**Note**: the option **Post an activity** is activate per default. That means that it will create a post in your channel explaining what you like, want, etc. -![Profile_post_things](en/Profile_post_things.png) -As stated and as you can also see in this post, only the viewers of this profile can see the post (see the lock on the post, next to the avatar) - -### How to modify or delete "things" on my profile? -Go on your **profile** and click on the "thing" you want to remove. - -![profile_things](en/Profile_things.png) - -Click on the pencil to edit, on the trash can to remove it! - -![rofile_remove_things](en/Profile_remove_things.png) - - -## Clone / Export / Import / Delete a profile -### What is it? -Hubzilla gives you the possibility to: -- Create a **clone of an existing profile** if you only wish to change a few items but don't wish to enter all the information again. -- Backup a profile by choosing **Export profile to file**. It will create a .json file that you can save on your computer and import later if needed. -- Import a profile by choosing **Import profile from file**. You can import a .json file that you previously saved on your computer. -- **Delete*** a profile you don't use/want anymore. - - -### How to Clone / Export / Import / Delete a profile? - -The **Profile tools** box that you can find on the **Edit Profile Details** offers to you those additional options. SO you just need to click on what you want to do! - -![profile_tools](en/Profile_tools.png) - - -## How to add a profile? -Go on the **Edit Profile Details"** page: click on your **avatar** in the nav bar and select **Edit Profiles**. Just click on **Create New**. - -![Profile page](en/ProfilePage.png) - -**Note**: Multiple profiles are enabled and locked in the enabled state by default for DisHub. On other hub, Multiple profiles is a member preference that need to be enabled by going to Settings > Additional Features. - - -## The visibility of a profile -### What is it? -Your default profile is public by default and you can't change it. That means that anyone can see the information you added on it when they come on your channel. - -However, as explained before, you may create additional profiles to give more or less information about you to your connections. - -The "visibility" of a profile is the setting that organized who is going to see this profile. - -### How to change the visibility of my profile? -Click on the **Profile tools** from the **Edit Profile Details** and choose **Edit visibility**. - -**Important: this only available for the profiles that are not your default profile.** - -![profile_tools_visibility](en/Profile_tools_visibility.png) - -On the bottom, you have the list of your connections. Simply click on specific connections to add them to or remove them from the group of people who can see this profile. - -![profile_visibility](en/Profile_visibility.gif) - -Once a profile has been selected, when the person views your profile, they will see the private profile you have assigned. If they are not authenticated, they will see your public profile. - -If you do not wish to be found be people unless you give them your channel address, you may leave your profile unpublished. - -## How to assign one of my profiles to new connections? -If you want to change which profile is assigned by default to new connections, go to **Channel Settings**, then **Miscellaneous Settings**. The **Profile to assign new connections** drop-down menu lets you choose between your profiles. - -![profile_assign](en/Profile_assign.png) diff --git a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/docs.en.md b/pages/10.DisHub/02.Channels/03.Blocking_a_channel/docs.en.md deleted file mode 100644 index 832ed84f..00000000 --- a/pages/10.DisHub/02.Channels/03.Blocking_a_channel/docs.en.md +++ /dev/null @@ -1,44 +0,0 @@ ---- -title: 'Blocking a channel' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -## What does block a channel do? -Well, lets say you don't want any contact with somebody, for example because this somebody spams you or because their comments just disturb you, or because you don't want hi/her to read your post. You can simply block that contact. - -There are two way of blocking: -* Block a channel - * This means that the channel will not be able to read any of your items, and he will also not be able to write to your channel. Good to know is that it doesn't matter with what permission you post something, that channel will still be unable to see your activities. -* Block completely a channel - * It's like blocking a channel but it also make that you won't even see that channel (not only in your stream, but even you would go on the channel page). It's like the channel doesn't exist anymore. Except if that channel post something for example on a forum and you are also connected to that forum. You won't see his posts on your channel but you will see them if you are visiting the forum page. **TO BE CHECKED: I'm almost sure you don't see it even in a forum!** - -## How do I block a channel? -### Block a channel -This means that the channel will not be able to read any of your items, and he will also not be able to write to your channel. Good to know is that it doesn't matter with what permission you post something, that channel will still be unable to see your activities. - -To block a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to block. Then **Connections tools** and from the dropdown menu **Block**. -![BlockChannel](en/BlockChannel.gif) - -You can undo the block in the same way you blocked a channel. - -![UnBlockChannel](en/UnBlockChannel.gif) - -### Completely block a channel ("superblock") -It's like blocking a channel but it also make that you won't even see that channel (not only in your stream, but even you would go on the channel page). It's like the channel doesn't exist anymore. Except if that channel post something for example on a forum and you are also connected to that forum. You won't see his posts on your channel but you will see them if you are visiting the forum page. **TO BE CHECKED: I'm almost sure you don't see it even in a forum!** - -If you want to completely block a channel you have to do it from a post or comment from within your channel. -For example from your activity page or public stream. -There you click on the avatar of the channel you want to block an select **Completely Block**. -![CompletelyBlockChannel](en/CompletelyBlockChannel.gif) - -If you want to undo the completely block, you are not able anymore to see it anymore. So you need to use the superblock addon. Go on your [settings page](https://hub.disroot.org/settings), select **Addon settings** and then click on **Superblock settings**. Now you click on the trash bin icon of the channel you want to unblock. - -![CompletelyUnBlockChannel](en/CompletelyUnBlockChannel.gif) - -!!! on moblie the settings panel is hidden. To show the settings panel you gave to click on the arrow icon on the nav bar. ![MobileSuperblock](en/MobileSuperblock.gif) diff --git a/pages/10.DisHub/02.Channels/04.Ignore_a_channel/docs.en.md b/pages/10.DisHub/02.Channels/04.Ignore_a_channel/docs.en.md deleted file mode 100644 index 75110bbd..00000000 --- a/pages/10.DisHub/02.Channels/04.Ignore_a_channel/docs.en.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: 'Ignore a channel' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -## What does ignore a channel do? -When you ignore a channel, this channel can see your posts if it has permission (and if the post you write is also accessible for that channel, for example if you make it public). - -But you won't see anything that this channel will post in your network stream, and it won't be allowed to write on your channel (wall or @mention) - -## How do I ignore a channel? -To ignore a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to ignore. Then **Connections tools** and from the drop-down menu **Ignore**. - -![IgnoreChannel](en/IgnoreChannel.gif) - -You can undo the ignore in the same way you ignored a channel. - -![UnIgnoreChannel](en/UnIgnoreChannel.gif) diff --git a/pages/10.DisHub/02.Channels/05.Archive_a_channel/docs.en.md b/pages/10.DisHub/02.Channels/05.Archive_a_channel/docs.en.md deleted file mode 100644 index 4c291f5a..00000000 --- a/pages/10.DisHub/02.Channels/05.Archive_a_channel/docs.en.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: 'Archive a channel' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -## What does archive a channel do? -If a channel can't be reached for 30 days, it is automatically marked as archived. This keeps all the data but stops polling the channel for new information and removes it from auto-complete. If later you learn the channel has come back online, you may manually unarchive it. - -## So how do I unarchive a channel? -To unarchive a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to unarchive. Then **Connections tools** and from the dropdown menu **unarchive**. - -![UnArchiveChannel](en/UnArchiveChannel.gif) diff --git a/pages/10.DisHub/02.Channels/06.Hide_a_channel/docs.en.md b/pages/10.DisHub/02.Channels/06.Hide_a_channel/docs.en.md deleted file mode 100644 index f507e1f2..00000000 --- a/pages/10.DisHub/02.Channels/06.Hide_a_channel/docs.en.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: 'Hide a channel' -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -## What does hide a channel do? -If you don't want to show you are connected to a channel, you can choose to hide this connection to others. No one can see you're connected (the channel does not show up in your profile's connections list). But beware people may still show up to your other connections, for example if you get a comment on a post from that channel. - -See it like this. You hide someone in your closet, people who comes by don't see him/her. But if you say something and that person who is hidden reacts, others in the room will hear it. Otherwise, if you say something on a public place. Like for example while waiting in a waiting room, and you try to hide the fact that you are in contact with someone, even if that person comments something you said people can't now if it is a stranger for you or if you know him. - -## So how do I hide a channel? -To hide a channel you visit [your connection page](https://hub.disroot.org/connections), from here you select the **edit** button of the channel you want to unarchive. Then **Connections tools** and from the dropdown menu **hide**. - -![HideChannel](en/HideChannel.gif) - -You can unhide in the same way you've hidden the channel. - -![UnHideChannel](en/UnHideChannel.gif) diff --git a/pages/10.DisHub/02.Channels/docs.en.md b/pages/10.DisHub/02.Channels/docs.en.md deleted file mode 100644 index b1405aca..00000000 --- a/pages/10.DisHub/02.Channels/docs.en.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -title: Channels -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - -## What is a channel? -You can see a channel like being a Facebook wall, a timeline of posts like Tweeter or Mastodon, etc. It can be simply a collection of content stored in one place. Basically, info that you want to share (or not) with others, and that others may share (or not) with you. The great thing and difference with those services: with your disroot account you can create as many channels as you want! So if you want to have one channel about cooking and another one about animals, you can! - -For most people, their first channel with be "Me". - -The most important features for a channel that represents "me" are: -* Secure and private "spam free" communications -* Identity and "single-sign on" across the entire network -* Privacy controls and permissions which extend to the entire network -* Directory services (like a phone book) - -You can have as many channels as you want! Perhaps you are an avid book reader and many people are bored by that. So you open a second channel just for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of posts, with a new profile (... or new profiles ...) and completely different contacts. Some connections might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just switch between both of them just like you would in real life switch when talking to people you meet on the street or people you meet specially to talk about books. - -Think of a channel as different spaces dedicated to different topics where you meet with different people. diff --git a/pages/10.DisHub/03.Connections/docs.en.md b/pages/10.DisHub/03.Connections/docs.en.md deleted file mode 100644 index 88247d5d..00000000 --- a/pages/10.DisHub/03.Connections/docs.en.md +++ /dev/null @@ -1,117 +0,0 @@ ---- -title: Connections -page-toc: - active: true -published: true -visible: true -taxonomy: - category: - - docs ---- - -## What is a connection? -Making connections between channels to share things is what social communications are all about. - -Connections in Hubzilla can take on a great many different meanings. **A connection is more accurately defined as a set of permissions that you have granted to somebody else**. In traditional social network applications, all connections are granted the same permissions; or at most there two levels (friends and 'followers'). In Hubzilla, a range of separate permissions may be set/adjusted depending on the situation and relationship you have with the other channel. You can allow somebody to view your posts but not your photos. You can also deny them permission to comment on your posts or send private mail to you. - -[For more information about permissions....](../permissions/) - -## How to connect to a channel? -There are several way to connect to a channel: - -### You know the Hubzilla channel's address -If you already know somebody's channel address ("webbie") you can connect with them directly. A webbie looks just like an email address (for instance disroot@hub.disroot.org) but refers to somebody in the open social web. In order to connect they must be using a compatible network protocol. By default, this software supports the 'zot' protocol, however additional protocols may be provided through plugins/addons. - -Go to your **Connections page** by clicking on the connection icon on the nav bar - -![Icon](en/ConnectionIcon.png) - -From there, write down the channel address you want to connect to in the **search bar**, and then click on the **+** to connect -![connect](en/Connect1.gif) - -!!! Because the pinned apps are hidden on mobile you have to access your connections page from the hamburger menu. And beacouse the left bar is hidden to you have to show it by clicking on the arrow icon. ![MobileConnections](en/MobileConnections.gif) - -Depending on the settings of the channel you are connecting to, you may need to wait for them to approve your connection, but no further action is needed on your part. Once you've initiated the connection, you will be taken to the connection editor. This allows you to assign specific permissions for this channel if you wish to make any changes. - -### You don't know the Hubzilla channel's address or you want to search an idea of channel -The directory is available on every Hubzilla website which means searching from your own site will bring in results from the entire network. You can search by name, interest, location, and keyword. - -Go to the directory search page by clicking on the **Directory icon** on the top navbar. -![Network](en/Network.png) - -!!! On mobile you go to the directory from the hamburger menu and from there directory. ![MobileDirectory](en/MobileDirectory.png) - -Use the **search bar** for names or interests and click on **+ Connect** with the desired channel. ![connect2](en/Connect2.gif) - -!!! On mobile the search bar is hidden, if you want to search connections on mobile you do it like this ![MobileConnect](en/MobileConnect.gif) - -### You see a channel that you want to connect to -You can also connect to a channel when you see it, for example in a post or comment. - -To do so, click on the **profile picture** of that channel and then choose **Connect**. - ![connect3](en/Connect3.gif) - -### You want to connect with channels on other networks -The process for connecting to channels on other networks (such as GNU-Social, Mastodon, and Diaspora) is similar - type their "webbie" into the **Add New Connections** box on the **Connections page**. Before you do this however, please visit your **Settings** page, **Addon Settings** and ensure that the relevant protocol (Diaspora, GNU-Social/OStatus, ActivityPub, or others) is provided on your hub and activated for your channel. - -These networks/protocols do not support account migration and location independence so if you move location or clone your channel elsewhere, communications with these connections may fail. For this reason these protocols are not activated by default, but only through your consent. Activating these protocols involves an important decision between communicating with friends on these networks or providing fail-safe account resilience if your server fails. - -Some softwares you might have heard of might use a communication protocol with a different name. For example Mastodon, Pleroma, Peertube all use ActivityPub so if you want to connect with people on these softwares, ativate 'activitypub' protocol for communication. -Some softwares, like Mastodon and Pleroma also support the 'Osatus' protocol. -Generally the 'activitypub' protocol will provide a better experience than 'ostatus', but Hubzilla will often choose the first protocol it discovers and this may not be the one you want. - -You may connect with somebody over a specific protocol the same way you would add a contact on hubzilla, but changing his/her address to point to the right protocol instance. - -For example if you want to connect to a mastodon user: **username@mastodon.instance**. - - -### You want to connect with RSS feeds -DisHub allows connecting to RSS feeds. The process for connecting to an RSS feed is the same, except type (or paste) the URL of the feed into the **Add New Connection** box. - -Feeds are processed every hour. - -DisHub admins may impose limits on how many feeds you may add, which is not the case at this time. - - -## Block/Ignore/Archive/Hide channels WIP -When someone adds you as a connection, you receive a connection message (except in two channel roles: Forum - Mostly public and Feed - Mostly public). -![connection_message](en/Connection_message.png) - -Here's their meaning: - -**Approve**: you accept this connection. It appears in your contact list. The default permissions set by your channel role to your connections applies. - -**Ignore**: the channel can see your stream if it has permission (according to your channel role) and if the post you write is also accessible for that channel (for example if you make it public). But you won't see anything that this channel will post in your network stream, and it won't be allowed to write on your channel (wall or @mention). - -This connection is not approved, as you can see on the message you get when you click on ignore: - -![connection_ignored](en/Connection_ignored.png) - -Here is what the other connection will see when going to the individual connection permissions: -![connection_permission](en/Connection_ignored_permission.png) -The permissions may changed according to your channel role. But you can see that this channel got some permissions. YOU CAN'T CHANGE THEM, unless you change the channel status, from Ignore to Approve. - -You appear in the ignored connection channel's connection list, but with a one-way sign - -![connection_refused](en/Connection_refused.png) - -This channel doesn't appear in your connections list on your profile, but appears in the connections page. That means that you can change its status any time you want. - - -**Delete**: you don't accept this connection, but you don't block it either. That means that this channel has the same permissions as any other channel that you don't have a connection with, the same rights as the general public. - -Here is what the other connection will see when going to the individual connection permissions: -![connection_permission](en/Connection_permission.png) -The permissions may changed according to your channel role. But you can see that this channel got some permissions. YOU CAN'T CHANGE THEM, unless you create a connection with this channel. - -You appear in the deleted connection channel's connection list, but with a one-way sign. - -![connection_refused](en/Connection_refused.png) - -This channel doesn't appear in your connections list on your profile, nor in the connections page. That means that if you want to set a connection with a channel that you previously deleted, you have to create it again on your side, like creating a new connection. The only difference will be that this channel won't have the approval message as the connection is already set on its side. - -## Premium Channels -Some channels are designated **Premium Channels** and may require some action on your part before a connection can be established. The Connect button for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel. - -Here is an example of such a message: -![connections_premium_message](en/Connection_premium_message.png) diff --git a/pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md b/pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md deleted file mode 100644 index 01a541f7..00000000 --- a/pages/10.DisHub/04.Permissions/01.Default_channel_permission-limits/docs.en.md +++ /dev/null @@ -1,136 +0,0 @@ ---- -title: Default Channel Permission Limits -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -### What is it? -There are a set of default permission limits that apply to all items shared by a channel. This determines the first "limit" on who can access an item of your channel: a post, a wiki, a photo, etc. - -### What kind of permissions can be set? - -- **Can view my channel stream and posts.** - -This permision determines who can view your channel "stream": your non-private posts that appear on the *channel page* ![channel_icon](en/channel_icon.png) when you're logged in. - -- **Can send me their channel stream and posts.** - -This permission determines whose posts you will view. It's like follwing someone on Mastodon. - -- **Can view my default channel profile.** - -This permission determines who can view your default channel's profile (you can have more than one profile, but there is only one default profile). This refers to the *"about"* tab. - -- **Can view my connections.** - -This permission determines who can view the list of your contacts. These are the connections displayed in the *"connections"* section ![connection_icon](en/connection_icon.png). - -- **Can view my file storage and photos.** - -This permission determines who can view your public files stored in your cloud and your photo albums. Individual photographs may still be posted to a more private audience. - -- **Can upload/modify my file storage and photos** - -This determines who can post pictures in your albums or upload files to your public file storage, or 'cloud'. This is very useful for forum-like channels where connections may not be connected to each other. - -- **Can view my channel webpages.** - -This permission determines who can view your webpages. - -- **Can view my wiki pages.** - -This permission determines who can view your wiki. - -- **Can create/edit my channel webpages.** - -This determines who can edit your webpages. This is useful for sites with multiple editors. - -- **Can write to my wiki pages.** - -This determines who can edit your WiFi. This is useful for wikis with multiple editors. - -- **Can post on my channel (wall) page.** - -This permission determines who can write to your wall when clicking through to your channel. - -- **Can comment on or like my posts.** - -This permission determines who can comment on or like posts you create. Normally, you would want this to match your *"can view my public stream and posts"* permission - -- **Can send me private mail messages.** - -This determines who can send you private messages (zotmail). - -- **Can like/dislike profiles and profile things.** - -This determines who can like/dislike items on your profile. - -- **Can forward to all my channel connections via @+ mentions in posts.** - -Using @- mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. This determines if people can post to your channel in this way. - -- **Can chat with me.** - -This determines who can join the public chat rooms created by your channel. - -- **Can source my public posts in derived channels.** - -This determines who can share your post onto other channels. - -- **Can administer my channel.** - -This determines who can have full control of your channel. This should normally be set to *"nobody except myself"*. - - -**Note:** -Plugins/addons may provide special permission settings, so you may be offered additional permission settings beyond what is described here. - -If you have set any of these permissions to *"only those I specifically allow"*, you may specify individual permissions on the connnection edit screen. - -### What are the scopes of permissions that can be set with those limits? - -- **Nobody Except Yourself** - -Only you will be allowed access. - -- **Only those you specifically allow** - -By default, people you are not connected to, and all new contacts will have this permission denied. You will be able to make exceptions for individual channels on the connection edit screen. - -- **Approved connections** - -Only channels you have accepted/approved as connections will have this permission approved. This is the way most legacy platforms handle permissions. - -- **Any connections** - -Any channel that creates a connection with you, approved or not, will have this permission approved. - -- **Anybody on this website** - -Anybody with a channel on the same hub/website as you will have permission approved. Anybody who is registered at a different hub will have this permission denied. - -- **Anybody in this network** - -Anybody in the Hubzilla network will have this permission approved. Even complete strangers. However, anybody not logged in/authenticated will have this permission denied. - -- **Anybody authenticated** - -This is similar to *"anybody in this network"* except that it can include anybody who can authenticate by any means - and therefore may include visitors from other networks. - -- **Anybody on the internet** - -Completely public. This permission will be approved for anybody at all. - -**Note**: Some scopes may not be available for some permissions. - -The limit applies to any published thing you create which you didn't set specific permission to (see Access Control List below). For example if you publish a photo and didn't select a specific audience with permission to view it, we apply the limit you set. If all your photos are visible to everybody on the internet and you reduce the limit only to friends, all of your photos will now be visible only to friends. - -### Where can those permissions be set? -There are two places: in the **Channel settings** or in the **Connections settings**. See further for more information. - ---- diff --git a/pages/10.DisHub/04.Permissions/02.Channel_permission_roles/docs.en.md b/pages/10.DisHub/04.Permissions/02.Channel_permission_roles/docs.en.md deleted file mode 100644 index c427a337..00000000 --- a/pages/10.DisHub/04.Permissions/02.Channel_permission_roles/docs.en.md +++ /dev/null @@ -1,137 +0,0 @@ ---- -title: Channel permission roles -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -### What is it? -These permission limits (see previous section) can come in pre-configured sets to help you set them quickly. It is called **Channel permission roles**. -When you create a new channel, you will be asked to select a permission *role* based on how you envision using this channel. These create an entire family of permissions and privacy settings that are appropriate for that role. **Typical roles are "Social - mostly public", "Social - mostly private", "Forum - public"** and many others. These bring a level of simplicity to managing permissions. Just choose a role and appropriate permissions are automatically applied. For example, if you choose the "Social - Public" role, then your default permission limits set your posts to be public. So channel permission roles are primarily a way to reduce the complexity of setting all the default permission limits. - -Advanced configurations (**'Custom/Expert mode'**) are available to let you adjust each of these parameters to your needs, but we've found that most people prefer to "set it and forget it". - -### How to select a channel role? -Go to your **settings** page, click on the **Channel settings** tab then on **Security and Privacy Settings**. From there, you can see a drop-down menu under **Channel role and privacy**. You can choose between: -- Social: - - Federation - - Mostly public - - Restricted - - Private -- Forum: - - Mostly public - - Restricted - - Private -- Feed: - - Public - - Restricted -- Special: - - Celebrity/Soapbox - - Group Repository -- Custom/Expert Mode - -![channel_roles](en/channel_roles.gif) - -### What are the differences between these roles? - -We highly recommend that you use the **"Social - Mostly Public"** settings when you create your first channel, as it allows others to communicate with you and help you out if you have difficulty. You will find that these settings allow you as much privacy as you desire - when you desire it; but also allow you to communicate in public if you choose to. You are free to use much more private settings once you have learned your way around. - -[See this channel roles permissions table](../channel_roles) - -#### Social -##### Federation -This is the most public setting. This role is not generally recommended unless you need to interact regularly with members of other federated social networks. But it is the best choise if you want to connect as good as it can with all the networks. **It's also the only setting that permits that everybody is able to comment on your public post from the public activity page**. The permission policies are similar to Twitter and mostly compatible with Diaspora and Mastodon. -Privacy is a lower priority than ease of access and connecting with others. - -What does it do?: -- You are listed in the directory. -- By default posts and published items are public, but you can over-ride this and restrict it. -- Anybody in the network can comment on your public posts, send you private mail and chat with you. -- Your online presence and connections are visible to others. -- Anyone can see your other connections. - - -##### Mostly Public -As a typical social networking profile, this is probably what most people want. The permission policies are similar to Facebook. But if you really want to public post it's still better to choose for *"Social - Federation"* - -What does it do?: -- You are listed in the directory. -- By default posts and published items are public, but you can choose to restrict it. -- Only your connections can comment on your public posts, send you private mail and chat with you. -- Your online presence and connections are visible to others. -- Anyone can see your other connections. - - -##### Restricted -In this role privacy is more important than the previous ones. This is what you want if you just prefer connect with others but still be able that others find you. You are still able to make public posts but interaction with others will be more difficult, as it requires that channel has to be connected with you. - -What does it do? -- You are listed in the directory. -- By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. you're still able to make posts more public if you want. -- Only your 'my "friends" privacy group' can comment on your public posts, send you private mail and chat with you. -- Your online presence (for chat) and your connections (friends) are visible to your profile viewers. -- Anyone can see your other connections. - -##### Private -Privacy is the most important for this role. You will have to handle more with permissions when you want more interactions with other channels. If others want to connect with you, they will need your full address (username@hub.disroot.org). So, if public activity is not your priority and only want to connect with people you know, than this is what you are searching for. - -What does it do? -- You are listed in the directory. -- By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. you're still able to make posts more public if you want. -- Only your 'my "friends" privacy group' can comment on your public posts, send you private mail and chat with you. -- Your online presence (for chat) and your connections (friends) is hidden. -- Only your connections can see your other connections. - -#### Forum -You can compare Hubzilla Forums as groups in Facebook. You can choose different privacy settings for that. - -##### Mostly Public -This setting is for typical forum. Anyone can see channel posts. So as the name says, use it for public forum. - -What does it do? -- The channel is visible in the directory. -- By default posts and published items are public. -- Members may post by !mention or wall-to-wall post and comment. -- Posting photos and other published items is blocked. -- Members are added automatically. - -##### Restricted -The most important difference with the mostly public setting is that only connections are allowed to see the forum stream and posts. - -What does it? -- The channel is visible in the directory. -- By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. -- Members may post by !mention or wall-to-wall post, but posts and replies may also be seen by other recipients of the top-level post who are not members. -- Members must be manually added by the forum owner. - -##### Private -Here the most important difference with the restricted setting is that mentions are disabled, and only your connections can see your other connections. - -What does it? -- The channel is NOT listed in the directory. -- By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. -- Your online presence is hidden. Members must be manually added by the forum owner. -- Posting by !mention is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible. - -#### Feed -##### Public -Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved. - -##### Restricted -Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner. - -#### Special -##### Celebrity/Soapbox -Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile. - -##### Group Repository -A public forum which allows members to post files/photos/webpages. - -#### Custom/Expert Mode -Set all the privacy and permissions manually to suit your specific needs. - ---- diff --git a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/docs.en.md b/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/docs.en.md deleted file mode 100644 index 790f938b..00000000 --- a/pages/10.DisHub/04.Permissions/03.Connection_permission_limits/docs.en.md +++ /dev/null @@ -1,74 +0,0 @@ ---- -title: Channel permission limits -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -### What is it? -When you have chosen a channel permission role, any connection made to your channel is set according to this role. However, you can change those default permissions limits. These allow you to customize the permission limits for individual connections, and set some permissions for one channel, and some others for another one. For example, you can grant or deny permission to individual channels to send you their posts such that they will automatically appear in your "network stream". - -### How to set different permissions limits for a connection? -If you want to change it, go on the **connection page** by clicking on the connection icon ![connection_icon](en/connection_icon.png) - -On the connection that you want to modify, click on *Edit* -![connection_disroot](en/connection_disroot.png) - -Then, click on **Individual Permissions**. The list of the permissions you "give" to that connection can be seen under "My settings". Just check / uncheck the permissions there. Don't forget to click on *Submit* when you're done. -![connection_permission](en/connection_permissions.gif) -**Note:** You can see what permissions you "received" from the other channel under "Their settings". - - -### Permission categories / Permission roles for connections -#### What is it? -It is a set of permissions that you want to store in order to be able to use it quickly. - -For example, there is a predefined *"follower"* permission category that denies the ability of a connection to send you their posts. You could choose this permission category as the one which is applied to new connections by default if you are the kind of person that does not want to clutter your network stream with the posts of all your connections and instead prefers to visit the channel pages of your connections individually to read their content. - -#### What are the already-existing permission categories? -- **Default**: the permissions set automatically according to your channel role. But you can change your default settings if you want. See below. - -- **Follower**: - -![follower](en/permission_follower.png) -- **Contributor**: - -![contributor](en/permission_contributor.png) -- **Publisher**: - -![publisher](en/permission_publisher.png) - -You can always edit these settings directly in this connection's settings by checking / unchecking the permissions, within the flexibility allowed by your channel permission role. - -#### How to create my own category? -Go to your **channel settings**, then click on **Permission groups** (this should be changed by "Permission Category" in next Hubzilla release). -Just choose a name for your category, then click on **Individual Permissions** and set your permissions by checking / unchecking what you want. Don't forget to click on *Submit*. -![permission_category_create](en/permission_category_create.gif) - -You can also use the **+ Add permission role** button directly from the connection Individual Permissions setting ![add_permission_category](en/permission_category_add.png) - -#### How to change or delete my categories? -You can change a category you created by simply clicking on its name, the on **Individual Permissions**. Don't forget to click on *Submit*. -![permission_category_change](en/permission_category_change.gif) - -To delete it, just click on the trash icon next to its name. -![permission_category_delete](en/permission_category_delete.png) - -#### How to use a personnal category of permissions with a connection? -Go on the **connection page** by clicking on the connection icon ![connection_icon](en/connection_icon.png) - -On the connection that you want to modify, click on *Edit* -![connection_disroot](en/connection_disroot.png) - -Then, click on **Individual Permissions**. You have a drop-down menu that lets you choose the category you want and automatically apply the settings of this category to the connection. -![permission_category_connection](en/permission_category_connection.gif) - -#### How to make one of my category the default one? -If you want all your new connections to be set with a default set of permissions that you want, first create this set of permissions ("category"). Then, go on your **channel settings**, in the **Security and Privacy Settings** tab. In the **Default Permissions Group** parameter, just choose your category. -![permission_category_default](en/permission_category_default.gif) - ----------- diff --git a/pages/10.DisHub/04.Permissions/04.Access_control_list/docs.en.md b/pages/10.DisHub/04.Permissions/04.Access_control_list/docs.en.md deleted file mode 100644 index 49ea5e35..00000000 --- a/pages/10.DisHub/04.Permissions/04.Access_control_list/docs.en.md +++ /dev/null @@ -1,45 +0,0 @@ ---- -title: Access Control List or ACL -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -### What is it? -Access Control List is the preferred method of managing privacy in most cases, rather than using permission limits. It is a set of additional permission that you may want to set for very specific items. Unlike permission limits, if you change the ACL on a single photo (for example), it doesn't affect any of your other photos. - -An ACL is attached to everything you publish. - -**Important: permission limits are more important than ACL. For example, Hubzilla checks "can someone see your files/photos" before it checks "can someone see *this* photo". And if the first check fails you'll never get to the second. - -If your permission limits for Peter grant Peter permission to view your photos, but you set an ACL on a photo that excludes Peter, then Peter can't see that photo. - -If the connection with Peter doesn't allow him to see your pictures, even if you use ACL to give him this permission, it won't work. - -Hubzilla will take the most restrictive approach.** - - -### How to use it? -When you open the ACL (usually by clicking on a lock icon ![lock_icon](en/lock_icon.png) next to *Submit*) this open a popup with a list of possible scope of permissions. -![ACL_popup](en/ACL_popup.png) - -You have different choices: -1. **Public**: anyone can see / modify -2. **Friends**: only connections that are in your Friends privacy group can see / modify -3. **Only me** -4. **Custom selection**: you can choose on a per-connection basis who can see or modify. -5. **Guest Access Token**: This allows you to share a file, folder, photo, album, or channel with a specific person or group of people. They don't need to be Hubzilla members. You can set an expiration for the Access Token. -[See here for more information...](../guest_access_tokens) - -**Note**: This list can be slightly different, depending of where you use the ACL. - -If you choose **Friends** or **Custom selection**, you then have a list of your connection. -![ACL_list](en/ACL_list.png) - -Just click on **Show** o **Don't show** for each connection to which to want to show or not show. - ---- diff --git a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/docs.en.md b/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/docs.en.md deleted file mode 100644 index 136a5307..00000000 --- a/pages/10.DisHub/04.Permissions/05.Guest_access_tokens/docs.en.md +++ /dev/null @@ -1,53 +0,0 @@ ---- -title: Guest Access Tokens -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -### What is it? -Guest access tokens (sometimes called "Zot access tokens") allow you to share a file, folder, photo, channel, etc., with a specific person or group of people **who are not Hubzilla members**. - -These tokens allow you to share individual items by sending a link that includes the token in the URL; alternatively, people can actually log in using the token credentials, after which they can seamlessly view whatever content has been shared with that token. - -[More details can be found here...](https://hub.disroot.org/help/en/feature/access_tokens) - -### How to create a guest access token? -To create and manage guest tokens, go to **Settings** page and open the **Guest Access Tokens** tab. - -Enter a **Login Name**. You can change the **Login Password** if don't want the one automatically attributed (**warning: it is the access token, it will be included in the URL you will later share**). You can set an **expiration date** in the form of "YYYY-MM-DD" but that's optionnal. When you're done, click on *Submit* -![tokens_creation](en/tokens_creation.gif) - -### Set or change permissions -Additional permissions may be granted to the guest token by expanding the **Individual Permissions** options when you create the guest access token. Check or uncheck the permissions you want to grant, then click on *Submit*. -![tokens_creation_permissions](en/tokens_creation_permissions.gif) -Some can't be changed: they are inherited from the chanel role you chose. - -Existing tokens are listed below the dialog and can be edited by selecting them. The form is automatically filled in. Click on the **Individual Permissions** options and check or uncheck the permissions you want to grant/ungrant. -![tokens_change_permissions](en/tokens_change_permissions.gif) -You can also change its login name, password and expiration date. - -### How to delete it? -You can delete an existing token by pressing the trash icon next to its name at the bottom of the page. -![tokens_delete](en/tokens_delete.png) - -### How to use a guest access token? -Any tokens you have created are added to the Access Control List selector and may be used anywhere that **Access Control Lists** are provided. - -Imagine you want a visitor (named "test") to be able to write to your wiki pages. -1. You set this permission in the **Guest Access Tokens** tab as previously explained. ![tokens_wiki_permission](en/tokens_wiki_permission.gif) -2. You go on your wiki. Fill in the needed information in order to create a wiki. Click on the lock icon to open the Access Control List. -3. Choose **Custom selection** and click on *Show* for the "test" user. You can now close the Access Control List. -4. Your visitor can now login to your channel, go to wifi page and edit the created wifi. - -![token_wifi](en/tokens_wiki.gif) - -Alternatively, you may share a **direct link** to the wiki (for this example, but that can be with files, photos, etc.) by **adding a parameter "?f=&zat=abc123" (or "&zat=abc123" which is the same but with less compatibility) to the URL**, where the string "abc123" is the access token or password for the temporary login. In our wiki example that could be something like: https://hub.disroot.org/wiki/meaz&zat=tertonti - -No further negotiation is required, and the wiki is presented. You can see an example at the bottom of the **Guest Access Tokens** page: -![tokens_links](en/tokens_links.png) - diff --git a/pages/10.DisHub/04.Permissions/Channel_roles/docs.en.md b/pages/10.DisHub/04.Permissions/Channel_roles/docs.en.md deleted file mode 100644 index 6d684b53..00000000 --- a/pages/10.DisHub/04.Permissions/Channel_roles/docs.en.md +++ /dev/null @@ -1,466 +0,0 @@ ---- -title: Channel roles permissions table -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - - - - - ------------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-PERMISSIONS ROLES
 SOCIALFORUMFEED
#Individual PermissionFederationMostly PublicRestrictedPrivateMostly PublicRestrictedPrivateMostly PublicRestricted
1Can view my channel stream and postsAnyone*Anyone*My 'Friends' privacy group*My 'Friends' privacy group*Anyone*My 'Friends' privacy group*My 'Friends' privacy group*Anyone*My 'Friends' privacy group*
2Can send me their channel stream and postsMy connectionsMy connectionsMy connectionsMy 'Friends' privacy groupOnly if permission given Only if permission given Only if permission given + Posts only via wall (!mention is disabled)My connectionsMy connections
3Can view my "public" channel profileAnyone*Anyone*Anyone*Anyone*Anyone*Anyone*AnyoneAnyone*Anyone*
4Can view my connectionsAnyone*Anyone*Anyone*My 'Friends' privacy groupAnyone*Anyone*My connectionsAnyone*Anyone*
5Can view my file storage and photosAnyone*Anyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group
6Can upload/modify my file storage and photosOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
7Can view my channel webpagesAnyone*Anyone*My 'Friends' privacy groupMy 'Friends' privacy groupAnyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group
8Can view my wiki pagesAnyone*Anyone*My 'Friends' privacy groupMy 'Friends' privacy groupAnyone*My 'Friends' privacy group*My 'Friends' privacy groupAnyone*My 'Friends' privacy group
9Can create/edit my channel webpagesOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
10Can write to my wiki pagesOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
11Can post on my channel (wall) pageMy connectionsMy connectionsMy connections, but they won't see it, except if in Privacy groupMy connections, but they won't see it, except if in Privacy groupMy connectionsMy connections, but they won't see it, except if in Privacy groupMy connections, but they won't see it, except if in Privacy group. They can't override that.My connectionsMy connections, but they won't see it, except if in Privacy group
12Can comment on or like my postsAnyone connected*My connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupMy connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupMy connectionsMy 'Friends' privacy group
13Can send me private mail messagesAnyone connected*My connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupMy connectionsMy connectionsMy connectionsMy connectionsMy 'Friends' privacy group
14Can like/dislike profiles and profile thingsAnyone connected*My connectionsMy connectionsMy connectionsMy connectionsMy connectionsMy connectionsMy connectionsMy connections
15Can forward to all my channel connections via @+ mentions in postsOnly if permission given Only if permission given Only if permission given Only if permission given My connectionsMy 'Friends' privacy groupMy 'Friends' privacy groupOnly if permission given Only if permission given
16Can chat with meAnyone connected*My connectionsMy 'Friends' privacy groupOnly if permission given My connectionsMy connectionsMy connectionsMy connectionsOnly if permission given
17Can source my public posts in derived channelsAnyone connected*My connectionsOnly if permission given Only if permission given My connectionsOnly if permission given Only if permission given My connectionsMy connections
18Can administer my channelOnly if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given Only if permission given
#VISIBILITYFederationMostly PublicRestrictedPrivateMostly PublicRestrictedPrivateMostly PublicRestricted
1Listed in the directoryAnyoneAnyoneAnyoneNoAnyoneAnyoneNoAnyoneNo
2Your online presenceAnyoneAnyoneAnyoneNo oneNo oneNo oneNo oneNo oneNo one
#OTHERFederationMostly PublicRestrictedPrivateMostly PublicRestrictedPrivateMostly PublicRestricted
1New connections automatically added in "Friends" privacy groupNoNoYesYesNoYesYesNoYes
2New connections are approved automaticallyNoNoNoNoYesNoNoYesNo
           
*: means that this permission is inherited from channel role and can't be modified. Everything else can be modified
 Public, anyone can see or act
  Public, anyone connected can see or act
 Public, connections can see or act
  Partialy private, Friends group can see or act
 Private, only those permitted car view or act
 
Important:
- Changing from an opened channel role to a more restricted one doesn't change the permissions already set. 'For ex, viewing photo is for Friends privacy group in Social / Restricted. However, if a folder of picture was created before while the channel was set to Social / Federation role, then this folder and its files can be seen by anyone. But creating a new folder will get the new channel role, so for this example visible only to Friends privacy group
- Even if your posts are private by default (for example with Forum - Restricted) you can still choose to post "public"
diff --git a/pages/10.DisHub/04.Permissions/docs.en.md b/pages/10.DisHub/04.Permissions/docs.en.md deleted file mode 100644 index 76d339a3..00000000 --- a/pages/10.DisHub/04.Permissions/docs.en.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -title: Permissions -published: true -taxonomy: - category: - - docs -visible: true -page-toc: - active: true ---- - -Permissions in Hubzilla are more complete than you may be used to. This allows us to define more fine graded relationships than the black and white "this person is my friend, so they can do everything" or "this person is not my friend, so they can't do anything" permissions you may find elsewhere. You can give almost type of permission (view a photo, write on your channel, comment a post, etc.) to anything (file, post, wiki, etc.) to almost any person or groups of person that you wish (those you specifically allow, anyone connected, etc.) - ---- diff --git a/pages/10.DisHub/05.Posts/01.Composing/docs.en.md b/pages/10.DisHub/05.Posts/01.Composing/docs.en.md deleted file mode 100755 index 899a7eda..00000000 --- a/pages/10.DisHub/05.Posts/01.Composing/docs.en.md +++ /dev/null @@ -1,96 +0,0 @@ ---- -title: Composing -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -## Basic composing -If you want to share something, just click on the **share bar** ![Share](en/Share.png) that you can find on the top of the **your Channel page**, your **Activity/Network page** and on most of the **others channels pages** (except if not allowed). - -This is what you will happen: -![Compising_composer](en/Composing_composer.gif) - -The first thing you probably want to do is setting a **title**. It's not obligatory, so it's up to you if you want to set one or not. However, it is a good practice to set one as it makes your post more visible. - -The same thing is for the **categories** part. Here you can add one or more categories, "tags", just separate each words/sentences you add by a comma. For example **How to, hubzilla**. -Here again, it's a good practise to use categories as it helps people to find your posts easier. Indeed, when there is a **Categories widget** on the channel that you visit, you can click on the category you're interested in so that if filters all the channel's posts that have been composed with this tag. -![Composing_categories](en/Composing_categories.png) - -Now the first basic options you have when composing your post are **Bold, Italic, Underline, Quote and Code**. -So when composing you want for example to write some text in bold, you click on the bold button and put the text you want in between the **[b]** tags. Or you can write your text first, then select what you want to change (for example select your text and click on **B** to set it bold). -![ShareExample](en/ShareExample.gif) - -And here is the result -![ExamplePreview](en/ExamplePreview.png) - ---- - -## Code button -This one needs some explanation. -If you have trouble with for example **bbcode**, and want to ask someone advise or maybe you want to give advise on how to write something, then you can the **code** button. It allows to show what you write in between **[code]my text[/code]** without it being rendered. Without this tag only the rendered version will be shown. - -Here is an example -![CodeExample](en/CodeeExample.gif) -As you an see, you can add the type of code you're writing. For example here, it is php: **[code=php]** - ---- - -## Adding something to the post - -With the next three buttons you can easily **attach a file** from your device, **insert a weblink** or **embed an image** from your photo album (the photo has to be in your folder before it can be added). -![AddButtons](en/AddButtons.png) -They are pretty self explanatory, so don't need further explanation. - -**Note**: If you want to embed an image without having to upload it first on one of your albums you can use the attach button and select an image from your device. If you're on a computer, you can also simply add your picture by dragging it directly in your post. - ---- - -## Options - -You can find the options on the next group of buttons. -![OptionButtons](en/OptionButtons.png) - -### The options are: -* **Set your location**: you are able to share your location with others. A popup opens asking you to set the location you want, so it's not using geolocalization ![compsing_location](en/Composing_location.png) -* **Set expiration date**: the post will auto destruct on the date set. -* **Set publish date**: the post will be published in a future date. -* **Encrypt text**: this let's you encrypt text. Therefore you need to set a passphrase and make sure the ones that you want to share with know the passphrase. -* **Toggle voting**: If you want others to vote for something. They will have those options ![voting](en/Voting.png) on your post when clicking on this icon. -* **Disabling comments**: if you don't want comments on your post. - - --- - -## Before sharing - -Before clicking on the **Share** button you may want to check the permissions and preview you post. These option are next to the **Share** button. -![BeforeSharing](en/BeforeSharing.png) - -### These options are: -* **Preview**: let you see a preview of your post. This preview appears just under your actual post. -* **Permission settings**: Here you choose with whom you share the post. Most of the time, you won't even click on that button as it is automatically set according to your channel role. However, you change who can see your post: to the public, to a group, more groups, or only one connection. You can also set it that one or several connections or groups are not allowed to view the post. YOU CAN'T CHANGE IT ONCE POSTED! -For more information it's recommended to visit [the permissions](../../permissions) section. - ---- - -## Markup languages -You can use BBcode or Markdown when composing a post or in a comment. You can also combine the codes. -Here is an example. - -![MarkupExample](en/MarkupExample.png) - -If you want to know more about bbcode you can visit the [Hubzilla help page](https://hub.disroot.org/help/en/member/bbcode). - ---- - -## Who can see my posts and where? -Well, it depends on a few things: your channel role, the permission settings of the post, the permissions you set for your connections, etc. - -Depending of these permissions: -- **Public** may see your posts in the **Public stream** or by visiting **your channel**. -- **Connections** may also see your posts in their **Network stream**. - ---- diff --git a/pages/10.DisHub/05.Posts/02.Tags_and_mentions/docs.en.md b/pages/10.DisHub/05.Posts/02.Tags_and_mentions/docs.en.md deleted file mode 100755 index 21d79574..00000000 --- a/pages/10.DisHub/05.Posts/02.Tags_and_mentions/docs.en.md +++ /dev/null @@ -1,64 +0,0 @@ ---- -title: Tags and mentions -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -Like many other platforms, Hubzilla uses a special notation inside messages to indicate "tags" or contextual links to other entities. - - -## Mentions -You can mention a person in a post, so that the mentioned channel receives a notification. Using @mentions will reproduce a copy of your post on the profile specified, as though you posted on the channel wall. - -!!! In the permission settings, **Can forward to all my channel connections via @+ mentions in posts.** must be allowed by a channel to be able to mention it. - -To use mention, simply add **@** before the channel name you want to mention. For example **@dishubuser**. - -You can mention someone using another protocol. For example to mention someone on mastodon: **@{username@mastodon.instance}** - -If you write the channel's name manually, if there are only one space in the channel's name, there will be no problem. So, **@Robert Johnson** will tag **Robert Johnson**. If there are more than one space, for example **Blind Lemon Jefferson**, you have to enclose the entire name in double quotes or change the spaces to underscores, **@"Blind Lemon Jefferson"** or **@Blind_Lemon_Jefferson**. - ---- - -## Deliverable Mentions -The deliverable mention is only used for forums or special channel. This means that when you use the deliverable mention your post will be posted on that channel's wall, but also to this Forum or Channel "network" (e.g. send to all the forum members; if you have permission to do so). - -The deliverable mention is done by adding **!** before the channel name, for example **!disroot+516**. Here to the auto-complete box will show. - -![DeliverableMention](en/DeliverableMention.gif) - ---- - -## Private Mentions -Like already seen in the [Composing](../composing) part, you can choose to restrict the viewing of a post to a single person or a number of people. You can do this by selecting channels or privacy groups from the privacy tool. But if you prefer you can also just tag them with a privacy tag. - -A **privacy tag** is an username preceded by the two characters **@!**, for example **@!dishubuser**. - -In addition to tagging these channels, this will also change the privacy permissions of the post so that only the mentioned channels will have permission to see the post. -![PrivateMention](en/PrivateMention.gif) - -You can have more than one privacy tag, for instance @!bob and @!linda will send the post only to Bob and Linda. This mechanism over-rides the privacy selector. - -**Forums** may be mentioned also by adding **!!** before the forum name. For example **!!dishub** will post to the Dishub forum privately. The forum will redeliver the post to all the forum members, but your own followers will not see the post unless they are also members of the Dishub forum. - -You may also **tag privacy groups** which are "public" with **@!Name_of_the_group**. When you create or edit a privacy group, there is a checkbox to allow the group members to be seen by others. If this box is checked for a group and you tag (for instance) **@!Friends**, the post will be restricted to the Friends group. Check that the group is public before doing this, as there is no way to take back a post except to delete it. The group name will appear in the post and will alert members of that group that they are members of it. - ---- - -## Mentions in comments -You can use mentions in comments. - -But using Deliverable or Private mentions has **no effect**, except that the mentioned channel may receive notification if they were already included as a recipient in the conversation. **TO BE CHECKED** - ---- - -## Topical Tags (also known as Hashtags) -You can set one or more topical tags. This will help others search for a specific topic. This is easily done by adding **#** before the topic. For example **#tutorial** - -**Note**: Topical tags are generally a minimum of three characters in length. Shorter search terms are not likely to yield any search results, although this depends on the database configuration. - -Topical tags are also not linked if they are purely numeric, e.g. #1. If you wish to use a numeric hashtag, please add some descriptive text such as **#2018-photos** diff --git a/pages/10.DisHub/05.Posts/03.Published_post_options/docs.en.md b/pages/10.DisHub/05.Posts/03.Published_post_options/docs.en.md deleted file mode 100644 index ed0f9015..00000000 --- a/pages/10.DisHub/05.Posts/03.Published_post_options/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Published Post options -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -When a post has been published, there are several options: diff --git a/pages/10.DisHub/05.Posts/docs.en.md b/pages/10.DisHub/05.Posts/docs.en.md deleted file mode 100755 index cc8af478..00000000 --- a/pages/10.DisHub/05.Posts/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Posts -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- -In this section we will see the different options you have when posting or commenting. -It's recommended to understand the different [permission roles](../permissions) first, so the posts are delivered to those who are meant to. diff --git a/pages/10.DisHub/06.Wiki/docs.en.md b/pages/10.DisHub/06.Wiki/docs.en.md deleted file mode 100644 index 01d1c87a..00000000 --- a/pages/10.DisHub/06.Wiki/docs.en.md +++ /dev/null @@ -1,156 +0,0 @@ ---- -title: Wiki -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -## What is a wiki? -A wiki is a type of website that lets anyone who can access the wiki to create and change its pages. - -The wiki is stored only on your channel's hub and must be accessed in traditional way using a static URL: it is not "delivered" not "federated". - - -## How to access a channel's wiki? -You can access a channel's wiki by going on this channel, then clicking on the hamburger menu and on the "Wiki" app logo. - -![wiki_access](en/Wiki_access.gif) - -If you don't see the wiki logo app, the this channel hasn't enable the wiki feature. - -Then, you need to open the wiki you want to access by simply clicking on its name. - -![wiki_open](en/Wiki_open.png) - -If you don't see any wiki, then this channel may have viewing restrictions or simply hasn't created any wiki yet. - - -## Enable wiki creation -### 1st step: enable the wiki feature -If you want to be able to use the wiki feature, you have to enable it first. To do so, go to your channel **Settings**, click on the **Aditionnal features** tab. - -To see be able to enable the wiki feature, you need to set your skill to at least **"2. Intermediate..."**. (You can see any other level superior to 2) - -You will see the wiki feature in the **General Features** tab. Just click on **On** to enable it and *Submit*. - -![wiki_enable01](en/Wiki_enable_features.gif) - -Now your wiki is accessible at this address: https://hub.disroot.org/wiki/your_channel_name - -If you don't want to use this feature anymore, just do the opposite! - -You can disable this feature by doing the opposite. - -### 2nd step: enable the wiki app? (optional) -As explained just above, you wiki is accessible at this address: https://hub.disroot.org/wiki/your_channel_name - -However, you may want other people (or even yourself!) to be able to access your wiki easier. It can be done by enabling the wiki app. Like this, people visiting your channel will be able to go to your wiki by clicking the hamburger menu and selecting "wiki". - -![wiki_access](en/Wiki_access.gif) - -To do so, click on the **hamburger menu** and select **Add apps**. Go down to the wiki app and enable it by **clicking on its star**. You will now be able to see it in the hamburger menu (sometimes, you need to refresh the page so that the app appears in the menu). - -![wiki_enable_app](en/Wiki_enable_app.gif) - -If you don't want to use this app anymore, just do the opposite! - - -## Create a wiki and its content -### Create a wiki -You can go to your wiki page either by going to its direct address: https://hub.disroot.org/wiki/your_channel_name or by using the hamburger menu. - -To create a wiki, simply click on **Create New** and fill in the information requested. - -![wiki_create](en/Wiki_create.gif) - -There are a few options: -- **Wiki name** -- **Content type**: Hubzilla supports several markup languages for advanced formatting of content. You can choose between *Markdown*, *BBcode* or *Text*. [If you want to know about the special BBcode for Hubzilla...](https://hub.disroot.org/help/en/member/bbcode#Hubzilla_specific_codes) -- **Lock content type**: when activated, this option will lock the way you can write wiki page to either *Markdown*, *BBcode* or *Text*. ![wiki_create_content_type](en/Wiki_create_content_type.png) -On this image, you can see that "my_wiki" isn't locked to any type of content, whereas "my_wiki2" can be written to markdown only and "my_wiki3" only in plain text. -- **Create a status post for this wiki**: if you activate this option, then a post will be created on your wall saying that a wiki has been created. -![wiki_post_message](en/Wiki_post_message.png) - -If there are some permissions set (see the following paragraph), there is lock icon next to your username. If you click on it, you'll see the channels that can see this post annd that you allowed to see your wiki. -![wiki_post_lock](en/Wiki_post_lock.gif) - -- There is also a **lock icon** next to *Submit* ![lock_icon](en/lock_icon.png). It allows you to decide who can see your wiki. It opens the ACL: Access Control List. [To have more information about permissions...](../permissions) - -If you want to change your wiki's name, go on your wiki list page. Click on the pencil icon, change the name of the wiki and *Submit*. -![wiki_change_name](en/Wiki_change_name.gif) - -If you want to change who can see it, click on the lock icon ![lock_icon](pages/10.DisHub/06.Wiki/en/lock_icon.png). - -### Create pages -To create a wiki page, go on your wiki list page, and on the left, there is the "Wiki Pages" panel. - -Click on **+ Add new page**. Choose a **page name**. You can click on **Options** to choose a **page content type** if you want. Click on *Submit*. - -![wiki_create_page](en/Wiki_create_page.gif) - -### Create content in pages -When you edit a page to add content, there are three tabs: **Edit**, **View**, **History**. -![wiki_edit](en/Wiki_edit.gif) - -In the **Edit page**, you write you text. Prior to saving page edits, you may enter a custom message to be displayed in the Page History viewer along with the revision. When you're done, click on **Save**. - -In the **View page**, you see what those that will be allowed to visit your wiki will see. - -In the **History page**, you have a list of the changes made on the page. You have the author name, the sort description of the change, and its date. You can compare what has been changed between the actual version and an older on by clicking on **Compare**. -The **Revert** button will load the selected revision but will not automatically save the page. - -**Work in Progress: problem with REVERT.** - - -## Wiki accessibility -### Who can see my wiki? -There are three of ways of managing who can see your wiki, three levels of permissions. - -#### Channel role -Depending on the channel role you chose, your wiki may be viewable by either anyone or the members of your Privacy group only. - -If you want anyone to be able to see your wiki pages, you have to make sure that you choose a role accordingly. [See the permissions page to know more...](05.Permissions) - -#### Connection permission -You can edit your connection permissions if you want to give/remove a specific permission the right to see your wiki. - -To get there, click on the **connections icon**, ![connection_icon](en/connection_icon.png), then click on **Edit** next to the connection you want to change permission with. Click on **Individual Permissions**. Check the **Can view my wiki pages** box to give that permission, and click on *Submit*. -![wiki_connections](en/Wiki_connection.gif) - -**Note**: if you choose a channel role that allows anyone to view your wiki, you can't change any permission in the channel permission settings. It is possible only if you chose a channel role that allows only members of your privacy group to see your wiki. Like this, you can give the right to see your wiki to connections that are not members of this group (but you also need to use the ACL, see the following section) - -#### Access Control List on wiki creation -When you create a wiki, you can restrain who can see it. There is a **lock icon** ![lock_icon](en/lock_icon.png). It allows you to decide who can see your wiki. It opens the ACL: Access Control List: -![wiki_ACL](en/Wiki_ACL.gif) - -**Note**: if you choose a channel role that allows only Privacy group members to view your wiki, then, when you create a wiki, the visibility is per default only to this group ("Public" otherwise). But you can override that and make it visible to "Your default audience" or to connections that you previously allowed to view your wiki (see previous section). - -[To have more information about permissions...](../04.Permissions) - -### Who can edit my wiki? -#### Connection permission -There is only place where you can set who can edit your wiki: it is in the individual Connection page. To get there, click on the **connections icon**, ![connection_icon](en/connection_icon.png), then click on **Edit** next to the connection you want to change permission with. Click on **Individual Permissions**. Check/Uncheck the **Can write to my wiki pages** box to give/remove that permission, and click on *Submit*. -![wiki_connections](en/Wiki_connection.gif) - - -## How to share a wiki page? -You can share a wiki page in a post on hubzilla. To do so, go on the wiki page you want to share, click on the top-right share icon. It brings you to the post edition page. You can complete like any other posts that you would write. -![wiki_share](en/Wiki_share.gif) -Obviously, if your wiki as some restriction on viewing permissions, the viewers of your post may not be able to access the wiki page. - - -## How to download a wiki? -You can download a wiki with all its files on your computer by going on the wiki page and clicking on the save icon ![wiki_save_icon](en/Wiki_save_icon.png). It will create a .zip file. -![wiki_save](en/Wiki_save.png) - -## How to delete? -### Delete a whole wiki -Go our the your wiki page. You see the list of all your wikis. Simply click on the trash can. -![wiki_delete](en/Wiki_delete.png) - -### Delete a page -On the "Wiki Pages" panel, if you move you mouse over the pages names, you'll see a trash can appearing. Click on it to remove the page. -![wiki_delete_page](en/Wiki_delete_page.png) diff --git a/pages/10.DisHub/07.Features/docs.en.md b/pages/10.DisHub/07.Features/docs.en.md deleted file mode 100755 index 6e0421c4..00000000 --- a/pages/10.DisHub/07.Features/docs.en.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -title: Features -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -
diff --git a/pages/10.DisHub/docs.en.md b/pages/10.DisHub/docs.en.md deleted file mode 100755 index c0ba5d51..00000000 --- a/pages/10.DisHub/docs.en.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -title: DisHub -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -# **DisHub: Disroot's Hubzilla instance** Howto pages. - -[**Hubzilla**](https://project.hubzilla.org/page/hubzilla/hubzilla-project) is a powerful, free and open source software to create decentralized and federated web platforms which includes webpages tools, wikis, forums, cloud storage, social networks and more. Any attempt to accurately define Hubzilla may end up being inadequate.
-While it shares similarity with other web services software, **Hubzilla** offers some very particular features that no others do, like full and precise permission system that gives you control about the privacy of the information and content you may share; nomadic identity (which means you own your online identity and can take/migrate it across the network, no matter the hubs, instance, servers); multiple profiles and channels; account cloning; among other features. - -At **Disroot**, we think it’s an awesome piece of software and that everybody should try it because of its potential and the power it’s giving to decentralization and federation services. So we built **DisHub**, the **Disroot’s Hubzilla instance**. But, due to the amount of features, apps, services and user control settings, and because Hubzilla is beyond comparison, it may be kind of difficult until you fully get it. That’s why we made this Howto. - -Think of Hubzilla as your new digital house: You have many rooms that you can arrange and decorate as you want, it’s your place to talk and share whatever you want with the people you want. And more than that, because you can even take your home wherever (other hubzilla instances) you want. - -So, exercise your freedom, your imagination and welcome to DisHub. - -*We can only show you the door. You're the one that has to walk through it...* - - - -![](en/round_logo.png) diff --git a/pages/11.Contribute/docs.en.md b/pages/11.Contribute/docs.en.md deleted file mode 100755 index c66ad22a..00000000 --- a/pages/11.Contribute/docs.en.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -title: Contribute -published: true -taxonomy: - category: - - docs -page-toc: - active: false ---- - -This section is dedicated to help all those awesome people who decided to aid us with contributions to translations and creating tutorials. -Here we will put basic info and guidelines to make this collaboration as smooth and painless as possible. - - -![](contribute.png) diff --git a/pages/11.Contribute/how-to-use-git/docs.en.md b/pages/11.Contribute/how-to-use-git/docs.en.md deleted file mode 100755 index e46a5127..00000000 --- a/pages/11.Contribute/how-to-use-git/docs.en.md +++ /dev/null @@ -1,105 +0,0 @@ ---- -title: How to Use Git to contribute to disroot howtos -published: true -visible: true -taxonomy: - category: - - docs ---- - -This article will try to explain the basics of using git to contribute to translations as well as submitting new tutorials. - -In order to follow all the changes and work with multiple people at the same time, we have chosen to use **git** as our version control system. Git is very popular tool among developers and system administrators but it's features can be easily applicable everywhere where history of changes and ability to submit content and collaborate in a group is required. - - -In this tutorial we will not cover all the aspects of using git. It's very complex and powerfull tool with tons of in-depth tutorials and books written about it. What we are aiming at is providing a short and easy way to contribute to tutorials and translations. - -# How to Create account on git instance -First of you need an account on the git instance used by disroot.org. Unfortunately git is not yet a federated service so you need to have a account. Thanks to our friends at **FOSS Community India** we host all our work on their gitlab instance. -To create an account just go over to https://git.fosscommunity.in and register. Additionally to registering new account you can choose to use one of the ID providers such as gitlab.com, github, twitter, gitbucket, google given you have already an account on one of those platforms. - -# Installing Git -Since all the modifications will happen on your local machine, you need to [install git](https://gist.github.com/derhuerst/1b15ff4652a867391f03) to be able to send your changes as well as sync changes of others. Depending on your platform the ways to install git may vary so check the link above or refer to your platform specific documentation. - -# Installing Atom editor -If you haven't yet, it's time to install [Atom](https://atom.io). Atom is a feature rich text editor with special git integration. If your Operating system is not automatically detected or listed when going to [Atoms](https://atom.io) website, check [Other platforms](https://github.com/atom/atom/releases/latest). For all Arch users, you can simply install it using `pacman -S atom` or other package manager of your choice. - -# Cloning repository -Git is created with collaboration in it's core. First thing we need to do is get a copy of all files within the project (git repository) onto your local harddrive. All modifications are done on your local machine (you work offline). Only when you decide, the changes (new tutorial, translation) are finished you can decide to sent/sync (push) them back to the repository on the server. - -The easiest way to clone the repository is opening your terminal, navigating to the directory you would like to clone the repository to, and run `git clone ` command, where ** is basically the address of the repository you want to clone. In our case it would be: - -`git clone https://git.fosscommunity.in/disroot/howto` - -Once the repository is copied to your harddrive you will see a `howto` directory that consists all the file you could previously browse in your webbrowser when on our repository's url. - -You can move that directory later to any place on your harddrive you wish. - -# Request access to howto git repository -In order to be able to commit changes to disroots git repository, you need to request access. Once admins grant you the access, you can push your changes to the server (note that you can start working without access granted as all the changes happen on your local computer). - -![](en/git-request_access.png) - -# Now the work can begin. -Now you can start Atom and `Open Folder` that you just cloned (*howto*). The interface of Atom is clean and easy to understand. The left sidebar is your project's navigation tree, the middle window is where you edit files and bottom bar indicates number of changed files, current branch, quick pull/push to git. - -![](en/atom1.png) - -You can open and work on multiple files in tabs or as split screen side by side. -Unsaved files with local modifications are marked with a blue dot (depending on the theme you use of course) -To save the file changes use the *File* menu or *Ctrl+s* shortcut. - -**But** before you start working on files you need to create your own: **branch** - -# Git Branches -Branches are basically your own private workspaces. Each git project has it's own **master** branch. Master branch is the main, *production* copy of the project. This branch is automatically synced with the website, so any change made to that branch are instantly visible on the website. That is also why adding any changes to the **master** branch is restricted only to the owners of the project. -In order for you to start working is, create your own branch. This will basically make a clone of the **master** branch. - -![](en/atom-branch1.gif) - -Switching between branches can also be done from that menu. Current working branch is visible on the bottom bar. - -![](en/atom-branch2.gif) - -Once branch is created and changed, you can create new files, modify existing ones etc. - -# Commiting your changes -Hokay, so you're working on your computer creating new tutorials or translating existing ones. Apart from saving changes to your laptop, you can/should also commit your changes. Commiting changes syncs the work you've done on your branch to the git server. If the branch does not exist on the server, it will be created and all your modifications and new files will be uploaded to the server. In that case you can work on your files on multiple machines, or other people can take over, help working on your branch. - -To commit your changes need to: - - make sure all files are saved - - stage all the files you've modified and want to commit to the server - - Write a commit message - write short summary of what has been changed (not too long), - - Hit commit button - ![]() - Once files are commited, it's time to push them to the server: - - Open push/pull popup window - - Press push - -# Merge request -Once you think your work is finished and ready to be published on the website, its time to merge it to the **master branch**. - -- First of course you need to make sure all the changes are commited. -- Login to https://git.fosscommunity.in -- if you pushed any changes to the server on your branch, in the top right you will see **"Create Merge Request"** button -- This will open Merge request form. -- Add title -- Add descripton -- make sure **source branch** is the one you want to merge from (one you worked on) -- make sure **target branch** is the one you want to merge to (usually master branch) - -![](en/git-merge_request.gif) - -Once you created merge request, it will be reviewed by Disroot admins. Admins can then aprove your commit which means it will be merged with the master branch and therefor visible on the website or request you to correct something. Once all the corrections are made and Disroot *"overlords"* are satified, your merge request will be pulled to the master. - -# Pulling changes from the server -If you want to keep the local **master** branch and your local branch up to date, you need to pull changes from the server. Each time someones gets his merge request pulled in to the master, everyone should also pull the changes to their local branches. Then you can easily see what's new and what has changed recently. On the master branch we keep a file called "CHANGELOG" where we note all significant changes to Howtos. -Pulling should be done on regular basis (specially before you start working on new branch). - - - Open push / pull popup window - - Press **pull** - - -# Some vocabulary and explanation - -**git repository** - Directory that consists all the files belonging to the project