diff --git a/README.md b/README.md
index 59e1a9a..3bb7bd8 100644
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ php -S localhost:9000
git checkout -b my-cool-feature
```
-1. [open a PR](https://git.tilde.team/meta/site/pulls)
+1. [open a PR](https://tildegit.org/team/site/pulls)
thanks!
-hit me up on irc if you have any questions. most of this is quite hacky.
\ No newline at end of file
+hit me up on irc if you have any questions. most of this is quite hacky.
diff --git a/index.php b/index.php
index fa4eb9a..8bb6b83 100755
--- a/index.php
+++ b/index.php
@@ -54,9 +54,9 @@
+
diff --git a/news/001_new_news.json b/news/001_new_news.json
index 837de93..2eaea67 100644
--- a/news/001_new_news.json
+++ b/news/001_new_news.json
@@ -3,5 +3,5 @@
"date": "dec 2017",
"title": "good news everyone",
"author": "
~ben",
- "content": "there's a news feed on the homepage now!! whenever there is any news, it will be posted here. if you have any big news, make a pull request on the
git repo and then
~ben or another github admin can merge it"
+ "content": "there's a news feed on the homepage now!! whenever there is any news, it will be posted here. if you have any big news, make a pull request on the
git repo and then
~ben or another github admin can merge it"
}
diff --git a/news/006_tilde_theme.json b/news/006_tilde_theme.json
index 8a77586..e3dfe63 100644
--- a/news/006_tilde_theme.json
+++ b/news/006_tilde_theme.json
@@ -1,7 +1,7 @@
{
"published": true,
"date": "dec 2017",
- "title": "
tilde.team bootstrap theme :)",
+ "title": "
tilde.team bootstrap theme :)",
"author": "
~ben",
"content": "the tilde.team css is a fork of
Brobin/hacker-bootstrap. the main changes are increased font size and a fix for the background color of <pre> tags. have a look! anyone can link to the compiled css
here"
}
diff --git a/news/008_tildegit.json b/news/008_tildegit.json
index 5d4e3ba..67f7d69 100644
--- a/news/008_tildegit.json
+++ b/news/008_tildegit.json
@@ -1,7 +1,7 @@
{
"published": false,
"date": "jan 2018",
- "title": "
tildegit",
+ "title": "
tildegit",
"author": "
~ben",
"content": "for some reason, i have this desire to run all kinds of self-hosted tools on the tilde box. i used to run a gitlab instance under my own personal domain, but it turned out to be way more work than it was worth. i had been interested by
gogs in the past and stumbled upon the community fork
gitea, which is more up to date and full-featured. at this point, it's just some mirrored repos from my github page and the tilde.team org. let me know if you have any ideas for it!"
}
diff --git a/news/012_github.json b/news/012_github.json
index d4947e6..a803c3d 100644
--- a/news/012_github.json
+++ b/news/012_github.json
@@ -1,7 +1,7 @@
{
"published": true,
"date": "mar 2018",
- "title": "github projects on homepage",
+ "title": "git projects on homepage",
"author": "
~ben",
- "content": "the homepage now lists all public projects on the
tilde.team github org! let me know if you want me to add you :)"
+ "content": "the homepage now lists all public projects on the
tilde.team gitea org! let me know if you want me to add you :)"
}
diff --git a/news/014_gitea.json b/news/014_gitea.json
index 747a79d..a898915 100644
--- a/news/014_gitea.json
+++ b/news/014_gitea.json
@@ -1,7 +1,7 @@
{
"published": true,
"date": "jun 2018",
- "title": "
tilde.team gitea :)",
+ "title": "
tilde.team gitea :)",
"author": "
~ben",
"content": "there's a
gitea instance up on the tilde.team server. i migrated most repos from our github org to the meta org on gitea. hit me up on discord/irc or email if you have any questions!"
}
diff --git a/services.php b/services.php
index 099b2af..1aa881c 100644
--- a/services.php
+++ b/services.php
@@ -1,14 +1,14 @@
['fa' => 'code-fork', 'url' => 'https://git.tilde.team'],
- 'forum' => ['fa' => 'comment', 'url' => 'https://forum.tilde.team'],
+ 'gitea' => ['fa' => 'code-fork', 'url' => 'https://tildegit.org'],
+ 'forum' => ['fa' => 'comment', 'url' => 'https://bbj.tilde.team'],
'wiki' => ['fa' => 'book', 'url' => '/wiki/'],
'mastodon' => ['fa' => 'retweet', 'url' => 'https://tilde.zone'],
'chat' => ['fa' => 'comments-o', 'url' => 'https://tilde.chat'],
'webmail' => ['fa' => 'envelope', 'url' => 'https://mail.tilde.team'],
- 'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tilde.team'],
- 'pastebin' => ['fa' => 'paste', 'url' => 'https://paste.tilde.team/'],
+ 'cryptpad' => ['fa' => 'sticky-note', 'url' => 'https://pad.tildeverse.org'],
+ 'pastebin' => ['fa' => 'paste', 'url' => 'https://paste.tildeverse.org/'],
'termbin' => ['fa' => 'terminal', 'url' => 'https://bin.tilde.team/'],
'nullpointer' => ['fa' => 'file-code-o', 'url' => 'https://ttm.sh'],
'gopher' => ['fa' => 'floppy-o', 'url' => 'https://gopher.tilde.team'],
diff --git a/wiki/README.md b/wiki/README.md
index a4e94ab..7fa99e6 100644
--- a/wiki/README.md
+++ b/wiki/README.md
@@ -4,11 +4,11 @@ hi there, welcome to our wiki!
to contribute to the wiki:
-* [fork the repo](https://git.tildeverse.org/repo/fork/1)
+* [fork the repo](https://tildegit.org/repo/fork/1)
* clone the repo to your local machine (or your public_html folder on the tilde.team box for live testing)
```sh
-git clone git@tilde.team:yourusername/site
+git clone https://tildegit.org/yourusername/site
```
* create a new branch for your page
@@ -23,14 +23,14 @@ cp template.md my-new-page.md
* edit as needed!
-* commit your changes and [create a pull request](https://git.tildeverse.org/team/site/pulls) :)
+* commit your changes and [create a pull request](https://tildegit.org/team/site/pulls) :)
```sh
git add --all
git commit -m "added my-new-page"
git push origin my-new-page # this should match the branch name you created earlier
```
-* create a pull request on the [site](https://git.tilde.team/team/site) repo
+* create a pull request on the [site](https://tildegit.org/team/site) repo
thanks!~
diff --git a/wiki/index.php b/wiki/index.php
index cfce68f..a89f30a 100644
--- a/wiki/index.php
+++ b/wiki/index.php
@@ -47,7 +47,7 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
welcome to the tilde.team wiki!
if you want to contribute, check out the
- source and open a PR!
+ source and open a PR!
@@ -79,7 +79,7 @@ if (!isset($_GET["page"]) || !file_exists("pages/{$_GET['page']}.md")) {
=str_replace("
getContent())?>
- .md">
+ .md">
source
diff --git a/wiki/pages/manifesto.md b/wiki/pages/manifesto.md
index 7a0a75e..39d4f46 100644
--- a/wiki/pages/manifesto.md
+++ b/wiki/pages/manifesto.md
@@ -24,7 +24,7 @@ here are some of our most important values:
---
-this document is still a work in progress. if you have any ideas or suggestions, [send a pr](https://git.tilde.team/meta/site/src/branch/master/wiki/pages/manifesto.md)!
+this document is still a work in progress. if you have any ideas or suggestions, [send a pr](https://tildegit.org/team/site/src/branch/master/wiki/pages/manifesto.md)!
[living draft of this document here](https://pad.tilde.team/code/#/2/code/edit/RFBUqXec+9+MlZzx4mnhU3ps/)
diff --git a/wiki/pages/other-tildes.md b/wiki/pages/other-tildes.md
index 2a261ea..971f83c 100644
--- a/wiki/pages/other-tildes.md
+++ b/wiki/pages/other-tildes.md
@@ -9,7 +9,7 @@ category:
# other tildes
-if you're starting a tilde and want to be added to this list, [open a PR :)](https://git.tilde.team/meta/site)
+if you're starting a tilde and want to be added to this list, [open a PR :)](https://tildegit.org/team/site)
| tilde name | description | where to join |
|---|---|---|
diff --git a/wiki/pages/services.md b/wiki/pages/services.md
index f537eb6..e39a098 100644
--- a/wiki/pages/services.md
+++ b/wiki/pages/services.md
@@ -14,36 +14,39 @@ i'll keep this wiki page updated with the services that are running on our littl
### our deployed projects
-* [forum](https://forum.tilde.team) ([source](https://git.tilde.team/team/forum)) - mostly defunct in favor of bbj
+* [forum](https://forum.tilde.team) ([source](https://tildegit.org/team/forum)) - mostly defunct in favor of bbj
### code related stuff
-* [gitea](https://git.tilde.team/) tilde team git hosting
+* [gitea](https://tildegit.org/) tilde team git hosting
### general utilities
-* [cryptpad](https://pad.tilde.team)
- - [cryptdrive](https://pad.tilde.team/drive/)
- - [markdown/code editor](https://pad.tilde.team/code/)
- - [presentation slides editor](https://pad.tilde.team/slides/)
- - [polls](https://pad.tilde.team/poll/)
- - [kanban boards](https://pad.tilde.team/kanban/)
- - [whiteboard](https://pad.tilde.team/whiteboard/)
- - [file drop](https://pad.tilde.team/file/)
- - [todo lists](https://pad.tilde.team/todo/)
-* [paste bin](https://paste.tilde.team)
-* [nullpointer fileshare](https://0x0.tilde.team)
+* [cryptpad](https://pad.tildeverse.org)
+ - [cryptdrive](https://pad.tildeverse.org/drive/)
+ - [markdown/code editor](https://pad.tildeverse.org/code/)
+ - [presentation slides editor](https://pad.tildeverse.org/slides/)
+ - [polls](https://pad.tildeverse.org/poll/)
+ - [kanban boards](https://pad.tildeverse.org/kanban/)
+ - [whiteboard](https://pad.tildeverse.org/whiteboard/)
+ - [file drop](https://pad.tildeverse.org/file/)
+ - [todo lists](https://pad.tildeverse.org/todo/)
+* [paste bin](https://paste.tildeverse.org)
+* [nullpointer fileshare](https://ttm.sh)
* [termbin](https://bin.tilde.team)
### social/communications
* [irc](https://tilde.chat) tilde.chat irc network for the tildeverse
+* [pleroma](https://pleroma.tilde.zone) federated social network
* [mastodon](https://tilde.zone) federated social network
- [pinafore front-end](https://pinafore.tilde.zone)
- [halcyon front-end](https://halcyon.tilde.zone)
+ - [tooty front-end](https://tooty.tilde.zone)
* [email](?page=email) ([webmail](https://mail.tilde.team), smtp/imap, mutt, and alpine)
-* [bbj](https://git.tildeverse.org/team/bbj) ([web mirror here](https://bbj.tilde.team)) - forked from [desvox/bbj](https://github.com/desvox/bbj)
+* [bbj](https://tildegit.org/team/bbj) ([web mirror here](https://bbj.tilde.team)) - forked from [desvox/bbj](https://github.com/desvox/bbj)
* [gopher proxy](https://gopher.tilde.team)
+
diff --git a/wiki/pages/stuff-to-do.md b/wiki/pages/stuff-to-do.md
index baad8c5..aecb5d7 100644
--- a/wiki/pages/stuff-to-do.md
+++ b/wiki/pages/stuff-to-do.md
@@ -14,7 +14,7 @@ category:
* `mutt` - command line mail client for @tilde.team mail
* `alpine` - alternate command line mail client based on pine
* `bbj` - command line bbs (bulletin board and jelly)
- - source here: [gitea mirror](https://git.tilde.team/meta/bbj) and [github fork](https://github.com/tilde-team/bbj)
+ - source here: [gitea mirror](https://tildegit.org/team/bbj) and [github fork](https://github.com/tilde-team/bbj)
* `talk` - old school chat utility (`man talk` for more info)
* `who` - see who else is connected right now
* `webirc` - register for access to our [thelounge webchat client](https://irc.tilde.team)
diff --git a/wiki/pages/tildeblogs.md b/wiki/pages/tildeblogs.md
index 00da420..2e98e9d 100644
--- a/wiki/pages/tildeblogs.md
+++ b/wiki/pages/tildeblogs.md
@@ -7,11 +7,11 @@ category:
- main
---
-# tildeblogs with [bashblog](https://git.tildeverse.org/team/bashblog)
+# tildeblogs with [bashblog](https://tildegit.org/team/bashblog)
bashblog is available system-wide as `bb`
-tildeblogs can be built with [bashblog](https://git.tildeverse.org/team/bashblog)
+tildeblogs can be built with [bashblog](https://tildegit.org/team/bashblog)
change to your ~/public_html/blog directory: `cd ~/public_html/blog` (bashblog will do this for you if you forget)
@@ -32,12 +32,13 @@ change to your ~/public_html/blog directory: `cd ~/public_html/blog` (bashblog w
edit the `.config` file to change the name and url and other settings for your blog
-for an example of customization, see [~ben's blog](https://tilde.team/~ben/blog/) ([config source](https://git.tilde.team/ben/tilde/src/branch/master/blog/.config)).
+for an example of customization, see [~ben's blog](https://tilde.team/~ben/blog/) ([config source](https://tildegit.org/ben/tilde/src/branch/master/blog/.config)).
-for more details: see [the bashblog repo](https://git.tildeverse.org/team/bashblog)
+for more details: see [the bashblog repo](https://tildegit.org/team/bashblog)
if you have any improvements/bugfixes, feel free to open a PR!
---
of course, you're free to use any other blogging software :)
+