Skip to content

Commit 2ff6467

Browse files
committed
first pass at renaming app in the UI
1 parent 08bad57 commit 2ff6467

File tree

12 files changed

+42
-146
lines changed

12 files changed

+42
-146
lines changed

README.md

+12-116
Original file line numberDiff line numberDiff line change
@@ -1,123 +1,19 @@
1-
# C4Social fork of Mastodon
1+
# Ecko (recent fork of Mastodon)
22

3-
[![GitHub release](https://c4social.org/assets/no-releases-for-c4.svg)][releases]
4-
[![Build Status](https://img.shields.io/circleci/project/github/c4social/mastodon.svg)][circleci]
5-
[![Code Climate](https://img.shields.io/codeclimate/maintainability/c4social/mastodon.svg)][code_climate]
6-
[![Docker Pulls](https://img.shields.io/docker/pulls/dsterry/mastodon.svg)][docker]
3+
[![GitHub release](https://magicstone.dev/assets/no-releases-for-c4.svg)][releases]
4+
[![Build Status](https://img.shields.io/circleci/project/github/magicstone-dev/ecko.svg)][circleci]
5+
[![Code Climate](https://img.shields.io/codeclimate/maintainability/magicstone-dev/ecko.svg)][code_climate]
6+
[![Docker Pulls](https://img.shields.io/docker/pulls/dsterry/ecko.svg)][docker]
77

8-
[releases]: https://github.com/c4social/mastodon/releases
9-
[circleci]: https://circleci.com/gh/c4social/mastodon
10-
[code_climate]: https://codeclimate.com/github/c4social/mastodon
11-
[docker]: https://hub.docker.com/r/dsterry/mastodon/
8+
[releases]: https://github.com/magicstone-dev/ecko/releases
9+
[circleci]: https://circleci.com/gh/magicstone-dev/ecko
10+
[code_climate]: https://codeclimate.com/github/magicstone-dev/ecko
11+
[docker]: https://hub.docker.com/r/dsterry/ecko
1212

13-
This is a dynamic version of Mastodon which was forked in August of 2021.
13+
Ecko was forked from Mastodon in August 2021. The idea for the fork is to optimize toward community, that is making it as easy as possible to contribute. We're following a protocol that basically says if you are addressing a valid problem, your code gets merged. Everything else follows from that.
1414

1515
|For everyone|Instance administrators|Contributors (all skill levels)|
1616
|:----:|:----:|:----:|
17-
| Try it at https://c4.social | Install your own from https://github.com/C4Social/mastodon | Report an issue, submit code or docs, or solve a problem at the [Issue tracker](https://github.com/C4Social/mastodon/issues) |
17+
| Try it at https://c4.social | Install your own from https://github.com/magicstone-dev/ecko | Report an issue, submit code or docs, or solve a problem at the [Issue tracker](https://github.com/magicstone-dev/ecko/issues) |
1818

19-
20-
Learn more at [C4Social.org](https://c4social.org)
21-
22-
----
23-
24-
![Mastodon](https://i.imgur.com/NhZc40l.png)
25-
========
26-
27-
[![GitHub release](https://img.shields.io/github/release/mastodon/mastodon.svg)][releases2]
28-
[![Build Status](https://img.shields.io/circleci/project/github/mastodon/mastodon.svg)][circleci2]
29-
[![Code Climate](https://img.shields.io/codeclimate/maintainability/mastodon/mastodon.svg)][code_climate2]
30-
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/mastodon/localized.svg)][crowdin2]
31-
[![Docker Pulls](https://img.shields.io/docker/pulls/tootsuite/mastodon.svg)][docker2]
32-
33-
[releases2]: https://github.com/mastodon/mastodon/releases
34-
[circleci2]: https://circleci.com/gh/mastodon/mastodon
35-
[code_climate2]: https://codeclimate.com/github/mastodon/mastodon
36-
[crowdin2]: https://crowdin.com/project/mastodon
37-
[docker2]: https://hub.docker.com/r/tootsuite/mastodon/
38-
39-
Mastodon is a **free, open-source social network server** based on ActivityPub where users can follow friends and discover new ones. On Mastodon, users can publish anything they want: links, pictures, text, video. All Mastodon servers are interoperable as a federated network (users on one server can seamlessly communicate with users from another one, including non-Mastodon software that implements ActivityPub)!
40-
41-
Click below to **learn more** in a video:
42-
43-
[![Screenshot](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/ezgif-2-60f1b00403.gif)][youtube_demo]
44-
45-
[youtube_demo]: https://www.youtube.com/watch?v=IPSbNdBmWKE
46-
47-
## Navigation
48-
49-
- [Project homepage 🐘](https://joinmastodon.org)
50-
- [Support the development via Patreon][patreon]
51-
- [View sponsors](https://joinmastodon.org/sponsors)
52-
- [Blog](https://blog.joinmastodon.org)
53-
- [Documentation](https://docs.joinmastodon.org)
54-
- [Browse Mastodon servers](https://joinmastodon.org/#getting-started)
55-
- [Browse Mastodon apps](https://joinmastodon.org/apps)
56-
57-
[patreon]: https://www.patreon.com/mastodon
58-
59-
## Features
60-
61-
<img src="https://docs.joinmastodon.org/elephant.svg" align="right" width="30%" />
62-
63-
**No vendor lock-in: Fully interoperable with any conforming platform**
64-
65-
It doesn't have to be Mastodon, whatever implements ActivityPub is part of the social network! [Learn more](https://blog.joinmastodon.org/2018/06/why-activitypub-is-the-future/)
66-
67-
**Real-time, chronological timeline updates**
68-
69-
See the updates of people you're following appear in real-time in the UI via WebSockets. There's a firehose view as well!
70-
71-
**Media attachments like images and short videos**
72-
73-
Upload and view images and WebM/MP4 videos attached to the updates. Videos with no audio track are treated like GIFs; normal videos are looped - like vines!
74-
75-
**Safety and moderation tools**
76-
77-
Private posts, locked accounts, phrase filtering, muting, blocking and all sorts of other features, along with a reporting and moderation system. [Learn more](https://blog.joinmastodon.org/2018/07/cage-the-mastodon/)
78-
79-
**OAuth2 and a straightforward REST API**
80-
81-
Mastodon acts as an OAuth2 provider so 3rd party apps can use the REST and Streaming APIs, resulting in a rich app ecosystem with a lot of choices!
82-
83-
## Deployment
84-
85-
**Tech stack:**
86-
87-
- **Ruby on Rails** powers the REST API and other web pages
88-
- **React.js** and Redux are used for the dynamic parts of the interface
89-
- **Node.js** powers the streaming API
90-
91-
**Requirements:**
92-
93-
- **PostgreSQL** 9.5+
94-
- **Redis** 4+
95-
- **Ruby** 2.5+
96-
- **Node.js** 12+
97-
98-
The repository includes deployment configurations for **Docker and docker-compose**, but also a few specific platforms like **Heroku**, **Scalingo**, and **Nanobox**. The [**stand-alone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.
99-
100-
A **Vagrant** configuration is included for development purposes. To use it, complete following steps:
101-
102-
- Install Vagrant and Virtualbox
103-
- Run `vagrant up`
104-
- Run `vagrant ssh -c "cd /vagrant && foreman start"`
105-
- Open `http://mastodon.local` in your browser
106-
107-
## Contributing
108-
109-
Mastodon is **free, open-source software** licensed under **AGPLv3**.
110-
111-
You can open issues for bugs you've found or features you think are missing. You can also submit pull requests to this repository, or submit translations using Crowdin. To get started, take a look at [CONTRIBUTING.md](CONTRIBUTING.md). If your contributions are accepted into Mastodon, you can request to be paid through [our OpenCollective](https://opencollective.com/mastodon).
112-
113-
**IRC channel**: #mastodon on irc.libera.chat
114-
115-
## License
116-
117-
Copyright (C) 2016-2021 Eugen Rochko & other Mastodon contributors (see [AUTHORS.md](AUTHORS.md))
118-
119-
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
120-
121-
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details.
122-
123-
You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
19+
Learn more at [magicstone.dev](https://magicstone.dev)

app.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "Mastodon",
3-
"description": "C4 fork of a GNU Social-compatible microblogging server",
4-
"repository": "https://github.com/c4social/mastodon",
2+
"name": "Ecko",
3+
"description": "Ecko, a GNU Social and Mastodon-compatible microblogging server",
4+
"repository": "https://github.com/magicstone-dev/ecko",
55
"logo": "https://github.com/mastodon.png",
66
"env": {
77
"HEROKU": {
@@ -10,7 +10,7 @@
1010
"required": true
1111
},
1212
"LOCAL_DOMAIN": {
13-
"description": "The domain that your Mastodon instance will run on (this can be appname.herokuapp.com or a custom domain)",
13+
"description": "The domain that your Ecko instance will run on (this can be appname.herokuapp.com or a custom domain)",
1414
"required": true
1515
},
1616
"SECRET_KEY_BASE": {

app/javascript/mastodon/features/ui/components/link_footer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class LinkFooter extends React.PureComponent {
6262
<p>
6363
<FormattedMessage
6464
id='getting_started.open_source_notice'
65-
defaultMessage='Mastodon is open source software. You can contribute or report issues on GitHub at {github}.'
65+
defaultMessage='Ecko is open source software. You can contribute or report issues on GitHub at {github}.'
6666
values={{ github: <span><a href={source_url} rel='noopener noreferrer' target='_blank'>{repository}</a> (v{version})</span> }}
6767
/>
6868
</p>

app/javascript/mastodon/locales/en.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@
174174
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
175175
"error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
176176
"error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
177-
"error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
178-
"error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
177+
"error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Ecko through a different browser or native app.",
178+
"error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Ecko through a different browser or native app.",
179179
"errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
180180
"errors.unexpected_crash.report_issue": "Report issue",
181181
"federation.change": "Adjust status federation",
@@ -195,7 +195,7 @@
195195
"getting_started.documentation": "Documentation",
196196
"getting_started.heading": "Getting started",
197197
"getting_started.invite": "Invite people",
198-
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
198+
"getting_started.open_source_notice": "Ecko is open source software. You can contribute or report issues on GitHub at {github}.",
199199
"getting_started.security": "Account settings",
200200
"getting_started.terms": "Terms of service",
201201
"hashtag.column_header.tag_mode.all": "and {additional}",
@@ -337,7 +337,7 @@
337337
"notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
338338
"notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
339339
"notifications_permission_banner.enable": "Enable desktop notifications",
340-
"notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
340+
"notifications_permission_banner.how_to_control": "To receive notifications when Ecko isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
341341
"notifications_permission_banner.title": "Never miss a thing",
342342
"picture_in_picture.restore": "Put it back",
343343
"poll.closed": "Closed",
@@ -383,7 +383,7 @@
383383
"search_results.accounts": "People",
384384
"search_results.hashtags": "Hashtags",
385385
"search_results.statuses": "Posts",
386-
"search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Mastodon server.",
386+
"search_results.statuses_fts_disabled": "Searching posts by their content is not enabled on this Ecko server.",
387387
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
388388
"status.admin_account": "Open moderation interface for @{name}",
389389
"status.admin_status": "Open this post in the moderation interface",
@@ -446,7 +446,7 @@
446446
"timeline_hint.resources.statuses": "Older posts",
447447
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
448448
"trends.trending_now": "Trending now",
449-
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
449+
"ui.beforeunload": "Your draft will be lost if you leave Ecko.",
450450
"units.short.billion": "{count}B",
451451
"units.short.million": "{count}M",
452452
"units.short.thousand": "{count}K",

app/javascript/mastodon/locales/ga.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
"empty_column.public": "There is nothing here! Write something publicly, or manually follow users from other servers to fill it up",
173173
"error.unexpected_crash.explanation": "Due to a bug in our code or a browser compatibility issue, this page could not be displayed correctly.",
174174
"error.unexpected_crash.explanation_addons": "This page could not be displayed correctly. This error is likely caused by a browser add-on or automatic translation tools.",
175-
"error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
176-
"error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Mastodon through a different browser or native app.",
175+
"error.unexpected_crash.next_steps": "Try refreshing the page. If that does not help, you may still be able to use Ecko through a different browser or native app.",
176+
"error.unexpected_crash.next_steps_addons": "Try disabling them and refreshing the page. If that does not help, you may still be able to use Ecko through a different browser or native app.",
177177
"errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
178178
"errors.unexpected_crash.report_issue": "Report issue",
179179
"follow_recommendations.done": "Done",
@@ -188,7 +188,7 @@
188188
"getting_started.documentation": "Documentation",
189189
"getting_started.heading": "Getting started",
190190
"getting_started.invite": "Invite people",
191-
"getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.",
191+
"getting_started.open_source_notice": "Ecko is open source software. You can contribute or report issues on GitHub at {github}.",
192192
"getting_started.security": "Security",
193193
"getting_started.terms": "Terms of service",
194194
"hashtag.column_header.tag_mode.all": "and {additional}",
@@ -330,7 +330,7 @@
330330
"notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
331331
"notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
332332
"notifications_permission_banner.enable": "Enable desktop notifications",
333-
"notifications_permission_banner.how_to_control": "To receive notifications when Mastodon isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
333+
"notifications_permission_banner.how_to_control": "To receive notifications when Ecko isn't open, enable desktop notifications. You can control precisely which types of interactions generate desktop notifications through the {icon} button above once they're enabled.",
334334
"notifications_permission_banner.title": "Never miss a thing",
335335
"picture_in_picture.restore": "Put it back",
336336
"poll.closed": "Closed",
@@ -376,7 +376,7 @@
376376
"search_results.accounts": "People",
377377
"search_results.hashtags": "Hashtags",
378378
"search_results.statuses": "Toots",
379-
"search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Mastodon server.",
379+
"search_results.statuses_fts_disabled": "Searching toots by their content is not enabled on this Ecko server.",
380380
"search_results.total": "{count, number} {count, plural, one {result} other {results}}",
381381
"status.admin_account": "Open moderation interface for @{name}",
382382
"status.admin_status": "Open this status in the moderation interface",
@@ -438,7 +438,7 @@
438438
"timeline_hint.resources.statuses": "Older toots",
439439
"trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} talking",
440440
"trends.trending_now": "Trending now",
441-
"ui.beforeunload": "Your draft will be lost if you leave Mastodon.",
441+
"ui.beforeunload": "Your draft will be lost if you leave Ecko.",
442442
"units.short.billion": "{count}B",
443443
"units.short.million": "{count}M",
444444
"units.short.thousand": "{count}K",

config/deploy.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
lock '3.16.0'
44

5-
set :repo_url, ENV.fetch('REPO', 'https://github.com/c4social/mastodon.git')
5+
set :repo_url, ENV.fetch('REPO', 'https://github.com/magicstone-dev/ecko.git')
66
set :branch, ENV.fetch('BRANCH', 'main')
77

88
set :application, 'mastodon'

config/locales/en.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ en:
4747
silenced_title: Limited servers
4848
suspended: 'No data from these servers will be processed, stored or exchanged, making any interaction or communication with users from these servers impossible:'
4949
suspended_title: Suspended servers
50-
unavailable_content_html: Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.
50+
unavailable_content_html: Ecko generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.
5151
user_count_after:
5252
one: user
5353
other: users
@@ -1292,7 +1292,7 @@ en:
12921292
aliases: Account aliases
12931293
appearance: Appearance
12941294
authorized_apps: Authorized apps
1295-
back: Back to Mastodon
1295+
back: Back to Ecko
12961296
delete: Account deletion
12971297
development: Development
12981298
edit_profile: Edit profile
@@ -1565,7 +1565,7 @@ en:
15651565
signed_in_as: 'Signed in as:'
15661566
suspicious_sign_in_confirmation: You appear to not have logged in from this device before, so we're sending a security code to your e-mail address to confirm that it's you.
15671567
verification:
1568-
explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your Mastodon profile. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:'
1568+
explanation_html: 'You can <strong>verify yourself as the owner of the links in your profile metadata</strong>. For that, the linked website must contain a link back to your profile. The link back <strong>must</strong> have a <code>rel="me"</code> attribute. The text content of the link does not matter. Here is an example:'
15691569
verification: Verification
15701570
webauthn_credentials:
15711571
add: Add new security key

0 commit comments

Comments
 (0)