diff --git a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
index c1429c756..38dbd4d40 100644
--- a/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
+++ b/app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
@@ -357,8 +357,8 @@ class EmojiPickerDropdown extends React.PureComponent {
diff --git a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
index 5ec937a39..4c1332153 100644
--- a/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
+++ b/app/javascript/mastodon/features/compose/containers/emoji_picker_dropdown_container.js
@@ -12,13 +12,13 @@ const DEFAULTS = [
'+1',
'grinning',
'kissing_heart',
- 'heart_eyes',
+ 'vhs',
'laughing',
- 'stuck_out_tongue_winking_eye',
+ 'floppy_disk',
'sweat_smile',
'joy',
'yum',
- 'disappointed',
+ 'computer',
'thinking_face',
'weary',
'sob',
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 0fd9badac..1fd351a9f 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -14,20 +14,20 @@ import { Link } from 'react-router-dom';
import NavigationBar from '../compose/components/navigation_bar';
const messages = defineMessages({
- home_timeline: { id: 'tabs_bar.home', defaultMessage: 'Home' },
- notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
- public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: 'Federated timeline' },
+ home_timeline: { id: 'tabs_bar.home', defaultMessage: '/timelines/home' },
+ notifications: { id: 'tabs_bar.notifications', defaultMessage: '~/.notifications' },
+ public_timeline: { id: 'navigation_bar.public_timeline', defaultMessage: '/timelines/federated' },
settings_subheading: { id: 'column_subheading.settings', defaultMessage: 'Settings' },
- community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: 'Local timeline' },
- direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' },
- preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' },
- follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
- favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
- blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
- domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' },
- mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' },
- pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' },
- lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
+ community_timeline: { id: 'navigation_bar.community_timeline', defaultMessage: '/timelines/local' },
+ direct: { id: 'navigation_bar.direct', defaultMessage: '~/.dms' },
+ preferences: { id: 'navigation_bar.preferences', defaultMessage: 'edit ~/.config' },
+ follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: '~/.follow-requests' },
+ favourites: { id: 'navigation_bar.favourites', defaultMessage: '~/.florps' },
+ blocks: { id: 'navigation_bar.blocks', defaultMessage: '~/.blocked' },
+ domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: '~/.muted/domains' },
+ mutes: { id: 'navigation_bar.mutes', defaultMessage: '~/.muted' },
+ pins: { id: 'navigation_bar.pins', defaultMessage: '~/.pinned' },
+ lists: { id: 'navigation_bar.lists', defaultMessage: '~/.lists' },
discover: { id: 'navigation_bar.discover', defaultMessage: 'Discover' },
personal: { id: 'navigation_bar.personal', defaultMessage: 'Personal' },
security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
@@ -136,14 +136,10 @@ class GettingStarted extends ImmutablePureComponent {
- - 路
{invitesEnabled && - 路
}
{multiColumn && - 路
}
- - 路
- 路
- - 路
- 路
- - 路
- 路
@@ -152,7 +148,7 @@ class GettingStarted extends ImmutablePureComponent {
tootsuite/mastodon (v{version}) }}
+ values={{ github: cybrespace/mastodon }}
/>
diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js
index 8df6830c5..1ea398d99 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.js
+++ b/app/javascript/mastodon/features/notifications/components/notification.js
@@ -117,7 +117,7 @@ class Notification extends ImmutablePureComponent {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js
index fa6fd56e5..8ee6a1c7a 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.js
+++ b/app/javascript/mastodon/features/status/components/action_bar.js
@@ -161,7 +161,7 @@ class ActionBar extends React.PureComponent {
-
+
{shareButton}
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index b0dea8817..0934697bb 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -119,7 +119,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
{applicationLink} 路 {reblogLink} 路
-
+
diff --git a/app/views/about/show.html.haml b/app/views/about/show.html.haml
index f5a78665d..46df6d3ed 100644
--- a/app/views/about/show.html.haml
+++ b/app/views/about/show.html.haml
@@ -8,12 +8,15 @@
= render partial: 'shared/og'
.landing-page.alternative
+ .header{ style: 'display: none' }
+ = image_tag asset_pack_path('header-cybre-alt.jpg'), alt: @instance_presenter.site_title
.container
.grid
.column-0
.brand
= link_to root_url do
- = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+ = image_tag asset_pack_path('logo-cybre.png')
+ = Setting.site_title
- if Setting.timeline_preview
.column-1
@@ -36,13 +39,13 @@
- if Setting.timeline_preview
.column-2
.landing-page__hero
- = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('preview.jpg'), alt: @instance_presenter.site_title
+ = image_tag @instance_presenter.hero&.file&.url || @instance_presenter.thumbnail&.file&.url || asset_pack_path('background-cybre.png'), alt: @instance_presenter.site_title
.landing-page__information
.landing-page__short-description
.row
.landing-page__logo
- = image_tag asset_pack_path('logo_transparent.svg'), alt: 'Mastodon'
+ = image_tag asset_pack_path('logo-cybre.png'), alt: 'Cybrespace'
%h1
= @instance_presenter.site_title
@@ -63,7 +66,12 @@
%span= t 'about.status_count_after', count: @instance_presenter.status_count
.row__mascot
.landing-page__mascot
- = image_tag @instance_presenter.mascot&.file&.url || asset_pack_path('elephant_ui_plane.svg'), alt: ''
+ .floats.float-1
+ = image_tag asset_pack_path('floppy-3.svg')
+ .floats.float-2
+ = image_tag asset_pack_path('floppy-1.svg')
+ .floats.float-3
+ = image_tag asset_pack_path('floppy-2.svg')
- else
.column-2.non-preview
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index 6ce67d91e..e47679050 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -6,7 +6,7 @@
.sidebar-wrapper
.sidebar
= link_to root_path do
- = image_tag asset_pack_path('logo.svg'), class: 'logo', alt: 'Mastodon'
+ = image_tag asset_pack_path('logo-cybre.png'), class: 'logo', alt: 'Cybrespace'
= render_navigation
.content-wrapper
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index eb8949f98..279d0944f 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -6,7 +6,8 @@
.logo-container
%h1
= link_to root_path do
- = image_tag asset_pack_path('logo_full.svg'), alt: 'Mastodon'
+ = image_tag asset_pack_path('logo-cybre.png')
+ = Setting.site_title
.form-container
= render 'flashes'
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 6e6d0eda8..090954d58 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -61,7 +61,7 @@
= " "
路
= link_to remote_interaction_path(status), class: 'modal-button detailed-status__link' do
- = fa_icon('star')
+ = fa_icon('floppy-o')
%span.detailed-status__favorites>= number_to_human status.favourites_count, strip_insignificant_zeros: true
= " "
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index 1a1dc37eb..6a8331317 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -46,4 +46,4 @@
- else
= fa_icon 'envelope fw'
= link_to remote_interaction_path(status), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
- = fa_icon 'star fw'
+ = fa_icon 'floppy-o fw'
diff --git a/config/settings.yml b/config/settings.yml
index 2bc9fe289..1c334c41e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -7,7 +7,7 @@
# For more information, see docs/Running-Mastodon/Administration-guide.md
#
defaults: &defaults
- site_title: Mastodon
+ site_title: 'Cybrespace'
site_short_description: ''
site_description: ''
site_extended_description: ''
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 2e39ad01e..b6a3a74b7 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -29,7 +29,7 @@ module Mastodon
end
def to_s
- [to_a.join('.'), flags].join
+ [to_a.join('.'), flags, '-cybre'].join
end
def repository
@@ -37,7 +37,7 @@ module Mastodon
end
def source_base_url
- "https://github.com/#{repository}"
+ 'https://cybre.tech/cybrespace/mastodon'
end
# specify git tag or commit hash here
diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
index 7a99a1964..8e9c26b58 100644
Binary files a/public/android-chrome-192x192.png and b/public/android-chrome-192x192.png differ
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
index b12aa55a3..691c1f20a 100644
Binary files a/public/apple-touch-icon.png and b/public/apple-touch-icon.png differ
diff --git a/public/background-cybre.png b/public/background-cybre.png
new file mode 100644
index 000000000..151fd5584
Binary files /dev/null and b/public/background-cybre.png differ
diff --git a/public/browserconfig.xml b/public/browserconfig.xml
index 7fdab5058..fcf794bc2 100644
--- a/public/browserconfig.xml
+++ b/public/browserconfig.xml
@@ -3,7 +3,7 @@
- #282c37
+ #1ea21e
diff --git a/public/clock.js b/public/clock.js
new file mode 100644
index 000000000..ffb9beae8
--- /dev/null
+++ b/public/clock.js
@@ -0,0 +1,54 @@
+document.addEventListener("DOMContentLoaded", function(event) {
+ updateClock();
+ setInterval(updateClock, 1000);
+});
+
+function getNextOpen(now) {
+ var days = [[0, 14], [4, 18], [8, 22], [12], [2, 16], [6, 20], [10]]
+ var nowday = now.getUTCDay();
+ var nour = now.getUTCHours();
+
+ var open_hour = -1;
+ var d = 0;
+
+ while (open_hour == -1) {
+ var times = days[(nowday + d) % 7];
+ for (var i = 0; i < times.length; ++i) {
+ var time = times[i];
+ if (time == nour) {
+ return "refresh";
+ } else if (time > nour || d > 0) {
+ open_hour = time;
+ break;
+ }
+ }
+ if (open_hour == -1) {
+ d += 1;
+ nour = -1;
+ }
+ }
+
+ var open = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate() + d));
+ var ts = open.setUTCHours(open_hour);
+ return open;
+}
+
+function updateClock() {
+ var clock = document.querySelector(".closed-registrations-message .clock");
+ var now = new Date();
+ var open = getNextOpen(now);
+
+ if (open == "refresh") {
+ location.reload();
+ return;
+ }
+
+ var until = open - now;
+ var ms = until % 1000;
+ var s = Math.floor((until / 1000)) % 60;
+ var m = Math.floor((until / 1000 / 60)) % 60;
+ var h = Math.floor((until / 1000 / 60 / 60));
+ if (m < 10) m = "0" + m;
+ if (s < 10) s = "0" + s;
+ clock.innerHTML = h + ":" + m + ":" + s;
+}
diff --git a/public/emoji/1f418.svg b/public/emoji/1f418.svg
index fb9656cd1..3852006c5 100644
--- a/public/emoji/1f418.svg
+++ b/public/emoji/1f418.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
diff --git a/public/favicon.ico b/public/favicon.ico
index 79000c9cc..887128534 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/header.jpeg b/public/header.jpeg
new file mode 100644
index 000000000..e9d7b336f
Binary files /dev/null and b/public/header.jpeg differ
diff --git a/public/logo-cybre-glitch.gif b/public/logo-cybre-glitch.gif
new file mode 100644
index 000000000..abe9b2a9a
Binary files /dev/null and b/public/logo-cybre-glitch.gif differ
diff --git a/public/logo-cybre.png b/public/logo-cybre.png
new file mode 100644
index 000000000..41dd8fd4c
Binary files /dev/null and b/public/logo-cybre.png differ
diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png
index a4994062d..a79f11992 100644
Binary files a/public/mstile-150x150.png and b/public/mstile-150x150.png differ
diff --git a/public/riot-glitch.png b/public/riot-glitch.png
new file mode 100644
index 000000000..1c97ce5f1
Binary files /dev/null and b/public/riot-glitch.png differ