Compare commits

...

250 Commits
2.1 ... master

Author SHA1 Message Date
tolstoevsky 1d2b6f7ccb Добавлен Lemmy - asocial.thedroth.rocks 2023-12-04 14:56:17 +03:00
tolstoevsky 204bbffb68 Update 'README.md' 2023-03-19 14:45:40 +03:00
Tolstoevsky e52252cbc6 social.html - Убрал phreedom.club (регистрация закрывается) 2023-01-03 15:02:33 +03:00
Tolstoevsky c9db890ce2 mk 2022-11-23 18:55:52 +03:00
Tolstoevsky b91d978d3c Убрал Плерому пока, до улучшения ситуации 2022-11-23 18:53:51 +03:00
tolstoevsky b01d96c8a3 Merge pull request 'copyleft sign added' (#15) from modifications into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/15
2022-11-09 10:21:04 +03:00
Tolstoevsky ed596d75c4 copyleft sign added 2022-11-09 10:19:40 +03:00
tolstoevsky 05dde7c826 Merge pull request 'Поправил лицензию на CC-BY-SA, добавил копилефт в футер заглавной страницы' (#14) from modifications into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/14
2022-11-05 19:25:01 +03:00
Tolstoevsky ac1fa9ecb1 Поправил лицензию на CC-BY-SA, добавил копилефт в футер заглавной страницы 2022-11-05 19:23:19 +03:00
tolstoevsky bebeaf4ecb Merge pull request 'modifications' (#13) from modifications into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/13
2022-10-22 11:08:08 +03:00
tolstoevsky 4feb62a939 Merge pull request 'Дополнения, исправления' (#12) from Timur/fedi:master into modifications
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/12
2022-10-22 11:05:32 +03:00
Timur Sagdenov 8eb4ca5785 Добавлены Misskey, Bookwyrm и zhub.link 2022-10-21 18:45:59 +03:00
Timur Sagdenov 852ce96b3b Добавлены Castopod и Owncast 2022-10-21 18:45:11 +03:00
Timur Sagdenov 173c070312 Добавлены Misskey, Bookwyrm, мелкие исправления 2022-10-21 15:06:35 +03:00
Timur Sagdenov 5cd9779c8a Убран пробел в PicniCSS 2022-10-21 15:03:21 +03:00
Timur Sagdenov 423cd58108 Добавлены Owncast, Castopod, исправление изображения Funkwhale 2022-10-21 15:02:08 +03:00
Timur Sagdenov 44a83085d2 Убран пробел в PicniCSS 2022-10-21 14:59:20 +03:00
Timur Sagdenov 812ca28612 Убран пробел в PicniCSS 2022-10-21 14:58:20 +03:00
Timur Sagdenov fe26c3fa90 images
Added images of bookwyrm, castopod, misskey , owncast.
2022-10-21 14:55:47 +03:00
tolstoevsky e3988ccab7 Merge pull request 'zhub' (#11) from modifications into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/11
2022-10-21 12:38:51 +03:00
Tolstoevsky 5dd0b70087 zhub 2022-10-21 12:37:02 +03:00
tolstoevsky b63284be65 Merge pull request 'modifications' (#10) from modifications into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/10
2022-10-17 21:14:16 +03:00
Tolstoevsky 79a9007181 flokinet banner 2022-10-17 21:11:46 +03:00
tolstoevsky f420ae27c5 Merge pull request 'Дополнение о мультимедиа и Lemmy' (#9) from Timur/fedi:master into modifications
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/9
2022-10-17 21:02:08 +03:00
Timur d18569449d Мультимедиа
Сюда перенесён PeerTube и добавлен Funkwhale.
2022-10-14 15:37:07 +03:00
Timur 770353c3ce Ссылки, Lemmy
Добавлена ссылки на мультимедиа. Раздел с PeerTube перенесён в мультимедиа. Добавлен Lemmy.
2022-10-14 15:36:29 +03:00
Timur b902e7d0cd Ссылка на мультимедиа 2022-10-14 15:30:03 +03:00
Timur f04a07789e Ссылка на мультимедиа 2022-10-14 15:29:38 +03:00
Timur e8f7220c46 Ссылка на мультимедиа 2022-10-14 15:29:15 +03:00
Timur e671ca10a6 Ссылка на мультимедиа 2022-10-14 15:28:42 +03:00
Timur 90c28fd9dc Ссылка на мультимедиа 2022-10-14 15:28:16 +03:00
Timur 32c04e3993 Ссылка на мультимедиа 2022-10-14 15:27:50 +03:00
Timur abe4d54147 Мультимедиа
Сюда перенесён PeerTube и добавлен Funkwhale.
2022-10-14 15:26:54 +03:00
Timur 058612f0e4 Ссылки, Lemmy
Добавлена ссылки на мультимедиа. Ссылка на облегчённую версию сайта перенесена в конец страницы. Раздел с PeerTube перенесён в мультимедиа. Добавлен Lemmy.
2022-10-14 15:26:06 +03:00
Timur 9e46825480 Ссылки
Добавлена ссылки на мультимедиа. Ссылка на облегчённую версию сайта перенесена в конец страницы.
2022-10-14 15:24:46 +03:00
Timur b0c5cd1069 Ссылки
Добавлена ссылки на мультимедиа. Ссылка на облегчённую версию сайта перенесена в конец страницы.
2022-10-14 15:23:48 +03:00
Timur 837430eb61 Ссылки
Добавлена ссылки на мультимедиа. Ссылка на облегчённую версию сайта перенесена в конец страницы.
2022-10-14 15:23:01 +03:00
Timur 4ee4e1d12f Ссылки
Добавлена ссылки на мультимедиа. Ссылка на облегчённую версию сайта перенесена в конец страницы.
2022-10-14 15:22:13 +03:00
Timur 00bb430e2f Ссылки
Добавлена ссылка на мультимедиа. Ссылка на облегчённую версию сайта перенесена в конец страницы.
2022-10-14 15:20:43 +03:00
Timur 9fa8e9e926 Ссылки
Добавлена ссылка на мультимедиа. Ссылка на облегчённую версию перенесена в конец страницы.
2022-10-14 15:19:36 +03:00
Timur 02cd8b3677 Скриншоты Funkwhale и Lemmy 2022-10-14 15:17:28 +03:00
tolstoevsky 26f0811da1 soc.ua-fediland.de (nocss) 2022-06-08 13:39:39 +03:00
tolstoevsky d9e21cf46f soc.ua-fediland.de 2022-06-08 13:38:29 +03:00
tolstoevsky e8ca14ffa1 Disroot больше не предоставляет под Diaspora* 2022-05-31 12:31:49 +03:00
tolstoevsky 7bcef17247 Merge pull request 'Исправил оформление, добавил приложение Nomad для Hubzilla' (#7) from Timur/fedi:modifications into modifications
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/7
2022-05-31 12:18:25 +03:00
Timur 3b813fc161 Добавлено приложение Nomad для Hubzilla 2022-05-28 18:51:32 +03:00
Timur e71d0a538e Добавлен недостающий разрыв 2022-05-28 18:48:28 +03:00
Timur e2d5a945a6 Актуализация информации
Усманов уже вне Mail.ru Group, а Mail.ru Group переименована в VK
2022-05-28 18:46:14 +03:00
Timur ca5ba0cb31 Убрана странная стрелочка рядом с карточкой Disroot 2022-05-28 18:39:55 +03:00
Timur 8120509b2d Добавлено приложение Nomad для Hubzilla 2022-05-28 18:32:28 +03:00
Timur a667f13f26 Меню
На смартфонах боковое меню отображалось как "menu", а на остальных страницах как "меню".
2022-05-27 18:37:45 +03:00
Timur 3452d5a034 Исправления ссылок
Исправлены ссылки на изображения.
Исправлена ссылка на ТТ.
2022-05-27 18:35:25 +03:00
tolstoevsky 0fc308b978 Merge pull request 'Исправил оформление, добавил агрегаторы' (#6) from Timur/fedi:modifications into modifications
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/6
2022-05-26 22:21:42 +03:00
Timur fc50dbc0a7 Добавлены каталоги узлов
В качестве каталогов добавлены fedidb.org, ru.index.community, fediverse.party
2022-05-24 19:32:45 +03:00
Timur 548ed18606 Ссылка на список агрегаторов 2022-05-24 19:31:42 +03:00
Timur a2f43f2396 Добавлены каталоги узлов
В качестве каталогов добавлены fedidb.org, ru.index.community, fediverse.party
2022-05-24 19:21:56 +03:00
Timur 71885d923b Ссылка на список агрегаторов 2022-05-24 19:15:54 +03:00
Timur 94c5d624db Merge pull request 'master and modification sync' (#1) from master into modifications
Reviewed-on: https://gitea.phreedom.club/Timur/fedi/pulls/1
2022-05-24 18:30:27 +03:00
Timur f6c5eb5961 Исправлено выравнивание 2022-05-22 10:05:12 +03:00
Timur cbabbbad2e Исправлено оформление
Заголовок "Pleroma - альтернативный вариант" выровнен так же, как остальные заголовки. Убран лишний разрыв.
2022-05-22 10:02:41 +03:00
Tolstoevsky 490ed9ad5d Убрал fediverse.observer - там мало того, что рекомендуется умирающая Диаспора и нет плеромы, так ещё языки определяются неверно и исправить вручную нельзя 2022-05-19 07:24:13 +03:00
Tolstoevsky 1c92fc6be1 Дополнительный текст италиком и мелким шрифтом 2022-05-19 07:17:32 +03:00
Tolstoevsky 43bfd300bd Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-18 14:55:50 +03:00
tolstoevsky ee0baaa7e6 Merge pull request 'Fediverse Observer' (#3) from unixoid/fedi:master into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/3
2022-05-18 14:54:49 +03:00
Линуксоид 5d4c00e7cf Fediverse Observer 2022-05-18 13:33:46 +03:00
Tolstoevsky c7453aa0b8 Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-16 20:44:03 +03:00
tolstoevsky 1c2523d3a8 Merge pull request 'tt link fixed (nocss)' (#2) from Timur/fedi:master into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/2
2022-05-16 20:43:47 +03:00
Timur 5974942c0d tt link fixed 2022-05-16 19:05:46 +03:00
Timur 505bdb4097 tt link fixed 2022-05-16 19:05:20 +03:00
Timur 0aca00a8a7 Изменил(а) на 'nocss/search.html' 2022-05-16 19:05:06 +03:00
Timur ea803e73bb Изменил(а) на 'nocss/search.html' 2022-05-16 19:03:27 +03:00
Timur 8abc4f2222 tt link fixed 2022-05-16 19:03:08 +03:00
Timur bfd961cfd5 tt link fixed 2022-05-16 19:02:38 +03:00
Timur 4809e594b9 tt link fixed 2022-05-16 19:02:09 +03:00
Timur caff37cd6c tt link fixed 2022-05-16 19:00:08 +03:00
Timur 322f9c7f2d tt link fixed 2022-05-16 18:59:32 +03:00
Tolstoevsky 7f4b4293e8 Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-16 17:41:41 +03:00
Tolstoevsky a2dbb09674 nocss updated 2022-05-16 17:41:30 +03:00
Tolstoevsky 2b47c0d376 Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-16 17:40:01 +03:00
tolstoevsky 0ad39ec2df Merge pull request 'mstdn.netwhood.online deleted, zhub.link replaced (nocss)' (#1) from Timur/fedi:master into master
Reviewed-on: https://gitea.phreedom.club/tolstoevsky/fedi/pulls/1
2022-05-16 17:31:56 +03:00
Tolstoevsky 5e603466b3 Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-16 17:29:49 +03:00
Tolstoevsky 48f1d345ef pleroma - list fixed 2022-05-16 17:29:37 +03:00
Tolstoevsky 4ee3083835 readme - tt link fixed 2022-05-16 17:22:42 +03:00
Tolstoevsky 5dc1f9e988 Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-16 17:18:52 +03:00
Tolstoevsky 95bada02af trash 2022-05-16 17:18:42 +03:00
Tolstoevsky 91c6afb4d7 Merge branch 'master' of https://gitea.phreedom.club/tolstoevsky/fedi 2022-05-16 17:18:13 +03:00
Tolstoevsky 861188be83 pleroma screenshot, hubzilla 2022-05-16 17:18:00 +03:00
Timur 6176a9379b Merge pull request 'mstdn.netwhood.online deleted, zhub.link replaced' (#1) from timur-patch-1 into master
Reviewed-on: https://gitea.phreedom.club/Timur/fedi/pulls/1
2022-05-16 16:58:06 +03:00
Timur 28d93ed0d8 mstdn.netwhood.online deleted, zhub.link replaced
Now mstdn.netwhood.online doesn't exist, so it was deleted. There is qoto.org on fedi.life/social.html, so zhub.link was replaced to qoto.org.
2022-05-16 16:55:13 +03:00
Tolstoevsky 2a1b8c7788 Merge remote-tracking branch 'refs/remotes/origin/master' 2022-05-16 16:29:41 +03:00
Tolstoevsky 3f71d5ad3e social 2022-05-16 16:29:37 +03:00
Tolstoevsky cec3edc40d tt link fixed 2022-05-16 16:28:52 +03:00
Tolstoevsky 7e6d625653 justify 2022-05-16 15:28:41 +03:00
Tolstoevsky 58664842f5 pleroma added 2022-05-16 15:22:36 +03:00
Tolstoevsky ec38f716a4 pixelfed 2022-03-11 19:34:53 +03:00
Tolstoevsky 2eb1542ee9 Zhub.link removed for nazism 2022-03-10 21:30:20 +03:00
Tolstoevsky 882cf73c49 nerdica removed for nazism 2022-03-10 21:21:04 +03:00
Tolstoevsky b957f70922 XMPP servers changed (nocss version) 2022-01-27 10:29:08 +03:00
Tolstoevsky 801ec4b236 XMPP servers changed 2022-01-27 09:50:51 +03:00
tolstoevsky fce85023c1 Merge branch 'modifications' of tolstoevsky/fedi into master 2022-01-12 07:31:51 +00:00
tolstoevsky d7f46e5327 Merge branch 'fixes' of notvertino/fedi into modifications
Спасибо, мержу
2022-01-12 07:11:39 +00:00
Orin Serimon bf5e9f8251 исправления опечаток 2022-01-12 00:58:44 +07:00
Tolstoevsky 0cc4746797
new branch for changes 2022-01-08 20:34:37 +03:00
Tolstoevsky 2aa9905c72
LICENCE fix - CC0 2022-01-08 20:13:57 +03:00
Tolstoevsky 8991d2d181 video removed 2021-12-15 09:51:53 +03:00
Tolstoevsky 621b8996e2 netwhood is dead 2021-12-08 08:47:10 +03:00
Tolstoevsky 84f5d9d09d search.fedi is no searx nomo 2021-11-30 10:24:05 +03:00
Tolstoevsky eb1ca74588 nocss 2021-11-01 12:56:33 +03:00
Tolstoevsky 01d055941e nocss 2021-11-01 12:53:06 +03:00
Tolstoevsky ad8bbedcce png to webp 2021-10-13 08:46:39 +03:00
Tolstoevsky edce956bbb png to webp 2021-10-13 08:39:41 +03:00
Tolstoevsky 556f1f18c5 Merge pull request 'Обновление пригласительной страницы' (#30) from LibreHacker/switching:master3 into master
Reviewed-on: https://git.macaw.me/Tolstoevsky/fedi/pulls/30
2021-09-12 07:50:52 +00:00
LibreHacker cd06d7f07e blabber.im - удалён. Добавлена рекомендация Conv6ations. Клиент для Windows был изменён на UWPX. 2021-09-11 21:49:12 +03:00
Tolstoevsky 1f9911d1e5 typo 2021-09-09 09:56:20 +03:00
Tolstoevsky 93ef9f21c8 shad0w xmpp added 2021-07-12 08:25:10 +00:00
Tolstoevsky 481c647c2c blabber is dead 2021-07-12 08:23:01 +00:00
Tolstoevsky 1598d1afbf стилистические правки, актуализация ссылок 2021-06-18 12:00:53 +03:00
Tolstoevsky dd9576871f typo 2021-05-30 07:55:58 +00:00
Tolstoevsky 446dd6f9d0 TT link added 2021-05-23 14:54:12 +00:00
Tolstoevsky b9a6237512 404 2021-04-25 18:54:37 +00:00
Tolstoevsky 3301762773 rawtext.club replaced 2021-04-25 13:52:37 +00:00
Tolstoevsky 5514e2d0f8 extra 2021-03-20 07:45:34 +00:00
Tolstoevsky 3150ec46ad Lor.sh removed for using CloudFlare MITM 2021-03-13 18:52:54 +00:00
Tolstoevsky 5286c5e02e замена видео 2021-02-06 21:07:56 +01:00
Tolstoevsky bbf5e0ff06 Merge pull request 'fix images' (#29) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/29
2021-02-02 13:13:02 +00:00
Tolstoevsky 13abedfdcd resize 2021-02-02 14:11:47 +01:00
LibreHacker 56491c3fc1 fix images 2021-02-02 16:08:52 +03:00
Tolstoevsky 3082fedd6d resize 2021-02-02 14:01:23 +01:00
Tolstoevsky a5da799fba Merge pull request 'fix Android' (#28) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/28
2021-02-02 12:55:23 +00:00
LibreHacker a217839253 fix Android 2021-02-02 15:53:54 +03:00
Tolstoevsky 0add89cf3b Merge pull request 'add Dino, update Android' (#27) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/27
2021-02-02 12:19:56 +00:00
LibreHacker ee7cc2941c add Dino, update Android 2021-02-02 15:11:08 +03:00
Tolstoevsky 40ad76f311 ava 2021-01-19 07:33:08 +01:00
Tolstoevsky aad7a981e3 Оптимизация изображений, видео с Историей 2021-01-11 18:21:05 +03:00
Tolstoevsky 497d9ee1c4 Merge pull request 'fix footer' (#26) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/26
2021-01-10 18:16:23 +00:00
LibreHacker 158ad3e9f2 fix footer 2021-01-10 21:12:29 +03:00
Tolstoevsky b9568c42e6 Merge pull request 'test center' (#25) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/25
2021-01-10 18:08:02 +00:00
LibreHacker 6d6b880a85 test center 2021-01-10 21:03:03 +03:00
Tolstoevsky 6b0f31ce6e Merge pull request 'fix css' (#24) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/24
2021-01-10 17:49:44 +00:00
LibreHacker cb93431db2 fix css 2021-01-10 20:42:14 +03:00
Tolstoevsky 9d85558474 Merge pull request 'qrcode' (#23) from LibreHacker/switching:master3 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/fedi/pulls/23
2021-01-10 17:31:31 +00:00
LibreHacker b86b6bcac4 qrcode 2021-01-10 20:13:40 +03:00
Tolstoevsky b99ebf2c10 - tutanota, + disroot 2021-01-04 13:34:39 +01:00
Tolstoevsky 3e90c22580 Update 'i/json/clients_Android.json' 2021-01-03 08:25:27 +00:00
Tolstoevsky 5fb9d9e82f Update 'i/lang/ru.json' 2021-01-03 08:21:40 +00:00
Tolstoevsky 6519f32e72 tutanota out 2021-01-01 08:42:13 +01:00
Tolstoevsky 5062da38dc Update 'README.md' 2020-12-31 07:13:51 +00:00
Tolstoevsky 5e68b22a87 Update 'README.md' 2020-12-31 06:55:42 +00:00
Tolstoevsky c4742a81f9 Update 'i/json/clients_Android.json' 2020-12-28 07:46:44 +00:00
Tolstoevsky 18652153bc menu, jabber 2020-12-27 18:42:38 +01:00
Tolstoevsky d7eb449918 jabber 2020-12-20 10:53:03 +01:00
Tolstoevsky 6145bb9db2 jabber 2020-12-20 10:43:52 +01:00
Tolstoevsky 46021fd437 pixfed 2020-12-20 08:36:36 +01:00
Tolstoevsky a19e52fdda CC0 2020-12-08 10:45:37 +03:00
Tolstoevsky 65e12a9bb0 Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-12-08 08:43:19 +01:00
Tolstoevsky ee4f621c7f CC0 2020-12-08 10:43:08 +03:00
Tolstoevsky 1e1c063f07 Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-12-08 08:41:42 +01:00
Tolstoevsky 49af5090d0 CC0 2020-12-08 10:39:25 +03:00
Tolstoevsky 1fba2b5c41 CC0 2020-12-08 08:35:49 +01:00
Tolstoevsky bae66a98f5 Update 'extra.html' 2020-12-08 07:30:07 +00:00
Tolstoevsky 6df7a8df16 Merge pull request 'improve' (#21) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/21
2020-11-28 13:26:25 +00:00
LibreHacker 49bf59e094 improve 2020-11-28 15:21:55 +03:00
Tolstoevsky 3693f8cdc9 Merge pull request 'fix Pix-Art Messenger' (#20) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/20
2020-11-20 06:13:09 +00:00
LibreHacker 65507bc37d fix Pix-Art Messenger 2020-11-19 23:24:36 +03:00
Tolstoevsky 8b45c738ec removed phreedom.tk and tolstoevsky.ml 2020-11-19 10:44:55 +01:00
Tolstoevsky c93d8ecdb9 menu fontsize 2020-11-13 12:42:43 +01:00
Tolstoevsky 2b48fdb812 chat link 2020-10-23 13:58:08 +02:00
Tolstoevsky 8883a07ef1 tk 2020-10-22 15:50:50 +02:00
Tolstoevsky 07b35abfdc fixes 2020-10-16 14:20:43 +02:00
Tolstoevsky d84a96d666 menu 2020-10-15 13:21:56 +02:00
Tolstoevsky f200b55e45 Upload files to '' 2020-10-15 11:19:36 +00:00
Tolstoevsky 83ee6b87b6 Upload files to '' 2020-10-15 11:19:15 +00:00
Tolstoevsky 44a7e08710 Upload files to 'css' 2020-10-15 11:17:54 +00:00
Tolstoevsky be89b62603 Upload files to ''
fixes by SyberiaBreadFactory
2020-10-15 11:17:26 +00:00
Tolstoevsky fb29fe1e26 fixes 2020-10-15 11:39:31 +02:00
Tolstoevsky 29513f5968 Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-10-15 09:58:51 +02:00
Tolstoevsky b419550ab1 Merge pull request 'redesign' (#19) from redesign into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/19
2020-10-15 07:58:35 +00:00
Tolstoevsky 5428d7c6f1 Merge branch 'master' into redesign 2020-10-15 07:58:28 +00:00
Tolstoevsky cf37c0e08b redesign 2020-10-15 10:55:17 +03:00
Tolstoevsky 9c7d88dcfc Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-10-12 13:42:44 +02:00
Tolstoevsky 5a45ac8a3d Merge pull request 'update i' (#18) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/18
2020-10-11 15:23:16 +00:00
LibreHacker cb5bb114c6 fix f-droid 2020-10-11 15:51:51 +03:00
LibreHacker 599ab369ff fix win 2020-10-11 13:54:28 +03:00
LibreHacker d9406c6cea fix 2020-10-11 13:51:12 +03:00
LibreHacker 9d0f09bee6 android fix 2020-10-11 13:45:37 +03:00
LibreHacker 2a20588215 update i 2020-10-11 13:38:57 +03:00
Tolstoevsky d6ab4c806d mail 2020-10-02 14:28:12 +03:00
Tolstoevsky 88ce180eb7 . 2020-09-29 15:59:33 +03:00
Tolstoevsky 295d398261 . 2020-09-29 15:05:26 +03:00
Tolstoevsky 263ded365f Переход на picnicss 2020-09-29 13:21:16 +03:00
Tolstoevsky 8e0ad38c59 Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-09-29 09:20:49 +02:00
Tolstoevsky a85dfc7005 chat.fedi.life removed 2020-09-29 09:52:08 +03:00
Tolstoevsky 51b91bf115 Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-09-16 21:01:46 +02:00
Tolstoevsky 1095cbd325 Update 'social.html' 2020-09-16 19:01:19 +00:00
Tolstoevsky 7a0f80e349 reg 2020-09-16 20:57:40 +02:00
Tolstoevsky db3b2b0ec2 phreedom.tk removed 2020-09-16 21:11:49 +03:00
Tolstoevsky 7d6e5c046d Merge branch 'master' of https://git.macaw.me/Tolstoevsky/switching 2020-09-16 08:02:03 +02:00
Tolstoevsky f5008e5117 images repaired 2020-09-16 08:01:27 +02:00
Tolstoevsky f9bd69441c про бекграунд мобильной менюшки надо будет что-то придумать другое. Цвет не катит — местами выглядит убого 2020-09-15 19:29:39 +03:00
Tolstoevsky 7b2130c678 Merge pull request 'fix menu for mobile' (#17) from LibreHacker/switching:master2 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/17
2020-09-15 16:07:27 +00:00
LibreHacker 420cf921f1 fix menu for mobile 2020-09-13 16:56:20 +03:00
Tolstoevsky e0c041f07f Merge pull request 'fixes' (#16) from LibreHacker/switching:master2 into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/16
2020-09-12 16:31:16 +00:00
LibreHacker 4c1a3d59d7 fixes 2020-09-12 16:03:26 +03:00
Tolstoevsky 5537112861 images optimized 2020-09-10 19:27:37 +03:00
Tolstoevsky ba368fb210 Merge pull request 'link to F-Droid' (#14) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/14
2020-09-07 11:53:28 +00:00
LibreHacker 730f02bd47 link to F-Droid 2020-09-04 21:36:32 +03:00
Tolstoevsky db13fab9dc Merge pull request 'Android, Linux' (#13) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/13
2020-09-03 04:56:52 +00:00
LibreHacker b7409ff038 fix design 2020-09-02 23:04:19 +03:00
LibreHacker 3817d03db3 Android, Linux 2020-09-02 22:39:09 +03:00
Tolstoevsky b42fa0a750 jabber.at replaced by blabber.im 2020-09-02 08:57:17 +02:00
Tolstoevsky b8c0d1fff4 history 2020-08-18 12:17:02 +02:00
Tolstoevsky 6bcb728288 fixes 2020-08-07 08:49:32 +02:00
Tolstoevsky 5a0e2a692b Merge pull request 'Pix-Art Messenger change to Conv6sations' (#12) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/12
2020-08-07 05:52:43 +00:00
LibreHacker 4cd6128974 Pix-Art Messenger change to Conv6sations 2020-08-06 22:19:11 +03:00
Tolstoevsky 65950d0766 Merge pull request 'fix iOS, Linux' (#11) from LibreHacker/switching:master into master
Reviewed-on: http://git.macaw.me:3000/Tolstoevsky/switching/pulls/11
2020-07-31 17:06:06 +00:00
LibreHacker 953605ee56 fix iOS, Linux 2020-07-31 17:10:49 +03:00
LibreHacker 72985c4cd5 new option 2020-07-26 12:09:46 +03:00
Tolstoevsky 01318d024c update Pix-Art Messenger (#10) 2020-07-25 12:31:49 +00:00
LibreHacker db94ac3369 update Pix-Art Messenger 2020-07-25 12:57:37 +03:00
Tolstoevsky b1247c0641 fixes (#9) 2020-07-24 12:13:21 +00:00
LibreHacker ab5a0185f0 fix 2 2020-07-24 12:59:31 +03:00
LibreHacker c64b7a0c84 fast fix 2020-07-24 12:39:07 +03:00
LibreHacker 416a92d6db fixes 2020-07-24 12:32:10 +03:00
Tolstoevsky b298c65cc8 Merge pull request 'Invitation' (#8) from LibreHacker/switching:master into master 2020-07-20 18:33:10 +00:00
LibreHacker e460220232 Little fix 2020-07-20 21:19:57 +03:00
LibreHacker a7b9824f97 Invitation 2020-07-20 21:13:12 +03:00
Tolstoevsky f2c86b68d9 font changed 2020-07-19 20:52:29 +02:00
Tolstoevsky ee4854796b banner 2020-07-08 13:44:45 +02:00
Tolstoevsky 727f5a5d3f im 2020-07-05 09:03:11 +02:00
Tolstoevsky 3a4b3339ff im 2020-07-05 09:01:33 +02:00
Tolstoevsky 288c925225 .ua is dead 2020-07-01 16:34:02 +02:00
Tolstoevsky c41a0199c9 info 2020-06-19 12:42:26 +02:00
Tolstoevsky 3850b13329
netwhood jabber 2020-06-03 09:01:33 +03:00
Tolstoevsky dbbd9558d1
favicon 2020-05-21 14:48:05 +03:00
Tolstoevsky 9a7e32495f
favicon 2020-05-21 14:41:26 +03:00
Tolstoevsky 09b828ee2e search.fedi.life 2020-05-08 08:55:25 +02:00
Tolstoevsky d29baedf94 fuck 2020-04-11 19:07:38 +03:00
Tolstoevsky 48f41db4a8 fuck 2020-04-11 19:06:38 +03:00
Tolstoevsky 8bf8d137d0 logo 2020-04-10 14:52:57 +03:00
Tolstoevsky fbd0d0195b logo 2020-04-10 14:49:44 +03:00
Tolstoevsky f0a6c71483 typo 2020-04-10 09:07:14 +02:00
Tolstoevsky d1cc8250c5 new agit 2020-04-10 08:57:59 +02:00
Tolstoevsky 783facbf31 chat.fedi.life 2020-04-09 20:54:20 +02:00
Tolstoevsky 29d4a15bf1 typo 2020-03-28 11:46:03 -07:00
tolstoevsky 29c344f4f0
zoom 2020-03-11 13:41:21 +03:00
tolstoevsky f67caa0721
zoom 2020-03-11 13:39:42 +03:00
tolstoevsky f7d2e1a460
no-js menu 2020-03-11 12:53:35 +03:00
tolstoevsky 6d0c85da0c
_blank 2020-03-11 11:46:22 +03:00
tolstoevsky 5dc852edf2
резиновость, новые скриншоты 2020-03-11 10:34:15 +03:00
tolstoevsky 936b615c74
начинаем облегчение дизайна, галерея убирается, в планах переписать меню 2020-03-10 15:26:42 +03:00
130 changed files with 3571 additions and 1496 deletions

View File

@ -0,0 +1,4 @@
This is a Brave Rewards publisher verification file.
Domain: fedi.life
Token: 2fbaaba9d30bf9c550567b59b100f76ed33a7ebcd1bfa285002d258568dd11f0

View File

@ -0,0 +1,4 @@
<!DOCTYPE html><html><head data-piwik-host="https://analytics.basicattentiontoken.org/"><meta name="csrf-param" content="authenticity_token" />
<meta name="csrf-token" content="eOanaeAcM83eQX35QInlZo/F/nxcispQ2nRY79U5XrTtWF0OBP51dCU+LnhsxDc9VdPh7jbQv/3SY3BEk0mdtA==" /><meta content="IE=edge" http-equiv="X-UA-Compatible" /><meta content="width=device-width, initial-scale=1" name="viewport" /><title>Earn more for content you publish to the web - Brave Creators</title>
<meta name="description" content="Viewers who use the Brave Browser may have contributed money to you while surfing the web through Brave Rewards. Simply sign up as a verified content creator on Brave Rewards to start collecting your contributions.">
<meta name="image" content="/preview.png"><script src="/packs/js/static-e90e47251bba1518cf610cec43d14d0af7d70d60.js" defer="defer"></script><link as="font" href="https://publishers.basicattentiontoken.org/assets/poppins/Poppins-Light-e90e47251bba1518cf610cec43d14d0af7d70d60.woff2" rel="preload" type="font/woff2" /><link as="font" href="https://publishers.basicattentiontoken.org/assets/poppins/Poppins-Medium-e90e47251bba1518cf610cec43d14d0af7d70d60.woff2" rel="preload" type="font/woff2" /><link rel="stylesheet" media="screen" href="/assets/static-e90e47251bba1518cf610cec43d14d0af7d70d60.css" /><link href="/assets/favicon-e90e47251bba1518cf610cec43d14d0af7d70d60.ico" rel="icon" type="image/png" /></head><body data-action="index" data-controller="static"><!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="manifest" href="/manifest.json"/><title>Earn more for content you publish to the web - Brave Creators</title><meta property="og:title" content="Earn more for content you publish to the web - Brave Creators"/><meta property="og:description" content="Viewers who use the Brave Browser may have contributed money to you while surfing the web through Brave Rewards. Simply sign up as a verified content creator on Brave Rewards to start collecting your contributions."/><meta property="og:image" content="/preview.png"/><meta property="og:type" content="website"/><meta property="og:url" content="https://creators.brave.com"/><link href="/static/css/main.304afe63.chunk.css" rel="stylesheet"></head><body><noscript><meta http-equiv="refresh" content="0;url=no_js"/></noscript><div id="root"><div class="full-page-loader"><picture><source srcset="./brave-logo-lion.webp" type="image/webp"/><source srcset="./brave-logo-lion.png" type="image/png"/><img width="80" src="./brave-logo-lion.png" alt="Brave"/></picture></div></div><style>.full-page-loader{display:flex;align-items:center;flex-direction:column;justify-content:center;position:absolute;top:0;right:0;left:0;bottom:0;background:linear-gradient(-45deg,#2a1fad 0,#a91b78 100%);background-size:150% 150%}</style><script>!function(e){function r(r){for(var n,l,a=r[0],i=r[1],f=r[2],p=0,s=[];p<a.length;p++)l=a[p],Object.prototype.hasOwnProperty.call(o,l)&&o[l]&&s.push(o[l][0]),o[l]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(c&&c(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,a=1;a<t.length;a++){var i=t[a];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=l(l.s=t[0]))}return e}var n={},o={1:0},u=[];function l(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,l),t.l=!0,t.exports}l.m=e,l.c=n,l.d=function(e,r,t){l.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},l.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},l.t=function(e,r){if(1&r&&(e=l(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(l.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)l.d(t,n,function(r){return e[r]}.bind(null,n));return t},l.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return l.d(r,"a",r),r},l.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},l.p="/";var a=this["webpackJsonpcreators-landing"]=this["webpackJsonpcreators-landing"]||[],i=a.push.bind(a);a.push=r,a=a.slice();for(var f=0;f<a.length;f++)r(a[f]);var c=i;t()}([])</script><script src="/static/js/2.5690c5c4.chunk.js" defer></script><script src="/static/js/main.dfc6a4b0.chunk.js" defer></script></body></html></body></html>

332
LICENSE
View File

@ -1,350 +1,170 @@
Creative Commons Attribution-ShareAlike 4.0 International Creative Commons Creative Commons Attribution-ShareAlike 4.0 International
Corporation ("Creative Commons") is not a law firm and does not provide legal
services or legal advice. Distribution of Creative Commons public licenses Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
does not create a lawyer-client or other relationship. Creative Commons makes
its licenses and related information available on an "as-is" basis. Creative
Commons gives no warranties regarding its licenses, any material licensed
under their terms and conditions, or any related information. Creative Commons
disclaims all liability for damages resulting from their use to the fullest
extent possible.
Using Creative Commons Public Licenses Using Creative Commons Public Licenses
Creative Commons public licenses provide a standard set of terms and conditions Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
that creators and other rights holders may use to share original works of
authorship and other material subject to copyright and certain other rights
specified in the public license below. The following considerations are for
informational purposes only, are not exhaustive, and do not form part of our
licenses.
Considerations for licensors: Our public licenses are intended for use by Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
those authorized to give the public permission to use material in ways otherwise
restricted by copyright and certain other rights. Our licenses are irrevocable.
Licensors should read and understand the terms and conditions of the license
they choose before applying it. Licensors should also secure all rights necessary
before applying our licenses so that the public can reuse the material as
expected. Licensors should clearly mark any material not subject to the license.
This includes other CC-licensed material, or material used under an exception
or limitation to copyright. More considerations for licensors : wiki.creativecommons.org/Considerations_for_licensors
Considerations for the public: By using one of our public licenses, a licensor Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensors permission is not necessary for any reasonfor example, because of any applicable exception or limitation to copyrightthen that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described.
grants the public permission to use the licensed material under specified
terms and conditions. If the licensor's permission is not necessary for any
reasonfor example, because of any applicable exception or limitation to copyrightthen
that use is not regulated by the license. Our licenses grant only permissions
under copyright and certain other rights that a licensor has authority to
grant. Use of the licensed material may still be restricted for other reasons,
including because others have copyright or other rights in the material. A
licensor may make special requests, such as asking that all changes be marked
or described.
Although not required by our licenses, you are encouraged to respect those Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
requests where reasonable. More considerations for the public : wiki.creativecommons.org/Considerations_for_licensees
Creative Commons Attribution-ShareAlike 4.0 International Public License Creative Commons Attribution-ShareAlike 4.0 International Public License
By exercising the Licensed Rights (defined below), You accept and agree to By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike
4.0 International Public License ("Public License"). To the extent this Public
License may be interpreted as a contract, You are granted the Licensed Rights
in consideration of Your acceptance of these terms and conditions, and the
Licensor grants You such rights in consideration of benefits the Licensor
receives from making the Licensed Material available under these terms and
conditions.
Section 1 Definitions. Section 1 Definitions.
a. Adapted Material means material subject to Copyright and Similar Rights a. Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
that is derived from or based upon the Licensed Material and in which the
Licensed Material is translated, altered, arranged, transformed, or otherwise
modified in a manner requiring permission under the Copyright and Similar
Rights held by the Licensor. For purposes of this Public License, where the
Licensed Material is a musical work, performance, or sound recording, Adapted
Material is always produced where the Licensed Material is synched in timed
relation with a moving image.
b. Adapter's License means the license You apply to Your Copyright and Similar b. Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
Rights in Your contributions to Adapted Material in accordance with the terms
and conditions of this Public License.
c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, c. BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
approved by Creative Commons as essentially the equivalent of this Public
License.
d. Copyright and Similar Rights means copyright and/or similar rights closely d. Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
related to copyright including, without limitation, performance, broadcast,
sound recording, and Sui Generis Database Rights, without regard to how the
rights are labeled or categorized. For purposes of this Public License, the
rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
e. Effective Technological Measures means those measures that, in the absence e. Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
of proper authority, may not be circumvented under laws fulfilling obligations
under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996,
and/or similar international agreements.
f. Exceptions and Limitations means fair use, fair dealing, and/or any other f. Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
exception or limitation to Copyright and Similar Rights that applies to Your
use of the Licensed Material.
g. License Elements means the license attributes listed in the name of a Creative g. License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
Commons Public License. The License Elements of this Public License are Attribution
and ShareAlike.
h. Licensed Material means the artistic or literary work, database, or other h. Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
material to which the Licensor applied this Public License.
i. Licensed Rights means the rights granted to You subject to the terms and i. Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
conditions of this Public License, which are limited to all Copyright and
Similar Rights that apply to Your use of the Licensed Material and that the
Licensor has authority to license.
j. Licensor means the individual(s) or entity(ies) granting rights under this j. Licensor means the individual(s) or entity(ies) granting rights under this Public License.
Public License.
k. Share means to provide material to the public by any means or process that k. Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
requires permission under the Licensed Rights, such as reproduction, public
display, public performance, distribution, dissemination, communication, or
importation, and to make material available to the public including in ways
that members of the public may access the material from a place and at a time
individually chosen by them.
l. Sui Generis Database Rights means rights other than copyright resulting l. Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
from Directive 96/9/EC of the European Parliament and of the Council of 11
March 1996 on the legal protection of databases, as amended and/or succeeded,
as well as other essentially equivalent rights anywhere in the world.
m. You means the individual or entity exercising the Licensed Rights under m. You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
this Public License. Your has a corresponding meaning.
Section 2 Scope. Section 2 Scope.
a. License grant. a. License grant.
1. Subject to the terms and conditions of this Public License, the Licensor 1. Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive,
irrevocable license to exercise the Licensed Rights in the Licensed Material
to:
A. reproduce and Share the Licensed Material, in whole or in part; and A. reproduce and Share the Licensed Material, in whole or in part; and
B. produce, reproduce, and Share Adapted Material. B. produce, reproduce, and Share Adapted Material.
2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions 2. Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
and Limitations apply to Your use, this Public License does not apply, and
You do not need to comply with its terms and conditions.
3. Term. The term of this Public License is specified in Section 6(a). 3. Term. The term of this Public License is specified in Section 6(a).
4. Media and formats; technical modifications allowed. The Licensor authorizes 4. Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
You to exercise the Licensed Rights in all media and formats whether now known
or hereafter created, and to make technical modifications necessary to do
so. The Licensor waives and/or agrees not to assert any right or authority
to forbid You from making technical modifications necessary to exercise the
Licensed Rights, including technical modifications necessary to circumvent
Effective Technological Measures. For purposes of this Public License, simply
making modifications authorized by this Section 2(a)(4) never produces Adapted
Material.
5. Downstream recipients. 5. Downstream recipients.
A. Offer from the Licensor Licensed Material. Every recipient of the Licensed A. Offer from the Licensor Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
Material automatically receives an offer from the Licensor to exercise the
Licensed Rights under the terms and conditions of this Public License.
B. Additional offer from the Licensor Adapted Material. Every recipient B. Additional offer from the Licensor Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapters License You apply.
of Adapted Material from You automatically receives an offer from the Licensor
to exercise the Licensed Rights in the Adapted Material under the conditions
of the Adapter's License You apply.
C. No downstream restrictions. You may not offer or impose any additional C. No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
or different terms or conditions on, or apply any Effective Technological
Measures to, the Licensed Material if doing so restricts exercise of the Licensed
Rights by any recipient of the Licensed Material.
6. No endorsement. Nothing in this Public License constitutes or may be construed 6. No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
as permission to assert or imply that You are, or that Your use of the Licensed
Material is, connected with, or sponsored, endorsed, or granted official status
by, the Licensor or others designated to receive attribution as provided in
Section 3(a)(1)(A)(i).
b. Other rights. b. Other rights.
1. Moral rights, such as the right of integrity, are not licensed under this 1. Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
Public License, nor are publicity, privacy, and/or other similar personality
rights; however, to the extent possible, the Licensor waives and/or agrees
not to assert any such rights held by the Licensor to the limited extent necessary
to allow You to exercise the Licensed Rights, but not otherwise.
2. Patent and trademark rights are not licensed under this Public License. 2. Patent and trademark rights are not licensed under this Public License.
3. To the extent possible, the Licensor waives any right to collect royalties 3. To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
from You for the exercise of the Licensed Rights, whether directly or through
a collecting society under any voluntary or waivable statutory or compulsory
licensing scheme. In all other cases the Licensor expressly reserves any right
to collect such royalties.
Section 3 License Conditions. Section 3 License Conditions.
Your exercise of the Licensed Rights is expressly made subject to the following Your exercise of the Licensed Rights is expressly made subject to the following conditions.
conditions.
a. Attribution. a. Attribution.
1. If You Share the Licensed Material (including in modified form), You must: 1. If You Share the Licensed Material (including in modified form), You must:
A. retain the following if it is supplied by the Licensor with the Licensed A. retain the following if it is supplied by the Licensor with the Licensed Material:
Material:
i. identification of the creator(s) of the Licensed Material and any others i. identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
designated to receive attribution, in any reasonable manner requested by the
Licensor (including by pseudonym if designated);
ii. a copyright notice; ii. a copyright notice;
iii. a notice that refers to this Public License; iii. a notice that refers to this Public License;
iv. a notice that refers to the disclaimer of warranties; iv. a notice that refers to the disclaimer of warranties;
v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable; v. a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
B. indicate if You modified the Licensed Material and retain an indication B. indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
of any previous modifications; and
C. indicate the Licensed Material is licensed under this Public License, and C. indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
include the text of, or the URI or hyperlink to, this Public License.
2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner 2. You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
based on the medium, means, and context in which You Share the Licensed Material.
For example, it may be reasonable to satisfy the conditions by providing a
URI or hyperlink to a resource that includes the required information.
3. If requested by the Licensor, You must remove any of the information required 3. If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
by Section 3(a)(1)(A) to the extent reasonably practicable.
b. ShareAlike.In addition to the conditions in Section 3(a), if You Share b. ShareAlike.In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
Adapted Material You produce, the following conditions also apply.
1. The Adapter's License You apply must be a Creative Commons license with 1. The Adapters License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
the same License Elements, this version or later, or a BY-SA Compatible License.
2. You must include the text of, or the URI or hyperlink to, the Adapter's 2. You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
License You apply. You may satisfy this condition in any reasonable manner
based on the medium, means, and context in which You Share Adapted Material.
3. You may not offer or impose any additional or different terms or conditions 3. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
on, or apply any Effective Technological Measures to, Adapted Material that
restrict exercise of the rights granted under the Adapter's License You apply.
Section 4 Sui Generis Database Rights. Section 4 Sui Generis Database Rights.
Where the Licensed Rights include Sui Generis Database Rights that apply to Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
Your use of the Licensed Material:
a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, a. for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
reuse, reproduce, and Share all or a substantial portion of the contents of
the database;
b. if You include all or a substantial portion of the database contents in b. if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
a database in which You have Sui Generis Database Rights, then the database
in which You have Sui Generis Database Rights (but not its individual contents)
is Adapted Material, including for purposes of Section 3(b); and
c. You must comply with the conditions in Section 3(a) if You Share all or c. You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
a substantial portion of the contents of the database. For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
For the avoidance of doubt, this Section 4 supplements and does not replace
Your obligations under this Public License where the Licensed Rights include
other Copyright and Similar Rights.
Section 5 Disclaimer of Warranties and Limitation of Liability. Section 5 Disclaimer of Warranties and Limitation of Liability.
a. Unless otherwise separately undertaken by the Licensor, to the extent possible, a. Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
the Licensor offers the Licensed Material as-is and as-available, and makes
no representations or warranties of any kind concerning the Licensed Material,
whether express, implied, statutory, or other. This includes, without limitation,
warranties of title, merchantability, fitness for a particular purpose, non-infringement,
absence of latent or other defects, accuracy, or the presence or absence of
errors, whether or not known or discoverable. Where disclaimers of warranties
are not allowed in full or in part, this disclaimer may not apply to You.
b. To the extent possible, in no event will the Licensor be liable to You b. To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
on any legal theory (including, without limitation, negligence) or otherwise
for any direct, special, indirect, incidental, consequential, punitive, exemplary,
or other losses, costs, expenses, or damages arising out of this Public License
or use of the Licensed Material, even if the Licensor has been advised of
the possibility of such losses, costs, expenses, or damages. Where a limitation
of liability is not allowed in full or in part, this limitation may not apply
to You.
c. The disclaimer of warranties and limitation of liability provided above c. The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
shall be interpreted in a manner that, to the extent possible, most closely
approximates an absolute disclaimer and waiver of all liability.
Section 6 Term and Termination. Section 6 Term and Termination.
a. This Public License applies for the term of the Copyright and Similar Rights a. This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
licensed here. However, if You fail to comply with this Public License, then
Your rights under this Public License terminate automatically.
b. Where Your right to use the Licensed Material has terminated under Section b. Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
6(a), it reinstates:
1. automatically as of the date the violation is cured, provided it is cured 1. automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
within 30 days of Your discovery of the violation; or
2. upon express reinstatement by the Licensor. 2. upon express reinstatement by the Licensor.
c. For the avoidance of doubt, this Section 6(b) does not affect any right c. For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
the Licensor may have to seek remedies for Your violations of this Public
License.
d. For the avoidance of doubt, the Licensor may also offer the Licensed Material d. For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
under separate terms or conditions or stop distributing the Licensed Material
at any time; however, doing so will not terminate this Public License.
e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License. e. Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
Section 7 Other Terms and Conditions. Section 7 Other Terms and Conditions.
a. The Licensor shall not be bound by any additional or different terms or a. The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
conditions communicated by You unless expressly agreed.
b. Any arrangements, understandings, or agreements regarding the Licensed b. Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
Material not stated herein are separate from and independent of the terms
and conditions of this Public License.
Section 8 Interpretation. Section 8 Interpretation.
a. For the avoidance of doubt, this Public License does not, and shall not a. For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
be interpreted to, reduce, limit, restrict, or impose conditions on any use
of the Licensed Material that could lawfully be made without permission under
this Public License.
b. To the extent possible, if any provision of this Public License is deemed b. To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
unenforceable, it shall be automatically reformed to the minimum extent necessary
to make it enforceable. If the provision cannot be reformed, it shall be severed
from this Public License without affecting the enforceability of the remaining
terms and conditions.
c. No term or condition of this Public License will be waived and no failure c. No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
to comply consented to unless expressly agreed to by the Licensor.
d. Nothing in this Public License constitutes or may be interpreted as a limitation d. Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
upon, or waiver of, any privileges and immunities that apply to the Licensor
or You, including from the legal processes of any jurisdiction or authority.
Creative Commons is not a party to its public licenses. Notwithstanding, Creative Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
Commons may elect to apply one of its public licenses to material it publishes
and in those instances will be considered the "Licensor." The text of the
Creative Commons public licenses is dedicated to the public domain under the
CC0 Public Domain Dedication. Except for the limited purpose of indicating
that material is shared under a Creative Commons public license or as otherwise
permitted by the Creative Commons policies published at creativecommons.org/policies,
Creative Commons does not authorize the use of the trademark "Creative Commons"
or any other trademark or logo of Creative Commons without its prior written
consent including, without limitation, in connection with any unauthorized
modifications to any of its public licenses or any other arrangements, understandings,
or agreements concerning use of licensed material. For the avoidance of doubt,
this paragraph does not form part of the public licenses.
Creative Commons may be contacted at creativecommons.org. Creative Commons may be contacted at creativecommons.org.

View File

@ -1,3 +1,19 @@
# switching-remastered
Адаптация под responsive design, тексты переписываются под обладателей клипового мышления. ===
АХТУНГ!
Переезд на https://git.phast.ru/tolstoevsky/fedi
===
# Fedi.life
Введение в федеративные сети для жертв Фкантактика и Faceboogle. Интерфейс упрощён, тексты нарезаны блоками. "Многабукаф" выведено на отдельную страницу.
# Тривиальные Технологии
Сайт создаётся со стремлением соответствовать Манифесту Тривиальных Технологий: https://phreedom.club/tt/landing.html
===
Изменения просьба вносить в ветку modifications

BIN
banner.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

125
coc.html
View File

@ -1,40 +1,91 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head>
<head profile="https://fedi.life">
<link rel="icon"
type="image/png"
href="favicon.png" />
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Устав Федерации</title> <title>У вас всегда есть выбор! — Мессенджеры</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/picnic.min.css">
<link rel="stylesheet" href="css/menu.css"> <style>aside a.top {
<link rel="stylesheet" href="css/popup.css"> font-size: 0;
<script src="js/popup.js"></script> position: fixed;
<script src="js/menu.js"></script> bottom: 0;
</head> font-weight: bold;
<body> width: 180px;
<div class="topnav" id="rtopnav"> padding: .6em 0;
<a href="index.html">Главная</a> margin-bottom: 0;
<a href="mail.html">Почта</a> border-radius: .3em .3em 0 0;
<a href="im.html">Мессенджеры</a> transition: all .3s ease;
<a href="social.html">Соцсети</a> }
<a href="search.html">Поисковики</a> aside a.top.visible {
<div class="dropdown"> font-size: 1em;
<button class="dropbtn">Ещё }
<i class="fa fa-caret-down"></i> aside .links a.button {
</button> text-align: left;
<div class="dropdown-content"> }
<a href="extra.html" class="active">Документы и агитматериалы</a> @media all and (max-width: 1000px) {
<a href="info.html">Подробнее</a> aside a.pseudo.top {
</div> background: rgba(255, 255, 255, .8);
</div> width: 100%;
<a href="javascript:void(0);" style="font-size:15px;" class="icon" onclick="dropme()"></a> left: 0;
</div> text-align: center;
z-index: 100;
}
}
.documentation article > h2 {
margin: -2em 0 .6em;
padding: 3em 0 0;
line-height: 1;
}
.documentation article > h3 {
margin-bottom: .6em;
}
.documentation aside h2 {
margin-top: 0;
padding: 1.25em 0;
line-height: 1;
}
.documentation aside a.pseudo {
color: #0074D9;
margin: 0;
}
.documentation > section {
background: #fff;
text-align: left;
width: 90%;
max-width: 960px;
margin: 0 auto;
padding: 80px 0 0;
}
.documentation article > h1 {
margin: 0;
padding: 0.6em 0;
font-size: 2em;
line-height: 1.5;
}
.documentation aside a.button {
display: block;
}
.documentation pre[class*="language-"] {
margin-top: 10px;
margin-bottom: 40px;
}
.documentation .index pre {
margin: 0;
font-size: .9em;
}
</style>
</head>
<body>
<div class="textblock"> <div class="textblock">
<h2>Рекомендованные практики для пользоваетелей</h2> <h2>Рекомендованные практики для пользователей</h2>
<p> <p>
<img src="images/book.png" align="right" style="margin: 0px 0px 0px 10px;"> <img src="images/book.webp" align="right" style="margin: 0px 0px 0px 10px;">
<p>Данные практики рекомендуются пользователям для поддержания этичного общения и улучшения качества жизни в сети.</p> <p>Данные практики рекомендуются пользователям для поддержания этичного общения и улучшения качества жизни в сети.</p>
<h4>Принципы неагрессивного поведения</h4> <h4>Принципы неагрессивного поведения</h4>
@ -56,7 +107,7 @@
<h4>Ознакомление с особыми положениями сервера</h4> <h4>Ознакомление с особыми положениями сервера</h4>
<p>Иногда для бесконфликтного общения на каком-либо сервера недостаточно знать только общие положения устава. У некоторых серверов могут быть особые положения в отношении административных, модераторских процедур или контентной политики. Настоятельно рекомендуется регулярно ознакамливаться с правилами сервера, на котором вы зарегистрированы. Дополнительно, поощряется ознакомление с правилами других серверов. Вполне возможно, вы пожелаете мигрировать.</p> <p>Иногда для бесконфликтного общения на каком-либо серверe недостаточно знать только общие положения устава. У некоторых серверов могут быть особые положения в отношении административных, модераторских процедур или контентной политики. Настоятельно рекомендуется регулярно ознакамливаться с правилами сервера, на котором вы зарегистрированы. Дополнительно, поощряется ознакомление с правилами других серверов. Вполне возможно, вы пожелаете мигрировать.</p>
<h4>Предупреждения о чувствительном материале</h4> <h4>Предупреждения о чувствительном материале</h4>
@ -90,7 +141,7 @@
<h5>Оскорбительное поведение</h5> <h5>Оскорбительное поведение</h5>
<p>Оскорбительным поведением считаются любые попытки преследования, угроз, запугивания, пожелания серьезного вреда здоровью, необоснованная агрессия, сексуальные домогательства, оскорбления на почве лчиных характеристик (национальности, цвета кожи/глаз/волос, сексуальности, пола, роста, других врожденных/неизменных качеств), и т.д. Подобное поведение может явиться поводом для административных действий, направленных на понижение прав пользователя, вплоть до погашения учетной записи.</p> <p>Оскорбительным поведением считаются любые попытки преследования, угроз, запугивания, пожелания серьезного вреда здоровью, необоснованная агрессия, сексуальные домогательства, оскорбления на почве личных характеристик (национальности, цвета кожи/глаз/волос, сексуальности, пола, роста, других врожденных/неизменных качеств), и т.д. Подобное поведение может явиться поводом для административных действий, направленных на понижение прав пользователя, вплоть до погашения учетной записи.</p>
<h5>Размещение коммерческих сообщений</h5> <h5>Размещение коммерческих сообщений</h5>
@ -103,7 +154,7 @@
<h5>Троллинг</h5> <h5>Троллинг</h5>
<p>Умышленная провокация конфликта или выведение других пользователей из себя является самым классическим примером раздражающего поведения (поскольку имеет целью, собственно, вызвать раздражение у окружающих), и его следует избегать.</p> <p>Умышленная провокация конфликта или выведение других пользователей из себя является самым классическим примером раздражающего поведения (поскольку имеет цель, собственно, вызвать раздражение у окружающих), и его следует избегать.</p>
<h5>Автоматизированные активности</h5> <h5>Автоматизированные активности</h5>
@ -123,7 +174,7 @@
<h5>Спам жалобами</h5> <h5>Спам жалобами</h5>
<p>Рассмотрение формальной жалобы - это действие, к которому не следует легкомысленно относиться. Расследование и принятие мер по жалобе требует времени и энергии, которое администраторы предпочли бы потратить на более конструктивную деятельность. Настойчивая отправка большого количества мелких жалоб, в особености без попытки самостоятельного урегулирования конфликта, и в особенности без доказательств, является раздражающей.</p> <p>Рассмотрение формальной жалобы - это действие, к которому не следует легкомысленно относиться. Расследование и принятие мер по жалобе требует времени и энергии, которое администраторы предпочли бы потратить на более конструктивную деятельность. Настойчивая отправка большого количества мелких жалоб, в особенности без попытки самостоятельного урегулирования конфликта, и в особенности без доказательств, является раздражающей.</p>
<h4>Некорректное поведение административного персонала</h4> <h4>Некорректное поведение административного персонала</h4>
@ -140,7 +191,7 @@
<h5>Раскрытие персональных данных и личной корреспонденции</h5> <h5>Раскрытие персональных данных и личной корреспонденции</h5>
<p>Раскрытие персональных данных о пользователе (как то фамилия, имя и отчество, год рождения, место проживания, место учебы или работы, текущее местоположение) по инициативе административного персонала является грубейшим нарушением приватности пользователя, и серьезно подрывает доверие пользователей сети и других администраторов к вам лично и к вашему серверу в целом. Подобное поведение является недопустимым. <p>Раскрытие персональных данных о пользователе (как то фамилия, имя и отчество, год рождения, место проживания, место учебы или работы, текущее местоположение) по инициативе административного персонала является грубейшим нарушением приватности пользователя, и серьезно подрывает доверие пользователей сети и других администраторов к вам лично и к вашему серверу в целом. Подобное поведение является недопустимым.
То же самое касается и личной корреспонденции пользователей. Раскрытие или использование в любой форме информации, содержащейся в личных сообщениях, не адресованных вам и не написанных вами, считается некорректным поведением, если сообщения не были переданы как часть aормальной жалобы.</p> То же самое касается и личной корреспонденции пользователей. Раскрытие или использование в любой форме информации, содержащейся в личных сообщениях, не адресованных вам и не написанных вами, считается некорректным поведением, если сообщения не были переданы как часть формальной жалобы.</p>
<hr style="clear: right"> <hr style="clear: right">
<h3>Прочие моменты</h3> <h3>Прочие моменты</h3>
@ -161,6 +212,12 @@
</div> </div>
<section>
<hr>
<center>
<a href="https://phreedom.club/~tolstoevsky"><img src="images/ava-min.webp" width=32px></a>&nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind.
</center>
</section>
</body> </body>
</html> </html>

View File

@ -1,75 +0,0 @@
@font-face {
font-family: 'exo2';
src:url('../fonts/exo2l.otf');
}
.textblock {
background-color:#1f2833;
border-radius:2px;
border: 1px solid #667;
display:inline-block;
width: auto;
color: #c5c6c7;
padding: 2% 2% 2% 2%;
margin: 1% 1% 1% 1%;
}
.imgblock {
background-color:#1e2832;
border-radius:2px;
border:1px solid #667;
display:inline-block;
width: 90%;
height: 90%;
color: #c5c6c7;
padding: 2% 2% 2% 2%;
margin: 3% 3% 3% 3%;
}
.imgblock img {
padding: 2% 2% 2% 2%;
margin: 3% 3% 3% 3%;
}
body {
font: 100%/150% exo2;
width: 900px;
max-width: 96%;
margin: 0 auto;
background-color:#0b0c10;
}
p {
margin: 0 0 20px;
}
a {
color: #45a29e;
text-decoration: none;
}
a:hover {
color: #66fcf1;
}
h1, h2, h3 {
color: #eee;
margin: 20px 0 10px;
}
h1 {
font-size: 1.7em;
color: #bbb;
}
h2 {
font-size: 1.4em;
}
h3 {
font-size: 1.1em;
}
h1, h2, h3 {
color: #999;
margin: 20px 0 10px;
font-family: "exo2";
}

View File

@ -1,47 +0,0 @@
.Button {
box-shadow: 0px 10px 14px -7px #3e7327;
background:linear-gradient(to bottom, #77b55a 5%, #72b352 100%);
background-color:#77b55a;
border-radius:4px;
border:1px solid #4b8f29;
display:flex;
cursor:pointer;
color:#ffffff;
font-size:13px;
font-weight:bold;
padding:1% 2%;
text-decoration:none;
text-shadow:0px 1px 0px #5b8a3c;
}
.Button:hover {
background:linear-gradient(to bottom, #72b352 5%, #77b55a 100%);
background-color:#72b352;
}
.Button:active {
position:relative;
top:1px;
}
.Button2 {
box-shadow:inset 0px -3px 7px 0px #29bbff;
background:linear-gradient(to bottom, #2dabf9 5%, #0688fa 100%);
background-color:#2dabf9;
border-radius:3px;
border:1px solid #0b0e07;
display:flex;
cursor:pointer;
color:#ffffff;
font-size:15px;
padding:1% 2%;
text-decoration:none;
text-shadow:0px 1px 0px #263666;
}
.Button2:hover {
background:linear-gradient(to bottom, #0688fa 5%, #2dabf9 100%);
background-color:#0688fa;
}
.Button2:active {
position:relative;
top:1px;
}

74
css/gruvbox.css Normal file
View File

@ -0,0 +1,74 @@
main {
font-family: monospace, monospace;
max-width: 38rem;
padding: 2rem;
margin: auto;
}
@media only screen and (max-device-width: 736px) {
main {
padding: 0rem;
}
}
::selection {
background: #d3869b;
}
body {
background: #282828;
color: #ebdbb2;
}
pre {
background-color: #3c3836;
padding: 1em;
border: 0;
}
a, a:active, a:visited {
color: #b16286;
background-color: #1d2021;
}
h1, h2, h3, h4, h5 {
margin-bottom: .1rem;
}
blockquote {
border-left: 1px solid #bdae93;
margin: 0.5em 10px;
padding: 0.5em 10px;
}
footer {
align: center;
}
@media (prefers-color-scheme: light) {
body {
background: #fbf1c7;
color: #3c3836;
}
pre {
background-color: #ebdbb2;
padding: 1em;
border: 0;
}
a, a:active, a:visited {
color: #b16286;
background-color: #f9f5d7;
}
h1, h2, h3, h4, h5 {
margin-bottom: .1rem;
}
blockquote {
border-left: 1px solid #655c54;
margin: 0.5em 10px;
padding: 0.5em 10px;
}
}

View File

@ -1,97 +0,0 @@
.topnav {
overflow: hidden;
background-color: #1f2833;
}
.topnav a {
float: left;
display: flex;
text-align: center;
padding: 14px 16px;
text-decoration: none;
font-size: 17px;
border-radius: 2px;
}
.topnav .icon {
display: none;
}
.dropdown {
overflow: hidden;
display: flex;
}
.dropdown .dropbtn {
font-size: 17px;
border: 1px solid #888;
border-radius: 2px;
outline: none;
color: #c5c6c7;
background-color: #1e2832;
padding: 16px 16px;
font-family: inherit;
display: flex;
}
.dropdown-content {
display: none;
min-width: 160px;
box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
z-index: 1;
color: #c5c6c7;
background-color: #1e2832;
border: 1px solid #888;
border-radius: 2px;
}
.dropdown-content a {
float: none;
padding: 12px 16px;
text-decoration: none;
display: flex;
text-align: left;
}
.dropdown:hover .dropdown-content {
display: inline-block;
}
@media screen and (max-width: 600px) {
.topnav a:not(:first-child), .dropdown .dropbtn {
display: none;
}
.topnav a.icon {
float: right;
display: flex;
}
}
@media screen and (max-width: 600px) {
.topnav.responsive {position: relative;}
.topnav.responsive .icon {
position: absolute;
right: 0;
top: 0;
}
.topnav.responsive a {
float: none;
display: inline-block;
text-align: left;
}
.topnav.responsive .dropdown {float: none;}
.topnav.responsive .dropdown-content {position: relative;}
.topnav.responsive .dropdown .dropbtn {
display: inline-block;
width: 100%;
text-align: left;
}
}
.active a {
color: #433;
}

1
css/picnic.min.css vendored Normal file

File diff suppressed because one or more lines are too long

1
css/picnic.min.css.bak Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,130 +0,0 @@
.row > .column {
padding: 0 8px;
}
.row:after {
content: "";
display: table;
clear: both;
}
.column {
float: left;
width: 25%;
}
/* The Modal (background) */
.modal {
display: none;
position: fixed;
z-index: 1;
padding-top: 100px;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: auto;
background-color: black;
}
/* Modal Content */
.modal-content {
position: relative;
background-color: #fefefe;
margin: auto;
padding: 0;
width: 90%;
max-width: 1200px;
}
/* The Close Button */
.close {
color: white;
position: absolute;
top: 10px;
right: 25px;
font-size: 35px;
font-weight: bold;
}
.close:hover,
.close:focus {
color: #999;
text-decoration: none;
cursor: pointer;
}
.mySlides {
display: none;
}
.cursor {
cursor: pointer;
}
/* Next & previous buttons */
.prev,
.next {
cursor: pointer;
position: absolute;
top: 50%;
width: auto;
padding: 16px;
margin-top: -50px;
color: white;
font-weight: bold;
font-size: 20px;
transition: 0.6s ease;
border-radius: 0 3px 3px 0;
user-select: none;
-webkit-user-select: none;
}
/* Position the "next button" to the right */
.next {
right: 0;
border-radius: 3px 0 0 3px;
}
/* On hover, add a black background color with a little bit see-through */
.prev:hover,
.next:hover {
background-color: rgba(0, 0, 0, 0.8);
}
/* Number text (1/3 etc) */
.numbertext {
color: #f2f2f2;
font-size: 12px;
padding: 8px 12px;
position: absolute;
top: 0;
}
img {
margin-bottom: -4px;
}
.caption-container {
text-align: center;
background-color: black;
padding: 2px 16px;
color: white;
}
.demo {
opacity: 0.6;
}
.active,
.demo:hover {
opacity: 1;
}
img.hover-shadow {
transition: 0.3s;
}
.hover-shadow:hover {
box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
}

View File

@ -6,38 +6,109 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>У вас всегда есть выбор! - Документы и агитматериалы.</title> <title>У вас всегда есть выбор! - Документы и агитматериалы.</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/picnic.min.css">
<link rel="stylesheet" href="css/menu.css"> <style>aside a.top {
<link rel="stylesheet" href="css/popup.css"> font-size: 0;
<link rel="stylesheet" href="css/btn.css"> position: fixed;
<script src="js/popup.js"></script> bottom: 0;
<script src="js/menu.js"></script> font-weight: bold;
</head> width: 180px;
padding: .6em 0;
margin-bottom: 0;
border-radius: .3em .3em 0 0;
transition: all .3s ease;
}
aside a.top.visible {
font-size: 1em;
}
aside .links a.button {
text-align: left;
}
@media all and (max-width: 1000px) {
aside a.pseudo.top {
background: rgba(255, 255, 255, .8);
width: 100%;
left: 0;
text-align: center;
z-index: 100;
}
}
.documentation article > h2 {
margin: -2em 0 .6em;
padding: 3em 0 0;
line-height: 1;
}
.documentation article > h3 {
margin-bottom: .6em;
}
.documentation aside h2 {
margin-top: 0;
padding: 1.25em 0;
line-height: 1;
}
.documentation aside a.pseudo {
color: #0074D9;
margin: 0;
}
.documentation > section {
background: #fff;
text-align: left;
width: 90%;
max-width: 960px;
margin: 0 auto;
padding: 80px 0 0;
}
.documentation article > h1 {
margin: 0;
padding: 0.6em 0;
font-size: 2em;
line-height: 1.5;
}
.documentation aside a.button {
display: block;
}
.documentation pre[class*="language-"] {
margin-top: 10px;
margin-bottom: 40px;
}
.documentation .index pre {
margin: 0;
font-size: .9em;
}
</style>
</head>
<body> <body>
<div class="topnav" id="rtopnav"> <nav class="fedi">
<a href="index.html">Главная</a> <a href="https://fedi.life" class="brand">
<a href="mail.html">Почта</a> <img class="logo" src="images/logo.webp" />
<a href="im.html">Мессенджеры</a> <span>Fedi.Life</span>
<a href="social.html">Соцсети</a> </a>
<a href="search.html">Поисковики</a>
<div class="dropdown">
<button class="dropbtn">Ещё
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="extra.html" class="active">Документы и агитматериалы</a>
<a href="info.html">Подробнее</a>
</div>
</div>
<a href="javascript:void(0);" style="font-size:15px;" class="icon" onclick="dropme()"></a>
</div>
<div class="textblock"> <!-- responsive-->
<h2>Устав сообщества</h2> <input id="bmenub" type="checkbox" class="show">
<label for="bmenub" class="burger pseudo button">меню</label>
<div class="menu">
<a href="im.html" class="pseudo button">Мессенджеры</a>
<a href="social.html" class="pseudo button">Соцсети</a>
<a href="multimedia.html" class="pseudo button">Мультимедиа</a>
<a href="mail.html" class="pseudo button">Почта</a>
<a href="search.html" class="pseudo button">Поиск</a>
<a href="extra.html" class="pseudo button">Допматериалы</a>
<a href="info.html" class="pseudo button">Подробнее</a>
</div>
</nav>
<main id="home" class="documentation">
<section class="flex">
<article class="four-fifth-1000">
<header><h2>Устав сообщества</h2></header>
<p> <p>
<img src="images/book.png" align="right" style="margin: 0px 0px 0px 10px;"> <img src="images/book.webp" align="right" style="margin: 0px 0px 0px 10px;" alt="устав">
Свободные сообщества не регулируются жёсткими правиламии и пользвательскими соглашениями, Свободные сообщества не регулируются жёсткими правиламии и пользовательскими соглашениями,
тем не менее существует рекомендуемый к соблюдению Устав, следуя положениям которого, тем не менее существует рекомендуемый к соблюдению Устав, следуя положениям которого,
вы — будь вы пользователем, модератором или администратором узла — сделаете вхождение вы — будь вы пользователем, модератором или администратором узла — сделаете вхождение
и пребывание людей в Сети простым и комфортным. Общение свободных людей основано на терпимости, и пребывание людей в Сети простым и комфортным. Общение свободных людей основано на терпимости,
@ -50,7 +121,7 @@
<h4>Прочитать</h4> <h4>Прочитать</h4>
<ul> <ul>
<li>С выдержкой из Устава, содержащей рекомендации по поведению пользователей, <li>С выдержкой из Устава, содержащей рекомендации по поведению пользователей,
вы можете ознакомиться → <a href="coc.html">по этой ссылке</a>  вы можете ознакомиться → <a href="coc.html">по этой ссылке</a>
</li> </li>
<li>Полная версия, содержащая все положения, определения и рекомендации, находится <li>Полная версия, содержащая все положения, определения и рекомендации, находится
<a href="https://github.com/drequivalent/ru-fediverse-policy/blob/master/README.md">здесь</a> <a href="https://github.com/drequivalent/ru-fediverse-policy/blob/master/README.md">здесь</a>
@ -58,12 +129,11 @@
</ul> </ul>
</div> </div>
</div> </article>
<article class="four-fifth-1000">
<div class="textblock"> <header><h2>База знаний</h2></article>
<h2>База знаний</h2>
<p> <p>
<img src="images/know.png" align="right" style="margin: 0px 0px 0px 10px;"> <img src="images/know.webp" align="right" style="margin: 0px 0px 0px 10px;" alt="база знаний">
Сообщество не было бы сообществом, если бы не свободный обмен знаниями. Сообщество не было бы сообществом, если бы не свободный обмен знаниями.
Организуются группы по интересам в соцсетях, создаются тематические Вики — любой способ, Организуются группы по интересам в соцсетях, создаются тематические Вики — любой способ,
которым вы можете помочь окружащим, доступен, любая помощь приветствуется. Вот примеры информационных которым вы можете помочь окружащим, доступен, любая помощь приветствуется. Вот примеры информационных
@ -71,6 +141,12 @@
</p> </p>
<div> <div>
<h4 id="catalogs">Выбор сервера</h4>
<ul>
<li><a href="https://fediverse.party/en/portal/servers/">Fediverse.Party</a> ← крупный англоязычный каталог серверов, разделённых по основным темам постов, географическому расположению, главным используемым языкам, политическим и другим критериям.</li>
<li><a href="https://ru.index.community/communities">RuFedi</a> ← каталог серверов русскоязычного созвездия федивёрса.</li>
<li><a href="https://fedidb.org/network">FediDB</a> ← агрегатор узлов федивёрса от разработчиков Pixelfed. Показывает серверы в порядке убывания количества пользователей и позволяет фильтровать список по типу сервиса (Mastodon, Pixelfed, френдика и т.д.). </li>
</ul>
<h4>Обмен знаниями</h4> <h4>Обмен знаниями</h4>
<ul> <ul>
<li><a href="https://switching.software">Switching.Software</a> ← англоязычный сайт с огромным <li><a href="https://switching.software">Switching.Software</a> ← англоязычный сайт с огромным
@ -78,9 +154,6 @@
собственнические приложения, и так далее". Именно его перевод использовался при создании списков собственнические приложения, и так далее". Именно его перевод использовался при создании списков
в заголовке этого сайта. в заголовке этого сайта.
</li> </li>
<li><a href="https://wiki.phreedom.tk">Phreedom Wiki</a> ← русскоязычная вики для администраторов
Fediverse. В процессе создания.
</li>
<li><a href="https://communitywiki.org/wiki">Community Wiki</a> ← англоязычная Wiki, цель которой <li><a href="https://communitywiki.org/wiki">Community Wiki</a> ← англоязычная Wiki, цель которой
упростить процесс вхождения людей в сообщество. упростить процесс вхождения людей в сообщество.
</li> </li>
@ -90,17 +163,18 @@
</div> </article>
<div class="textblock" align="center"> <article class="four-fifth-1000">
<header><h2>Агитационные материалы</h2></header>
<h2>Агитационные материалы</h2>
<p> <p>
<div class="imgblock"> <div>
<img src="images/thumb1.png" width=15% style="float:left; margin:1%;" onclick="openModal();currentSlide(1)" class="hover-shadow cursor"/> <a href="files/agit.zip">
<img src="images/thumb2.png" width=15% style="float:left; margin:1%;" onclick="openModal();currentSlide(2)" class="hover-shadow cursor"/> <img alt="Скачать архив материалов" src="images/thumb1.webp" width=15% max-width=100% style="float:left;">
<img src="images/transport.png" width=15% style="float:left; margin:1%;" onclick="openModal();currentSlide(3)" class="hover-shadow cursor"/> <img alt="Скачать архив материалов" src="images/thumb2.webp" width=15% max-width=100% style="float:left; margin:1%;">
<img alt="Скачать архив материалов" src="images/transport.webp" width=15% max-width=100% style="float:left; margin:1%;">
</a>
Вы можете помочь распространению информации о свободных альтернативах централизованным сервисам, Вы можете помочь распространению информации о свободных альтернативах централизованным сервисам,
дав ссылку на этот сайт, либо распечатав и распространив листовки дав ссылку на этот сайт, либо распечатав и распространив листовки
(не исключаем, что одна из них и привела вас сюда). Вливайтесь в ряды просветителей, (не исключаем, что одна из них и привела вас сюда). Вливайтесь в ряды просветителей,
@ -108,51 +182,18 @@
</p> </p>
<p> <p>
Приветствуется распространение информации в традиционных сетях, группах, раздача листовок на митингах. Приветствуется распространение информации в традиционных сетях, группах, раздача листовок на митингах.
<a class="Button" href="files/agit.zip">Скачать архив материалов</a> <a href="files/agit.zip">Скачать архив материалов</a>
</p> </p>
</article>
</section>
</div> </main>
</div> <section>
<hr>
<!-- gallery images block --> <center>
<div id="myModal" class="modal"> <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
<span class="close cursor" onclick="closeModal()">&times;</span> <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
<div class="modal-content"> </center>
</section>
<div class="mySlides">
<div class="numbertext">1 / 3</div>
<img src="images/thumb1.png" style="width:100%">
</div>
<div class="mySlides">
<div class="numbertext">2 / 3</div>
<img src="images/thumb2.png" style="width:100%">
</div>
<div class="mySlides">
<div class="numbertext">3 / 3</div>
<img src="images/transport.png" style="width:100%">
</div>
<a class="prev" onclick="plusSlides(-1)">&#10094;</a>
<a class="next" onclick="plusSlides(1)">&#10095;</a>
<div class="caption-container">
<p id="caption"></p>
</div>
<div class="column">
<img class="demo cursor" src="images/thumb1.png" style="width:100%" onclick="currentSlide(1)" alt="Пример листовки">
</div>
<div class="column">
<img class="demo cursor" src="images/thumb2.png" style="width:100%" onclick="currentSlide(2)" alt="Пример листовки">
</div>
<div class="column">
<img class="demo cursor" src="images/transport.png" style="width:100%" onclick="currentSlide(3)" alt="Для расклейки в транспорте и на стенах">
</div>
</div>
</div>
</body> </body>
</html> </html>

BIN
favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
files/agit.zip Normal file → Executable file

Binary file not shown.

BIN
fonts/comfortaa.ttf Normal file

Binary file not shown.

62
i/css/i.css Normal file
View File

@ -0,0 +1,62 @@
.main {
padding-top: 0px;
max-width: 600px;
width: 90%;
margin: 0 auto;
}
body {
background: #f8f8f8;
color: #000000;
font-size: 1em;
font-family: sans-serif;
}
h3 {
font-size: 1.5em;
font-weight: 400;
line-height: 1.1;
color: #444;
}
a {
color: #1863a1;
}
li {
padding-bottom: 0.75em;
}
.btn:hover, .btn:focus, .btn.focus {
color: #666;
text-decoration: none;
}
.btn-primary {
background: #ef6c00;
color: #f2f2f2;
}
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
background: #fb8c00;
color: #fff;
box-shadow: none;
}
.btn-primary:active, .btn-primary.active {
background: #ef6c00;
box-shadow: none;
}
.text-center {
text-align: center;
}
.hint {
font-size: 0.9em;
color: #444;
}
.qrcode {
padding: 20px 5px 5px 5px;
width: 42.5%;
height: 100%;
margin: auto;
}
img {
width: 100%;
height: auto;
}

66
i/css/styles.css Normal file
View File

@ -0,0 +1,66 @@
/* Mostly cherrypicked from bootstrap https://getbootstrap.com/css/ */
.btn {
display: inline-block;
margin-bottom: 0;
font-weight: normal;
text-align: center;
vertical-align: middle; text-transform: uppercase;
border-right: none;
border-bottom: none;
color: #666;
text-decoration: none;
transition: all .2s;
touch-action: manipulation;
cursor: pointer;
border: 1px solid transparent;
white-space: nowrap;
padding: 6px 16px;
font-size: 13px;
line-height: 1.846;
border-radius: 3px;
-webkit-user-select: none;
-moz-user-select: none;
}
.btn:hover, .btn:focus, .btn.focus {
color: #666;
text-decoration: none;
}
textarea, textarea.form-control, input.form-control, input[type="text"], input[type="password"], input[type="email"], input[type="number"], .form-control[type="text"], .form-control[type="password"], .form-control[type="email"], .form-control[type="tel"] {
padding: 0;
border: none;
border-radius: 0;
-webkit-box-shadow: inset 0 -1px 0 #ddd;
box-shadow: inset 0 -1px 0 #ddd;
font-size: 1.1em;
}
.form-control {
display: block;
width: 100%;
height: 37px;
line-height: 1.846;
color: #666;
background-color: transparent;
background-image: none;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
}
input, button {
-webkit-font-smoothing: antialiased;
letter-spacing: .1px;
text-rendering: optimizeLegibility;
}
a {
text-decoration: none;
}
a:hover, a:focus {
color: #165d16;
text-decoration: underline;
}

BIN
i/img/fdroid.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
i/img/playm.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

31
i/index.html Normal file
View File

@ -0,0 +1,31 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta content="IE=edge" http-equiv="X-UA-Compatible">
<meta content="width=device-width, initial-scale=1, user-scalable=0" name="viewport">
<title></title>
<link href="css/styles.css" rel="stylesheet">
<link href="css/i.css" rel="stylesheet">
</head>
<body>
<div class="main">
<noscript><h3>Вам нужен JavaScript для принятия этого приглашения.</h3></noscript>
<h3 class="text-center" id="heading"></h3>
<p class="text-center"><a class="btn btn-primary" id="button"></a></p>
<input type="url" class="form-control text-center" id="url_in" readonly/>
<div class="qrcode" id="qrcode"></div>
<p class="hint text-center" id="clients"></p>
<p class="lead text-center" id="recommend"></p>
<p class="lead text-center" id="client_list"></p>
<p class="lead text-center" id="checkfulllist"></p>
<p class="hint text-center" id="xmppis"></p>
</div>
<script src="js/i18n-text.js"></script>
<script src="js/main.js"></script>
<script src="js/qrcode.min.js"></script>
</body>
</html>

6
i/js/i18n-text.js Normal file
View File

@ -0,0 +1,6 @@
/*!
i18n-text - v0.4.3 - 2014-08-14
https://vogdb@bitbucket.org/vogdb/i18n-text.git
Copyright (c) 2014 Sanin Aleksey aka vogdb; Licensed WTFPL
*/
!function(a){function b(a){return"[object Object]"===Object.prototype.toString.call(a)}function c(a,b){return a.replace(/{{([\w]+)}}/g,function(a,c){var d=b[c];return d?d:a})}function d(a,b){throw new Error(c(a,b))}function e(a){return-1!==a.indexOf("file://")}function f(a){return e(a)||e(window.location.href)&&a.indexOf(!1)}var g={parseAndEval:function(a,b){return a.replace(/{{([^{}]+#[^}]*(?:|.*#.*)+)}}/g,function(a,c){return g.eval(c,b)})},eval:function(a,b){for(var c=a.split("|"),e=c.length-1;e>=0;e--){var f=c[e].split("#"),i=f[0];if(g.isValidFormula(i)||d(h.error.INVALID_PLURAL,{plural:i}),g.evalFormula(i,b))return f[1]}return a},isValidFormula:function(a){return/[ \dn<>=*-+!?]+/g.test(a)},evalFormula:function(a,b){return new Function("n","return "+a)(b)}},h=function(a){this._loadedLocales={},this._currentLocale=null,this._msgPath=null,this._subscribers={},this._init(a)};h.prototype.getLocale=function(){return this._currentLocale},h.prototype.setLocale=function(a){this.hasLocale(a)?this._setLocale(a):(this.once(h.event.LOCALE_LOAD,function(b){b.error||b.locale!==a||this._setLocale(b.locale)}.bind(this)),this.loadLocale(a))},h.prototype._setLocale=function(a){this._currentLocale=a,this._fire(h.event.LOCALE_CHANGE,{locale:a})},h.prototype.hasLocale=function(a){return!!this._loadedLocales[a]},h.prototype.loadLocale=function(a,b){b=b||this._msgPath;var d=b+"/"+a+".json";h.loadFile({url:d,success:function(b){b.length>0?(this._loadedLocales[a]={},this._mergeKeys(JSON.parse(b),this._loadedLocales[a],""),this._fire(h.event.LOCALE_LOAD,{locale:a})):this._fire(h.event.LOCALE_LOAD,{error:c(h.error.EMPTY_MESSAGES,{file:d})})}.bind(this),error:function(a){this._fire(h.event.LOCALE_LOAD,{error:c(h.error.NO_MESSAGES,{file:d,error:a})})}.bind(this)})},h.prototype._mergeKeys=function(a,c,d){for(var e in a)if(b(a[e])){var f;f=d?d+h.KEY_SEPARATOR+e:e,this._mergeKeys(a[e],c,f)}else{var g;g=d?d+h.KEY_SEPARATOR+e:e,c[g]=a[e]}},h.prototype.text=function(a,e,f){arguments[1]&&!b(arguments[1])&&(f=arguments[1],e=void 0);var i=f||this.getLocale();i||d(h.error.NO_LOCALE_IS_SET),this.hasLocale(i)||this.loadLocale(i);var j=this._loadedLocales[i][a];return void 0===j&&d(h.error.INVALID_KEY,{key:a,locale:i}),e?(void 0!==e.n&&(j=g.parseAndEval(j,e.n)),c(j,e)):j},h.prototype.on=function(a,b){this._subscribers[a]||(this._subscribers[a]=[]),this._subscribers[a].push(b)},h.prototype._fire=function(a,b){if(this._subscribers[a])for(var c=this._subscribers[a],d=c.length-1;d>=0;d--)c[d].call(null,b)},h.prototype.off=function(a,b){if(this._subscribers[a]){if(b){var c=this._subscribers[a].indexOf(b);this._subscribers[a].splice(c,1)}b&&0!==this._subscribers.length||delete this._subscribers[a]}},h.prototype.once=function(a,b){this.on(a,function(c){this.off(a,b),b(c)}.bind(this))},h.prototype._init=function(a){a||d(h.error.NO_OPTS),a.path?this._msgPath=a.path:d(h.error.NO_PATH)},h.loadFile=function(a){var b=new XMLHttpRequest;b.open("GET",a.url),b.onreadystatechange=function(){4===b.readyState&&(200==b.status||f(a.url)&&b.responseText.length>0?a.success(b.responseText):a.error(b.responseText))},b.send(null)},h.error={NO_OPTS:"Options are not present",NO_PATH:"Options path is not present",NO_MESSAGES:"{{file}} is unreachable. Error {{error}}",EMPTY_MESSAGES:"{{file}} is empty",INVALID_KEY:"{{key}} key is not present in locale {{locale}}",NO_LOCALE_IS_SET:"Locale is not set.",INVALID_PLURAL:"Invalid plural form: {{plural}}"},h.event={LOCALE_LOAD:"localeload",LOCALE_CHANGE:"localechange"},h.KEY_SEPARATOR=".","function"==typeof define&&define.amd?define(function(){return h}):a.I18nText=h}("undefined"==typeof window?this:window);

132
i/js/main.js Normal file
View File

@ -0,0 +1,132 @@
(function() {
'use strict';
var initialized = false;
var i18n;
// i18n key prefix for MUC ("muc.") or 1:1 chat ("chat.")
var key_prefix;
var display_data = null;
function show_clients(client_array) {
var list = document.getElementById('client_list');
for (var id = 0; id < client_array.length; id++) {
var item = document.createElement('p');
item.innerHTML = client_array[id];
list.appendChild(item);
}
}
function load_clients(url) {
var request = new XMLHttpRequest();
request.open('GET', url);
request.onreadystatechange = function () {
if (request.readyState === 4) {
if (request.status === 200 || (isLocalFileRequest(url) && request.responseText.length > 0)) {
show_clients(JSON.parse(request.responseText));
}
}
};
request.send(null);
}
function load_hash() {
var muc = false;
key_prefix = "chat.";
var jid = window.location.search || window.location.hash;
jid = decodeURIComponent(jid.substring(jid.indexOf('#') + 1, jid.length));
if (jid === "")
jid = "decentralized@conference.moemoekyun.moe?join"
try {
base_decoded = window.atob(jid);
if (base_decoded.search('@') >= 0)
jid = base_decoded;
} catch (err) {
// ignore error, JID wasn't base64 encoded
}
if (jid.search("\\?join") >= 0) {
muc = true;
key_prefix = "muc.";
}
// TODO: proper error checking / display / Creation of invitations
if (jid.search("@") <= 0) return {jid:jid, jid_encoded:jid, name: jid};
var name = jid.split("@")[0];
name = name.charAt(0).toUpperCase() + name.slice(1);
var jid_parts = jid.split("?");
jid_parts[0] = encodeURIComponent(jid_parts[0]) // URL-encode the JID only
var jid_encoded = jid_parts.join("?");
return {jid: jid, jid_encoded: jid_encoded, name: name};
}
function translate_ui() {
// translation
document.title = i18n.text(key_prefix + 'title', display_data);
// MUC/chat specific
['heading', 'button'].forEach(function(id) {
document.getElementById(id).innerHTML = i18n.text(key_prefix + id, display_data);
});
// and agnostic
['clients', 'recommend', 'checkfulllist', 'xmppis'].forEach(function(id) {
document.getElementById(id).innerHTML = i18n.text(id, display_data);
});
}
function rehash() {
display_data = load_hash();
document.getElementById('button').href = "xmpp:" + display_data.jid_encoded;
document.getElementById('url_in').value = "xmpp:" + display_data.jid;
translate_ui();
}
function createQR() {
display_data = load_hash();
new QRCode(document.getElementById("qrcode"), "xmpp:" + display_data.jid);
}
function load_done() {
if (initialized) return;
initialized = true;
// load i18n and perform translation
i18n = new I18nText({path: 'lang'});
i18n.once(I18nText.event.LOCALE_CHANGE, function (data) {
rehash();
});
i18n.setLocale('ru');
// functionality
if (navigator.userAgent.indexOf("Android") >= 0) {
load_clients("json/clients_Android.json")
}
else if (navigator.userAgent.indexOf("Linux") >= 0) {
load_clients("json/clients_Linux.json");
createQR();
}
else if (navigator.userAgent.indexOf("iPhone") >= 0) {
load_clients("json/clients_iOS.json")
}
else {
load_clients("json/clients_Windows.json");
createQR();
}
window.addEventListener("hashchange", rehash, false);
document.getElementById("url_in").addEventListener("focus", function(event) {
event.target.select();
});
}
// Wait for the DOM to be ready
document.addEventListener('DOMContentLoaded', load_done, false);
document.onreadystatechange = function() {
if (document.readyState === 'interactive') {
load_done();
}
};
})();

1
i/js/qrcode.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,3 @@
[
"<a href=\"https://f-droid.org/repo/eu.sum7.conversations_42015.apk\"><img width=30% src=\"img/fdroid.png\"></a>"
]

View File

@ -0,0 +1,3 @@
[
"<strong><a href=\"https://github.com/dino/dino/wiki/Distribution-Packages\">Dino</a></strong> - лёгкий и современный"
]

View File

@ -0,0 +1,3 @@
[
"<strong><a href=\"https://github.com/UWPX/UWPX-Client/releases/download/v.0.35.1.0/UWPX-Installer.exe\">UWPX</a></strong> - практичный"
]

3
i/json/clients_iOS.json Normal file
View File

@ -0,0 +1,3 @@
[
"<strong><a href=\"https://apps.apple.com/ru/app/siskin-im/id1153516838\">Шишкин IM</a></strong> - лёгкий и мощьный"
]

20
i/lang/ru.json Normal file
View File

@ -0,0 +1,20 @@
{
"chat": {
"title": "Приглашение от {{name}}",
"heading": "{{name}} хочет связаться",
"button": "Добавить {{name}} в список контактов",
"":""
},
"muc": {
"title": "Приглашение в {{name}}",
"heading": "Приглашение в {{name}}",
"button": "Вступить в групповой чат {{name}}",
"":""
},
"clients": "Чтобы это произошло, нужно использовать джаббер клиент.",
"recommend": "Мы рекомендуем:",
"checkfulllist": "Джаббер (XMPP) - это удобная и безопасная форма обмена сообщениями. Cвободный выбор клиента и сервера для связи со всеми.",
"xmppis": "<a href='https://git.macaw.me/Tolstoevsky/fedi/src/branch/master/i'>Исходный код</a>",
"create": "Хотите создать своё приглашение?",
"":""
}

361
im.html
View File

@ -1,106 +1,189 @@
<!DOCTYPE HTML> <!DOCTYPE HTML>
<html> <html>
<head> <head profile="https://fedi.life">
<link rel="icon"
type="image/png"
href="favicon.png" />
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>У вас всегда есть выбор! — Мессенджеры</title> <title>У вас всегда есть выбор! — Мессенджеры</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/picnic.min.css">
<link rel="stylesheet" href="css/menu.css"> <style>aside a.top {
<link rel="stylesheet" href="css/popup.css"> font-size: 0;
<link rel="stylesheet" href="css/btn.css"> position: fixed;
<script src="js/popup.js"></script> bottom: 0;
<script src="js/menu.js"></script> font-weight: bold;
width: 180px;
padding: .6em 0;
margin-bottom: 0;
border-radius: .3em .3em 0 0;
transition: all .3s ease;
}
aside a.top.visible {
font-size: 1em;
}
aside .links a.button {
text-align: left;
}
@media all and (max-width: 1000px) {
aside a.pseudo.top {
background: rgba(255, 255, 255, .8);
width: 100%;
left: 0;
text-align: center;
z-index: 100;
}
}
.documentation article > h2 {
margin: -2em 0 .6em;
padding: 3em 0 0;
line-height: 1;
}
.documentation article > h3 {
margin-bottom: .6em;
}
.documentation aside h2 {
margin-top: 0;
padding: 1.25em 0;
line-height: 1;
}
.documentation aside a.pseudo {
color: #0074D9;
margin: 0;
}
.documentation > section {
background: #fff;
text-align: left;
width: 90%;
max-width: 960px;
margin: 0 auto;
padding: 80px 0 0;
}
.documentation article > h1 {
margin: 0;
padding: 0.6em 0;
font-size: 2em;
line-height: 1.5;
}
.documentation aside a.button {
display: block;
}
.documentation pre[class*="language-"] {
margin-top: 10px;
margin-bottom: 40px;
}
.documentation .index pre {
margin: 0;
font-size: .9em;
}
</style>
</head> </head>
<body> <body>
<div class="topnav" id="rtopnav"> <nav class="fedi">
<a href="index.html">Главная</a> <a href="https://fedi.life" class="brand">
<a href="mail.html">Почта</a> <img class="logo" src="images/logo.webp" />
<a href="im.html" class="active">Мессенджеры</a> <span>Fedi.Life</span>
<a href="social.html">Соцсети</a> </a>
<a href="search.html">Поисковики</a>
<div class="dropdown">
<button class="dropbtn">Ещё
<i class="fa fa-caret-down"></i>
</button>
<div class="dropdown-content">
<a href="extra.html">Документы и агитматериалы</a>
<a href="info.html">Подробнее</a>
</div>
</div>
<a href="javascript:void(0);" style="font-size:15px;" class="icon" onclick="dropme()"></a>
</div>
<div class="textblock"> <!-- responsive-->
<h2>Децентрализованные мессенджеры</h2> <input id="bmenub" type="checkbox" class="show">
<p>Способы быстро списаться и созвониться с нужным человеком</p> <label for="bmenub" class="burger pseudo button">меню</label>
<div class="imgblock">
<div class="imgblock">
<img src="images/chatsecure_messenger.png" width=40% style="float:left; margin:1%;" <div class="menu">
onclick="openModal();currentSlide(1)" class="hover-shadow cursor"/> <a href="im.html" class="pseudo button">Мессенджеры</a>
<img src="images/movim.png" width=40% style="float:left; margin:1%;" <a href="social.html" class="pseudo button">Соцсети</a>
onclick="openModal();currentSlide(2)" class="hover-shadow cursor"/> <a href="multimedia.html" class="pseudo button">Мультимедиа</a>
<img src="images/conversations.png" width=40% style="float:left; margin:1%;" <a href="mail.html" class="pseudo button">Почта</a>
onclick="openModal();currentSlide(3)" class="hover-shadow cursor"/> <a href="search.html" class="pseudo button">Поиск</a>
</div> <a href="extra.html" class="pseudo button">Допматериалы</a>
<p> <a href="info.html" class="pseudo button">Подробнее</a>
<h3>XMPP (он же Jabber) - на замену WhatsApp и Telegram</h3> </div>
</nav>
<main id="home" class="documentation">
<section class="flex">
<article class="four-fifth-1000">
<header><h3>Децентрализованные мессенджеры<h3></header>
<p>Способы быстро списаться и созвониться с нужным человеком. Общение через сеть должно быть безопасным, приватным и неподцензурным. И вот сервисы, которые вам помогут в этом:
</p>
</article>
<article class="card four-fifth-1000">
<header><h3>XMPP (он же Джаббер) — на замену WhatsApp/Viber/Telegram</h3></header>
<center><label for="modal_jab"><img src="images/conversejs.webp" width="80%"></label> </center>
<div class="modal">
<input id="modal_jab" type="checkbox" />
<label for="modal_jab" class="overlay"></label>
<article>
<header>
<h3>Jabber</h3>
<label for="modal_jab" class="close">&times;</label>
</header>
<section class="content">
<img src="images/conversejs.webp" width="100%">
</section>
</article>
</div>
<span> <span>
Широко используемый свободный и открытый стандарт интернет-сообщений. Широко используемый свободный и открытый стандарт интернет-сообщений.
Весьма прост в использовании — устанавливаем приложение, регистрируем аккаунт, общаемся. Весьма прост в использовании — устанавливаем приложение, регистрируем аккаунт, общаемся.
<p> <p>
В силу распределённости протокола, количество мест, где можно зарегистрироваться, В силу распределённости протокола, количество мест, где можно зарегистрироваться,
огромно. Независимо от того, на каком сервере вы регистрируетесь - огромно. Независимо от того, на каком сервере вы регистрируетесь -
все пользователи доступны для вас. Если выбор среди тысяч чатов и десятков все пользователи доступны для вас.
приложений для вас сложен — используйте указанный ниже Quicksy - он тоже часть этой сети.
</p> </p>
</p> </p>
<div class="textblock"> <center>
<h4>Где зарегистрироваться</h4> <div class="tabs two">
<input id='tab-1' type='radio' name='tabgroupB' checked />
<a class="Button" href="https://chinwag.im">chinwag.im</a> <label class="pseudo button toggle" for="tab-1">Где зарегистрироваться</label>
<a class="Button" href="https://xmpp.jp">xmpp.jp</a> <input id='tab-2' type='radio' name='tabgroupB'>
<a class="Button" href="https://jabber.at">jabber.at</a> <label class="pseudo button toggle" for="tab-2">Приложения</label>
<a class="Button" href="https://404.city">404.city</a>
<a class="Button" href="https://jabber.ru">jabber.ru</a>
</div>
<div class="row">
<div class="textblock"> <div><center><a class="button" href="https://404.city/">404.city</a>
<h4>Мобильные приложения</h4> <a class="button" href="https://www.shad0w.io/register.php">Shad0w</a>
<a class="Button2" href="https://play.google.com/store/apps/details?id=im.quicksy.client"> <a class="button" href="https://5222.de/register/">5222.de</a>
<IMG src="images/google.png" width="24" height="24">Quicksy (Google Play)</a> <a class="button" href="https://e2e.ee/en/gst/">E2E</a>
<a class="Button2" href="https://play.google.com/store/apps/details?id=eu.siacs.conversations">
<IMG src="images/google.png" width="24" height="24">Conversations(Платный)</a>
<a class="Button2" href="https://f-droid.org/en/packages/eu.siacs.conversations/">
<IMG src="images/fdroid.png" width="24" height="24">Conversations (Бесплатный)</a>
<a class="Button2" href="https://f-droid.org/en/packages/im.quicksy.client">
<IMG src="images/fdroid.png" width="24" height="24">Quicksy (F-Droid)</a>
<a class="Button2" href="https://itunes.apple.com/app/chatsecure/id464200063">
<IMG src="images/apple.png" width="24" height="24">Chat Secure (iOS)</a>
<a class="Button2" href="https://itunes.apple.com/us/app/monal-free-xmpp-chat/id317711500">
<IMG src="images/apple.png" width="24" height="24">Monal (iOS)</a>
<a class="Button2" href="https://apps.apple.com/us/app/jabme-your-free-easy-xmpp-messenger/id1070168611">
<IMG src="images/apple.png" width="24" height="24">JabMe (iOS)</a>
</div>
</span> </center></div>
<div><center><a class="button" href="https://conversejs.org/fullscreen.html">ConverseJS</a></button>
</div> <br>
<div class="imgblock"> <a class="button" href="https://f-droid.org/en/packages/eu.siacs.conversations/"><img src="images/fdroid.webp"> Conversations</a></button><br>
<div class="imgblock"> <a class="button" href="https://play.google.com/store/apps/details?id=im.blabber.messenger"><img src="images/google.webp"> blabber.im</a></button>
<img src="images/jitsi2.png" width=35% style="float:left; margin:1%;" <a class="button" href="https://apps.apple.com/app/tigase-messenger/id1153516838"><img src="images/apple.webp"> Siskin IM</a></button>
onclick="openModal();currentSlide(4)" class="hover-shadow cursor"/> </center></div>
<img src="images/jami.jpg" width=35% style="float:left; margin:1%;" </div>
onclick="openModal();currentSlide(5)" class="hover-shadow cursor"/> </div>
</div> </center>
<h3>Jitsi Meet и Jami - на замену Skype</h3> </article>
<article class="card four-fifth-1000">
<header><h3>Jitsi Meet и Jami — на замену Skype</h3></header>
<center><label for="modal_meet"><img src="images/jitsi2.jpg" width="80%"></label> </center>
<div class="modal">
<input id="modal_meet" type="checkbox" />
<label for="modal_meet" class="overlay"></label>
<article>
<header>
<h3>Jitsi Meet</h3>
<label for="modal_meet" class="close">&times;</label>
</header>
<section class="content">
<img src="images/jitsi2.jpg" width="100%">
</section>
</article>
</div>
<span> <span>
Свободные открытые приложения для чатов и видеозвонков, разрабатываемые командами добровольцев. Свободные открытые приложения для чатов и видеозвонков, разрабатываемые командами добровольцев.
@ -112,89 +195,49 @@
В Jami дела обстоят схожим образом — каждому пользователю выдаётся уникальный код, В Jami дела обстоят схожим образом — каждому пользователю выдаётся уникальный код,
которым можно поделиться с другими участниками (аналог номера аськи/телефона...) которым можно поделиться с другими участниками (аналог номера аськи/телефона...)
</p> </p>
<div class="textblock" >
<h4>Приложения</h4> <center>
<a class="Button2" href="https://jami.net/download-jami-linux/"><IMG src="images/linux.png" width="24" height="24">Jami (Linux)</a> <div class="tabs two">
<a class="Button2" href="https://jami.net/download-jami-windows/"><IMG src="images/windows.png" width="24" height="24">Jami (Windows)</a> <input id='tab-11' type='radio' name='tabgroupC' checked />
<a class="Button2" href="https://jami.net/download-jami-macos/"><IMG src="images/apple.png" width="24" height="24">Jami (MacOS)</a> <label class="pseudo button toggle" for="tab-11">Приложения</label>
</div> <input id='tab-21' type='radio' name='tabgroupC'>
<div class="textblock"> <label class="pseudo button toggle" for="tab-21">Мобильные приложения</label>
<h4>Мобильные приложения</h4> <div class="row">
<a class="Button2" href="https://play.google.com/store/apps/details?id=org.jitsi.meet"><img src="images/google.png" width="24" height="24"> Jitsi (Google Play)</a>
<a class="Button2" href="https://f-droid.org/en/packages/org.jitsi.meet"><img src="images/fdroid.png" width="24" height="24"> Jitsi (F-Droid)</a>
<a class="Button2" href="https://f-droid.org/en/packages/cx.ring"><IMG src="images/fdroid.png" width="24" height="24">Jami (F-Droid)</a>
<a class="Button2" href="https://play.google.com/store/apps/details?id=cx.ring"><IMG src="images/google.png" width="24" height="24">Jami (Google play)</a>
<a class="Button2" href="https://itunes.apple.com/us/app/jitsi-meet/id1165103905"><IMG src="images/apple.png" width="24" height="24">Jitsi (iOS)</a> <div><center>
<a class="Button2" href="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055"><IMG src="images/apple.png" width="24" height="24">Jami (iOS)</a> <a class="button" href="https://meet.jit.si/">Jitsi (Web)</a></button>
</div> <br>
<div class="textblock"> <a class="button" href="https://jami.net/download-jami-linux/"><img src="images/linux.webp">Jami (Linux)</a></button>
<h4>Web</h4> <a class="button" href="https://jami.net/download-jami-windows/"><img src="images/windows.webp">Jami (Windows)</a></button>
<a class="Button" href="https://meet.jit.si/">meet.jit.si</a> <a class="button" href="https://jami.net/download-jami-macos/"><img src="images/apple.webp">Jami (MacOS)</a></button>
</center></div>
</div> <div>
<center><a class="button" href="https://f-droid.org/packages/org.jitsi.meet"><img src="images/fdroid.webp">Jitsi (F-Droid)</a></button>
</div>
</div>
<a class="button" href="https://play.google.com/store/apps/details?id=cx.ring"><img src="images/google.webp">Jitsi (G-Play)</a></button>
<a class="button" href="https://apps.apple.com/app/jitsi-meet/id1165103905"><img src="images/apple.webp">Jitsi (iOS)</a></button>
<br>
<a class="button" href="https://f-droid.org/packages/cx.ring"><img src="images/fdroid.webp">Jami (F-Droid)</a></button>
<a class="button" href="https://play.google.com/store/apps/details?id=cx.ring"><img src="images/google.webp">Jami (G-Play)</a></button>
<a class="button" href="https://apps.apple.com/app/ring-a-gnu-package/id1306951055"><img src="images/apple.webp">Jami (iOS)</a></button>
</center></div>
</div>
<div id="myModal" class="modal"> </div>
<span class="close cursor" onclick="closeModal()">&times;</span> </center>
<div class="modal-content"> </article>
</article>
<div class="mySlides"> </section>
<div class="numbertext">chatsecure</div> </main>
<img src="images/chatsecure_messenger.png" style="width:100%"> <section>
</div> <hr>
<div class="mySlides"> <center>
<div class="numbertext">Movim</div> <a href="https://fedi.life/nocss/">Облегчённая версия сайта</a>&nbsp;|&nbsp;Hosted by
<img src="images/movim.png" style="width:100%"> <a href="https://billing.flokinet.is/aff.php?aff=371"><img src=flokinet_smol.png border="0" alt="FlokiNet"></a> &nbsp;|&nbsp;Created with <a href="https://picnicss.com/">PicniCSS</a>&nbsp;|&nbsp; with <a href="https://phreedom.club/tt/landing.html">Trivial Technology</a> in mind. &nbsp;|&nbsp; <a href="https://gitea.phreedom.club/tolstoevsky/fedi">Copyleft 🄯</a> Tolstoevsky and comrades.
</div> </center>
<div class="mySlides"> </section>
<div class="numbertext">Converstions</div>
<img src="images/conversations.png" style="width:100%">
</div>
<div class="mySlides">
<div class="numbertext">Jitsi</div>
<img src="images/jitsi2.png" style="width:100%">
</div>
<div class="mySlides">
<div class="numbertext">Jami</div>
<img src="images/jami.jpg" style="width:100%">
</div>
<a class="prev" onclick="plusSlides(-1)">&#10094;</a>
<a class="next" onclick="plusSlides(1)">&#10095;</a>
<div class="caption-container">
<p id="caption"></p>
</div>
<div class="column">
<img class="demo cursor" src="images/chatsecure_messenger.png" style="width:100%" onclick="currentSlide(1)" alt="ChatSecure">
</div>
<div class="column">
<img class="demo cursor" src="images/movim.png" style="width:100%" onclick="currentSlide(2)" alt="Movim">
</div>
<div class="column">
<img class="demo cursor" src="images/conversations.png" style="width:100%" onclick="currentSlide(3)" alt="Conversations">
</div>
<div class="column">
<img class="demo cursor" src="images/jitsi2.png" style="width:100%" onclick="currentSlide(4)" alt="Jitsi">
</div>
<div class="column">
<img class="demo cursor" src="images/jami.jpg" style="width:100%" onclick="currentSlide(5)" alt="Jami">
</div>
</div>
</div>
</div>
</body> </body>
</html> </html>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
images/apple.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

BIN
images/ava-min.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

BIN
images/book.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
images/bookwyrm.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

BIN
images/castopod.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

BIN
images/cockmail.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

BIN
images/conversejs.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

BIN
images/disroot.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
images/ecosia.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

BIN
images/fdroid.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
images/fedi-small.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

BIN
images/friendica.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

BIN
images/funkwhale.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
images/globe.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
images/google.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 KiB

BIN
images/hubzilla.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 107 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 55 KiB

BIN
images/jitsi2.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
images/know.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

0
images/koshka.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 84 KiB

After

Width:  |  Height:  |  Size: 84 KiB

BIN
images/lemmy.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
images/linux.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 244 B

BIN
images/logo-big.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
images/logo.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 618 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
images/mag.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 78 KiB

BIN
images/mailfence.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 KiB

BIN
images/mastodon2.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

BIN
images/misskey.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 881 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

BIN
images/movim.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

BIN
images/owncast.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 629 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 KiB

BIN
images/peertube.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 KiB

BIN
images/pixelfed.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 201 KiB

BIN
images/pleroma.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

0
images/posteo.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
images/q.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

BIN
images/searx.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

0
images/signal.jpg Normal file → Executable file
View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Some files were not shown because too many files have changed in this diff Show More