Merge branch 'develop' into styling/patch_fixes_for_theme_colors

This commit is contained in:
Dank Gabs 2019-07-03 22:49:27 -04:00
commit 3f2958289b
80 changed files with 140 additions and 104 deletions

View File

@ -23,7 +23,8 @@ class Api::V1::Instances::ActivityController < Api::BaseController
weeks << {
week: week.to_time.to_i.to_s,
statuses: Redis.current.get("activity:statuses:local:#{week_id}") || '0',
logins: Redis.current.pfcount("activity:logins:#{week_id}").to_s,
#(Rjc) 2019-07-02: Make this an instance option in Admin panel
# logins: 0, # Redis.current.pfcount("activity:logins:#{week_id}").to_s,
registrations: Redis.current.get("activity:accounts:local:#{week_id}") || '0',
}
end

View File

@ -5,8 +5,4 @@ class DownloadsController < ApplicationController
before_action :check_enabled
def source
send_file Rails.root.join('public', 'src', 'gab-social.zip')
end
end

View File

@ -11,7 +11,7 @@ export default class ColumnBackButton extends React.PureComponent {
handleClick = () => {
if (window.history && window.history.length === 1) {
this.context.router.history.push('/');
this.context.router.history.push('/home'); // homehack
} else {
this.context.router.history.goBack();
}

View File

@ -34,7 +34,7 @@ class ColumnHeader extends React.PureComponent {
historyBack = () => {
if (window.history && window.history.length === 1) {
this.context.router.history.push('/');
this.context.router.history.push('/home'); // homehack
} else {
this.context.router.history.goBack();
}

View File

@ -33,7 +33,7 @@ export default class ErrorBoundary extends React.PureComponent {
<div className='error-boundary'>
<div>
<FormattedMessage id='alert.unexpected.message' defaultMessage='Error' />
<a href='/'>Return Home</a>
<a href='/home'>Return Home</a>
</div>
</div>
);

View File

@ -44,11 +44,12 @@ class GabSocialMount extends React.PureComponent {
};
render () {
const { showIntroduction } = this.props;
if (showIntroduction) {
return <Introduction />;
}
// Disabling introduction for launch
// const { showIntroduction } = this.props;
//
// if (showIntroduction) {
// return <Introduction />;
// }
return (
<BrowserRouter>

View File

@ -290,12 +290,12 @@ class Header extends ImmutablePureComponent {
<div>
<NavLink exact activeClassName='active' to={`/${account.get('acct')}/favorites`} title={intl.formatNumber(account.get('favourite_count'))}>
{ /* : TODO : shortNumberFormat(account.get('favourite_count')) */ }
<span>[--]</span>
<span></span>
<FormattedMessage id='navigation_bar.favourites' defaultMessage='Favorites' />
</NavLink>
<NavLink exact activeClassName='active' to={`/${account.get('acct')}/pins`} title={intl.formatNumber(account.get('pinned_count'))}>
{ /* : TODO : shortNumberFormat(account.get('pinned_count')) */ }
<span>[--]</span>
<span></span>
<FormattedMessage id='navigation_bar.pins' defaultMessage='Pins' />
</NavLink>
</div>

View File

@ -17,7 +17,6 @@ const messages = defineMessages({
private_short: { id: 'privacy.private.short', defaultMessage: 'Followers-only' },
private_long: { id: 'privacy.private.long', defaultMessage: 'Post to followers only' },
direct_short: { id: 'privacy.direct.short', defaultMessage: 'Direct' },
direct_long: { id: 'privacy.direct.long', defaultMessage: 'Post to mentioned users only' },
change_privacy: { id: 'privacy.change', defaultMessage: 'Adjust status privacy' },
});
@ -217,7 +216,6 @@ class PrivacyDropdown extends React.PureComponent {
{ icon: 'globe', value: 'public', text: formatMessage(messages.public_short), meta: formatMessage(messages.public_long) },
{ icon: 'unlock', value: 'unlisted', text: formatMessage(messages.unlisted_short), meta: formatMessage(messages.unlisted_long) },
{ icon: 'lock', value: 'private', text: formatMessage(messages.private_short), meta: formatMessage(messages.private_long) },
{ icon: 'envelope', value: 'direct', text: formatMessage(messages.direct_short), meta: formatMessage(messages.direct_long) },
];
}

View File

@ -14,7 +14,7 @@ import MissingIndicator from 'gabsocial/components/missing_indicator';
const mapStateToProps = (state, { params: { username } }) => {
return {
isMyAccount: (username.toLowercase() === meUsername.toLowerCase()),
isMyAccount: (username.toLowerCase() === meUsername.toLowerCase()),
statusIds: state.getIn(['status_lists', 'favourites', 'items']),
isLoading: state.getIn(['status_lists', 'favourites', 'isLoading'], true),
hasMore: !!state.getIn(['status_lists', 'favourites', 'next']),

View File

@ -12,7 +12,7 @@ import MissingIndicator from 'gabsocial/components/missing_indicator';
const mapStateToProps = (state, { params: { username } }) => {
return {
isMyAccount: (username.toLowercase() === meUsername.toLowerCase()),
isMyAccount: (username.toLowerCase() === meUsername.toLowerCase()),
statusIds: state.getIn(['status_lists', 'pins', 'items']),
hasMore: !!state.getIn(['status_lists', 'pins', 'next']),
};

View File

@ -33,8 +33,8 @@ const LinkFooter = ({ onOpenHotkeys, account }) => (
<p>
<FormattedMessage
id='getting_started.open_source_notice'
defaultMessage='Gab Social is open source software. You can contribute or report issues on GitHub at {github}.'
values={{ github: <span><a href={source_url} rel='noopener' target='_blank'>{repository}</a> (v{version})</span> }}
defaultMessage='Gab Social is open source software. You can contribute or report issues on our self-hosted GitLab at {gitlab}.'
values={{ gitlab: <span><a href={source_url} rel='noopener' target='_blank'>{repository}</a> (v{version})</span> }}
/>
</p>
<p>© 2019 Gab AI Inc.</p>

View File

@ -182,7 +182,7 @@ class SwitchingColumnsArea extends React.PureComponent {
return (
<Switch>
{/* <Redirect from='/' to='/home' exact /> */}
<Redirect from='/' to='/home' exact />
<WrappedRoute path='/home' exact layout={LAYOUT.HOME} component={HomeTimeline} content={children} />
<WrappedRoute path='/groups' component={Groups} content={children} />
@ -444,7 +444,7 @@ class UI extends React.PureComponent {
handleHotkeyBack = () => {
if (window.history && window.history.length === 1) {
this.context.router.history.push('/');
this.context.router.history.push('/home'); // homehack
} else {
this.context.router.history.goBack();
}

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "الدليل",
"getting_started.heading": "إستعدّ للبدء",
"getting_started.invite": "دعوة أشخاص",
"getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {github}.",
"getting_started.open_source_notice": "ماستدون برنامج مفتوح المصدر. يمكنك المساهمة، أو الإبلاغ عن تقارير الأخطاء، على جيت هب {gitlab}.",
"getting_started.security": "الأمان",
"getting_started.terms": "شروط الخدمة",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentación",
"getting_started.heading": "Entamu",
"getting_started.invite": "Convidar xente",
"getting_started.open_source_notice": "Gab Social ye software de códigu abiertu. Pues collaborar o informar de fallos en {github} (GitHub).",
"getting_started.open_source_notice": "Gab Social ye software de códigu abiertu. Pues collaborar o informar de fallos en {gitlab} (GitLab).",
"getting_started.security": "Seguranza",
"getting_started.terms": "Términos del serviciu",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Първи стъпки",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social е софтуер с отворен код. Можеш да помогнеш или да докладваш за проблеми в Github: {github}.",
"getting_started.open_source_notice": "Gab Social е софтуер с отворен код. Можеш да помогнеш или да докладваш за проблеми в GitLab: {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "নথিপত্র",
"getting_started.heading": "শুরু করা",
"getting_started.invite": "অন্যদের আমন্ত্রণ করুন",
"getting_started.open_source_notice": "মাস্টাডন একটি মুক্ত সফটওয়্যার। আপনি তৈরিতে সাহায্য করতে পারেন অথবা সমস্যা রিপোর্ট করতে পারেন গিটহাবে {github}।",
"getting_started.open_source_notice": "মাস্টাডন একটি মুক্ত সফটওয়্যার। আপনি তৈরিতে সাহায্য করতে পারেন অথবা সমস্যা রিপোর্ট করতে পারেন গিটহাবে {gitlab}।",
"getting_started.security": "নিরাপত্তা",
"getting_started.terms": "ব্যবহারের নিয়মাবলী",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentació",
"getting_started.heading": "Començant",
"getting_started.invite": "Convida gent",
"getting_started.open_source_notice": "Gab Social és un programari de codi obert. Pots contribuir o informar de problemes a GitHub a {github}.",
"getting_started.open_source_notice": "Gab Social és un programari de codi obert. Pots contribuir o informar de problemes a GitLab a {gitlab}.",
"getting_started.security": "Seguretat",
"getting_started.terms": "Termes del servei",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Ducumentazione",
"getting_started.heading": "Per principià",
"getting_started.invite": "Invità ghjente",
"getting_started.open_source_notice": "Gab Social ghjè un lugiziale liberu. Pudete cuntribuisce à u codice o a traduzione, o palisà un bug, nant'à GitHub: {github}.",
"getting_started.open_source_notice": "Gab Social ghjè un lugiziale liberu. Pudete cuntribuisce à u codice o a traduzione, o palisà un bug, nant'à GitLab: {gitlab}.",
"getting_started.security": "Sicurità",
"getting_started.terms": "Cundizione di u serviziu",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentace",
"getting_started.heading": "Začínáme",
"getting_started.invite": "Pozvat lidi",
"getting_started.open_source_notice": "Gab Social je otevřený software. Na GitHubu k němu můžete přispět nebo nahlásit chyby: {github}.",
"getting_started.open_source_notice": "Gab Social je otevřený software. Na GitLabu k němu můžete přispět nebo nahlásit chyby: {gitlab}.",
"getting_started.security": "Zabezpečení",
"getting_started.terms": "Podmínky používání",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dogfennaeth",
"getting_started.heading": "Dechrau",
"getting_started.invite": "Gwahodd pobl",
"getting_started.open_source_notice": "Mae Gab Social yn feddalwedd côd agored. Mae modd cyfrannu neu adrodd materion ar GitHUb ar {github}.",
"getting_started.open_source_notice": "Mae Gab Social yn feddalwedd côd agored. Mae modd cyfrannu neu adrodd materion ar GitLab ar {gitlab}.",
"getting_started.security": "Diogelwch",
"getting_started.terms": "Telerau Gwasanaeth",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentation",
"getting_started.heading": "Kom igang",
"getting_started.invite": "Inviter folk",
"getting_started.open_source_notice": "Gab Social er et open source software. Du kan bidrage eller rapporterer fejl på GitHub {github}.",
"getting_started.open_source_notice": "Gab Social er et open source software. Du kan bidrage eller rapporterer fejl på GitLab {gitlab}.",
"getting_started.security": "Sikkerhed",
"getting_started.terms": "Vilkår",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentation",
"getting_started.heading": "Erste Schritte",
"getting_started.invite": "Leute einladen",
"getting_started.open_source_notice": "Gab Social ist quelloffene Software. Du kannst auf GitHub unter {github} dazu beitragen oder Probleme melden.",
"getting_started.open_source_notice": "Gab Social ist quelloffene Software. Du kannst auf GitLab unter {gitlab} dazu beitragen oder Probleme melden.",
"getting_started.security": "Sicherheit",
"getting_started.terms": "Nutzungsbedingungen",
"getting_started.guidelines": "Guidelines",

View File

@ -2256,7 +2256,7 @@
"id": "navigation_bar.logout"
},
{
"defaultMessage": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"defaultMessage": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"id": "getting_started.open_source_notice"
}
],

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Τεκμηρίωση",
"getting_started.heading": "Αφετηρία",
"getting_started.invite": "Προσκάλεσε κόσμο",
"getting_started.open_source_notice": "Το Gab Social είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitHub στο {github}.",
"getting_started.open_source_notice": "Το Gab Social είναι ελεύθερο λογισμικό. Μπορείς να συνεισφέρεις ή να αναφέρεις ζητήματα στο GitLab στο {gitlab}.",
"getting_started.security": "Ασφάλεια",
"getting_started.terms": "Όροι χρήσης",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Getting started",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentado",
"getting_started.heading": "Por komenci",
"getting_started.invite": "Inviti homojn",
"getting_started.open_source_notice": "Gab Social estas malfermitkoda programo. Vi povas kontribui aŭ raporti problemojn en GitHub je {github}.",
"getting_started.open_source_notice": "Gab Social estas malfermitkoda programo. Vi povas kontribui aŭ raporti problemojn en GitLab je {gitlab}.",
"getting_started.security": "Sekureco",
"getting_started.terms": "Uzkondiĉoj",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Primeros pasos",
"getting_started.invite": "Invitar usuarios",
"getting_started.open_source_notice": "Gab Social es software libre. Puedes contribuir o reportar errores en {github}.",
"getting_started.open_source_notice": "Gab Social es software libre. Puedes contribuir o reportar errores en {gitlab}.",
"getting_started.security": "Seguridad",
"getting_started.terms": "Términos de servicio",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentazioa",
"getting_started.heading": "Menua",
"getting_started.invite": "Gonbidatu jendea",
"getting_started.open_source_notice": "Gab Social software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitHub bidez: {github}.",
"getting_started.open_source_notice": "Gab Social software librea da. Ekarpenak egin ditzakezu edo akatsen berri eman GitLab bidez: {gitlab}.",
"getting_started.security": "Segurtasuna",
"getting_started.terms": "Erabilera baldintzak",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "راهنما",
"getting_started.heading": "آغاز کنید",
"getting_started.invite": "دعوت از دوستان",
"getting_started.open_source_notice": "ماستدون یک نرم‌افزار آزاد است. می‌توانید در ساخت آن مشارکت کنید یا مشکلاتش را در {github} گزارش دهید.",
"getting_started.open_source_notice": "ماستدون یک نرم‌افزار آزاد است. می‌توانید در ساخت آن مشارکت کنید یا مشکلاتش را در {gitlab} گزارش دهید.",
"getting_started.security": "امنیت",
"getting_started.terms": "شرایط استفاده",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Aloitus",
"getting_started.invite": "Kutsu ihmisiä",
"getting_started.open_source_notice": "Gab Social on avoimen lähdekoodin ohjelma. Voit avustaa tai raportoida ongelmia GitHubissa: {github}.",
"getting_started.open_source_notice": "Gab Social on avoimen lähdekoodin ohjelma. Voit avustaa tai raportoida ongelmia GitLabissa: {gitlab}.",
"getting_started.security": "Tunnukset",
"getting_started.terms": "Käyttöehdot",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Pour commencer",
"getting_started.invite": "Inviter des gens",
"getting_started.open_source_notice": "Gab Social est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {github} sur GitHub.",
"getting_started.open_source_notice": "Gab Social est un logiciel libre. Vous pouvez contribuer et envoyer vos commentaires et rapports de bogues via {gitlab} sur GitLab.",
"getting_started.security": "Sécurité",
"getting_started.terms": "Conditions dutilisation",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Comezando",
"getting_started.invite": "Convide a xente",
"getting_started.open_source_notice": "Gab Social é software de código aberto. Pode contribuír ou informar de fallos en GitHub en {github}.",
"getting_started.open_source_notice": "Gab Social é software de código aberto. Pode contribuír ou informar de fallos en GitLab en {gitlab}.",
"getting_started.security": "Seguridade",
"getting_started.terms": "Termos do servizo",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "בואו נתחיל",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "מסטודון היא תוכנה חופשית (בקוד פתוח). ניתן לתרום או לדווח על בעיות בגיטהאב: {github}.",
"getting_started.open_source_notice": "מסטודון היא תוכנה חופשית (בקוד פתוח). ניתן לתרום או לדווח על בעיות בגיטהאב: {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Getting started",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Počnimo",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social je softver otvorenog koda. Možeš pridonijeti ili prijaviti probleme na GitHubu {github}.",
"getting_started.open_source_notice": "Gab Social je softver otvorenog koda. Možeš pridonijeti ili prijaviti probleme na GitLabu {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Első lépések",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social egy nyílt forráskódú szoftver. Hozzájárulás vagy problémák jelentése a GitHub-on {github}.",
"getting_started.open_source_notice": "Gab Social egy nyílt forráskódú szoftver. Hozzájárulás vagy problémák jelentése a GitLab-on {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Ինչպես սկսել",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Մաստոդոնը բաց ելատեքստով ծրագրակազմ է։ Կարող ես ներդրում անել կամ վրեպներ զեկուցել ԳիթՀաբում՝ {github}։",
"getting_started.open_source_notice": "Մաստոդոնը բաց ելատեքստով ծրագրակազմ է։ Կարող ես ներդրում անել կամ վրեպներ զեկուցել ԳիթՀաբում՝ {gitlab}։",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Mulai",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social adalah perangkat lunak yang bersifat terbuka. Anda dapat berkontribusi atau melaporkan permasalahan/bug di Github {github}.",
"getting_started.open_source_notice": "Gab Social adalah perangkat lunak yang bersifat terbuka. Anda dapat berkontribusi atau melaporkan permasalahan/bug di GitLab {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Debuto",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social esas programaro kun apertita kodexo. Tu povas kontributar o signalar problemi en GitHub ye {github}.",
"getting_started.open_source_notice": "Gab Social esas programaro kun apertita kodexo. Tu povas kontributar o signalar problemi en GitLab ye {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentazione",
"getting_started.heading": "Come iniziare",
"getting_started.invite": "Invita qualcuno",
"getting_started.open_source_notice": "Gab Social è un software open source. Puoi contribuire o segnalare errori su GitHub all'indirizzo {github}.",
"getting_started.open_source_notice": "Gab Social è un software open source. Puoi contribuire o segnalare errori su GitLab all'indirizzo {gitlab}.",
"getting_started.security": "Sicurezza",
"getting_started.terms": "Condizioni del servizio",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "ドキュメント",
"getting_started.heading": "スタート",
"getting_started.invite": "招待",
"getting_started.open_source_notice": "Gab Socialはオープンソースソフトウェアです。誰でもGitHub ( {github} ) から開発に参加したり、問題を報告したりできます。",
"getting_started.open_source_notice": "Gab Socialはオープンソースソフトウェアです。誰でもGitLab ( {gitlab} ) から開発に参加したり、問題を報告したりできます。",
"getting_started.security": "セキュリティ",
"getting_started.terms": "プライバシーポリシー",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "დოკუმენტაცია",
"getting_started.heading": "დაწყება",
"getting_started.invite": "ხალხის მოწვევა",
"getting_started.open_source_notice": "მასტოდონი ღია პროგრამაა. შეგიძლიათ შეუწყოთ ხელი ან შექმნათ პრობემის რეპორტი {github}-ზე.",
"getting_started.open_source_notice": "მასტოდონი ღია პროგრამაა. შეგიძლიათ შეუწყოთ ხელი ან შექმნათ პრობემის რეპორტი {gitlab}-ზე.",
"getting_started.security": "უსაფრთხოება",
"getting_started.terms": "მომსახურების პირობები",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Құжаттама",
"getting_started.heading": "Желіде",
"getting_started.invite": "Адам шақыру",
"getting_started.open_source_notice": "Gab Social - ашық кодты құрылым. Түзету енгізу немесе ұсыныстарды GitHub арқылы жасаңыз {github}.",
"getting_started.open_source_notice": "Gab Social - ашық кодты құрылым. Түзету енгізу немесе ұсыныстарды GitLab арқылы жасаңыз {gitlab}.",
"getting_started.security": "Қауіпсіздік",
"getting_started.terms": "Қызмет көрсету шарттары",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "문서",
"getting_started.heading": "시작",
"getting_started.invite": "초대",
"getting_started.open_source_notice": "Gab Social은 오픈 소스 소프트웨어입니다. 누구나 GitHub({github})에서 개발에 참여하거나, 문제를 보고할 수 있습니다.",
"getting_started.open_source_notice": "Gab Social은 오픈 소스 소프트웨어입니다. 누구나 GitLab({gitlab})에서 개발에 참여하거나, 문제를 보고할 수 있습니다.",
"getting_started.security": "보안",
"getting_started.terms": "이용 약관",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Getting started",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Getting started",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentatie",
"getting_started.heading": "Aan de slag",
"getting_started.invite": "Mensen uitnodigen",
"getting_started.open_source_notice": "Gab Social is vrije software. Je kunt bijdragen of problemen melden op GitHub via {github}.",
"getting_started.open_source_notice": "Gab Social is vrije software. Je kunt bijdragen of problemen melden op GitLab via {gitlab}.",
"getting_started.security": "Beveiliging",
"getting_started.terms": "Voorwaarden",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Kom i gang",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social er fri programvare. Du kan bidra eller rapportere problemer på GitHub på {github}.",
"getting_started.open_source_notice": "Gab Social er fri programvare. Du kan bidra eller rapportere problemer på GitLab på {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentacion",
"getting_started.heading": "Per començar",
"getting_started.invite": "Convidar de monde",
"getting_started.open_source_notice": "Gab Social es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via {github} sus GitHub.",
"getting_started.open_source_notice": "Gab Social es un logicial liure. Podètz contribuir e mandar vòstres comentaris e rapòrt de bug via {gitlab} sus GitLab.",
"getting_started.security": "Seguretat",
"getting_started.terms": "Condicions dutilizacion",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentacja",
"getting_started.heading": "Rozpocznij",
"getting_started.invite": "Zaproś znajomych",
"getting_started.open_source_notice": "Gab Social jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitHubie tutaj: {github}.",
"getting_started.open_source_notice": "Gab Social jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitLabie tutaj: {gitlab}.",
"getting_started.security": "Bezpieczeństwo",
"getting_started.terms": "Zasady użytkowania",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentação",
"getting_started.heading": "Primeiros passos",
"getting_started.invite": "Convide pessoas",
"getting_started.open_source_notice": "Gab Social é um software de código aberto. Você pode contribuir ou reportar problemas na página do GitHub do projeto: {github}.",
"getting_started.open_source_notice": "Gab Social é um software de código aberto. Você pode contribuir ou reportar problemas na página do GitLab do projeto: {gitlab}.",
"getting_started.security": "Segurança",
"getting_started.terms": "Termos de serviço",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Primeiros passos",
"getting_started.invite": "Convidar pessoas",
"getting_started.open_source_notice": "Gab Social é software de fonte aberta. Podes contribuir ou repostar problemas no GitHub do projecto: {github}.",
"getting_started.open_source_notice": "Gab Social é software de fonte aberta. Podes contribuir ou repostar problemas no GitLab do projecto: {gitlab}.",
"getting_started.security": "Segurança",
"getting_started.terms": "Termos de serviço",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentație",
"getting_started.heading": "Începe",
"getting_started.invite": "Invită prieteni",
"getting_started.open_source_notice": "Gab Social este o rețea de socializare de tip open source. Puteți contribuii la dezvoltarea ei sau să semnalați erorile pe GitHub la {github}.",
"getting_started.open_source_notice": "Gab Social este o rețea de socializare de tip open source. Puteți contribuii la dezvoltarea ei sau să semnalați erorile pe GitLab la {gitlab}.",
"getting_started.security": "Securitate",
"getting_started.terms": "Termeni de Utilizare",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Документация",
"getting_started.heading": "Добро пожаловать",
"getting_started.invite": "Пригласить людей",
"getting_started.open_source_notice": "Gab Social - сервис с открытым исходным кодом. Вы можете помочь проекту или сообщить о проблемах на GitHub по адресу {github}.",
"getting_started.open_source_notice": "Gab Social - сервис с открытым исходным кодом. Вы можете помочь проекту или сообщить о проблемах на GitLab по адресу {gitlab}.",
"getting_started.security": "Безопасность",
"getting_started.terms": "Условия использования",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentácia",
"getting_started.heading": "Začni tu",
"getting_started.invite": "Pozvať ľudí",
"getting_started.open_source_notice": "Gab Social je softvér s otvoreným kódom. Nahlásiť chyby, alebo prispievať môžeš na GitHube v {github}.",
"getting_started.open_source_notice": "Gab Social je softvér s otvoreným kódom. Nahlásiť chyby, alebo prispievať môžeš na GitLabe v {gitlab}.",
"getting_started.security": "Zabezpečenie",
"getting_started.terms": "Podmienky prevozu",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Prvi koraki",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social je odprtokodna programska oprema. V GitHubu na {github} lahko prispevate ali poročate o napakah.",
"getting_started.open_source_notice": "Gab Social je odprtokodna programska oprema. V GitLabu na {gitlab} lahko prispevate ali poročate o napakah.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Dokumentim",
"getting_started.heading": "Si tia fillohet",
"getting_started.invite": "Ftoni njerëz",
"getting_started.open_source_notice": "Gab Social-i është software me burim të hapur. Mund të jepni ndihmesë ose të njoftoni probleme në GitHub, te {github}.",
"getting_started.open_source_notice": "Gab Social-i është software me burim të hapur. Mund të jepni ndihmesë ose të njoftoni probleme në GitLab, te {gitlab}.",
"getting_started.security": "Siguri",
"getting_started.terms": "Kushte shërbimi",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Da počnete",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Socialt je softver otvorenog koda. Možete mu doprineti ili prijaviti probleme preko GitHub-a na {github}.",
"getting_started.open_source_notice": "Gab Socialt je softver otvorenog koda. Možete mu doprineti ili prijaviti probleme preko GitLab-a na {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Документација",
"getting_started.heading": "Да почнете",
"getting_started.invite": "Позовите људе",
"getting_started.open_source_notice": "Мастoдон је софтвер отвореног кода. Можете му допринети или пријавити проблеме преко ГитХаба на {github}.",
"getting_started.open_source_notice": "Мастoдон је софтвер отвореног кода. Можете му допринети или пријавити проблеме преко ГитХаба на {gitlab}.",
"getting_started.security": "Безбедност",
"getting_started.terms": "Услови коришћења",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Kom igång",
"getting_started.invite": "Skicka inbjudningar",
"getting_started.open_source_notice": "Gab Social är programvara med öppen källkod. Du kan bidra eller rapportera problem via GitHub på {github}.",
"getting_started.open_source_notice": "Gab Social är programvara med öppen källkod. Du kan bidra eller rapportera problem via GitLab på {gitlab}.",
"getting_started.security": "Säkerhet",
"getting_started.terms": "Användarvillkor",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "Getting started",
"getting_started.invite": "Invite people",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"getting_started.security": "Security",
"getting_started.terms": "Terms of Service",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "డాక్యుమెంటేషన్",
"getting_started.heading": "మొదలుపెడదాం",
"getting_started.invite": "వ్యక్తులను ఆహ్వానించండి",
"getting_started.open_source_notice": "మాస్టొడొన్ ఓపెన్ సోర్స్ సాఫ్ట్వేర్. మీరు {github} వద్ద GitHub పై సమస్యలను నివేదించవచ్చు లేదా తోడ్పడచ్చు.",
"getting_started.open_source_notice": "మాస్టొడొన్ ఓపెన్ సోర్స్ సాఫ్ట్వేర్. మీరు {gitlab} వద్ద GitLab పై సమస్యలను నివేదించవచ్చు లేదా తోడ్పడచ్చు.",
"getting_started.security": "భద్రత",
"getting_started.terms": "సేవా నిబంధనలు",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "เอกสารประกอบ",
"getting_started.heading": "เริ่มต้นใช้งาน",
"getting_started.invite": "เชิญผู้คน",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitHub at {github}.",
"getting_started.open_source_notice": "Gab Social is open source software. You can contribute or report issues on GitLab at {gitlab}.",
"getting_started.security": "ความปลอดภัย",
"getting_started.terms": "เงื่อนไขการให้บริการ",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Belgeler",
"getting_started.heading": "Başlangıç",
"getting_started.invite": "İnsanları davet edin",
"getting_started.open_source_notice": "Gab Social açık kaynaklı bir yazılımdır. Github {github}. {apps} üzerinden katkıda bulunabilir, hata raporlayabilirsiniz.",
"getting_started.open_source_notice": "Gab Social açık kaynaklı bir yazılımdır. GitLab {gitlab}. {apps} üzerinden katkıda bulunabilir, hata raporlayabilirsiniz.",
"getting_started.security": "Güvenlik",
"getting_started.terms": "Hizmet koşulları",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Документація",
"getting_started.heading": "Ласкаво просимо",
"getting_started.invite": "Запросіть людей",
"getting_started.open_source_notice": "Gab Social - програма з відкритим вихідним кодом. Ви можете допомогти проекту, або повідомити про проблеми на GitHub за адресою {github}.",
"getting_started.open_source_notice": "Gab Social - програма з відкритим вихідним кодом. Ви можете допомогти проекту, або повідомити про проблеми на GitLab за адресою {gitlab}.",
"getting_started.security": "Безпека",
"getting_started.terms": "Умови використання",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "文档",
"getting_started.heading": "开始使用",
"getting_started.invite": "邀请用户",
"getting_started.open_source_notice": "Gab Social 是一个开源软件。欢迎前往 GitHub{github})贡献代码或反馈问题。",
"getting_started.open_source_notice": "Gab Social 是一个开源软件。欢迎前往 GitLab{gitlab})贡献代码或反馈问题。",
"getting_started.security": "帐户安全",
"getting_started.terms": "使用条款",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "Documentation",
"getting_started.heading": "開始使用",
"getting_started.invite": "邀請使用者",
"getting_started.open_source_notice": "Gab Social萬象是一個開放源碼的軟件。你可以在官方 GitHub ({github}) 貢獻或者回報問題。",
"getting_started.open_source_notice": "Gab Social萬象是一個開放源碼的軟件。你可以在官方 GitLab ({gitlab}) 貢獻或者回報問題。",
"getting_started.security": "帳戶安全",
"getting_started.terms": "服務條款",
"getting_started.guidelines": "Guidelines",

View File

@ -141,7 +141,7 @@
"getting_started.documentation": "文件",
"getting_started.heading": "開始使用",
"getting_started.invite": "邀請使用者",
"getting_started.open_source_notice": "Gab Social 是開源軟體。你可以在 GitHub {github} 上貢獻或是回報問題。",
"getting_started.open_source_notice": "Gab Social 是開源軟體。你可以在 GitLab {gitlab} 上貢獻或是回報問題。",
"getting_started.security": "安全性",
"getting_started.terms": "服務條款",
"getting_started.guidelines": "Guidelines",

View File

@ -11,13 +11,14 @@ const perf = require('./performance');
function main() {
perf.start('main()');
if (window.history && history.replaceState) {
const { pathname, search, hash } = window.location;
const path = pathname + search + hash;
if (!(/^\/[$/]/).test(path)) {
history.replaceState(null, document.title, `${path}`);
}
}
// if (window.history && history.replaceState) {
// const { pathname, search, hash } = window.location;
// const path = pathname + search + hash;
// if (!(/^\/[$/]/).test(path)) {
// console.log('redirecting you to hell');
// history.replaceState(null, document.title, `${path}`);
// }
// }
ready(() => {
const mountNode = document.getElementById('gabsocial');

View File

@ -21,7 +21,7 @@ const play = audio => {
}
}
audio.play();
// audio.play();
};
export default function soundsMiddleware() {

View File

@ -3230,7 +3230,7 @@ a.status-card.compact:hover {
border-radius: 4px;
margin-left: 40px;
overflow: hidden;
z-index: 100;
z-index: 10000;
&.top {
transform-origin: 50% 100%;

View File

@ -12,6 +12,10 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
end
def url
if object.file_file_name and object.file_file_name.start_with? "gab://media/"
return object.file_file_name.sub("gab://media/", "").sub("https://gabfiles.blob.core.windows.net/", "https://gab.com/media/").sub("https://files.gab.com/file/files-gab/", "https://gab.com/media/").split("|")[1]
end
if object.needs_redownload?
media_proxy_url(object.id, :original)
else
@ -24,6 +28,10 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer
end
def preview_url
if object.file_file_name and object.file_file_name.start_with? "gab://media/"
return object.file_file_name.sub("gab://media/", "").sub("https://gabfiles.blob.core.windows.net/", "https://gab.com/media/").sub("https://files.gab.com/file/files-gab/", "https://gab.com/media/").split("|")[0]
end
if object.needs_redownload?
media_proxy_url(object.id, :small)
else

View File

@ -62,7 +62,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
end
def content
Formatter.instance.format(object)
Formatter.instance.format(object).strip
end
def url

View File

@ -14,6 +14,7 @@
.box-widget
.rich-formatting
%h3 Open Source
%p The future of online publishing and community building is decentralized and open. You get to own what you build. In the open source world, that includes the code powering the technology you use.
%p Originally forked from the Mastodon project, Gab Social is a fresh take on one of the Internet's most popular applications: Social networking. By releasing the full program source code of Gab Social under the GNU Affero General Public License v3, Gab is not only guaranteeing you ownership of this system but also those who carry on where you might leave off.
%p Gab's development team works on Gab Social as their full-time job. We welcome you to an unprecedented level of access into a commercial effort in decentralized and federated open source social networking. Thank you for taking this adventure with us.
%p At Gab, we believe that the future of online publishing is decentralized and open. We believe that users of social networks should be able to control their social media experience on their own terms, rather than the terms set down by Big Tech.
%p Gab Social is a fresh take on one of the Internet's most popular applications: social networking. Originally forked from the Mastodon project, Gab's codebase is free and open-source, licensed under the GNU Affero General Public License version 3 (AGPL3).
%p As a result, you, the user, have a choice when using Gab Social: you can either have an account on Gab.com, or, if you don't like what we're doing on Gab.com or simply want to manage your own experience, you can spin up your own Gab Social server that you control, that allows you to communicate with millions of users on their own federated servers from around the world, including users on Gab.
%p Gab.com strives to be the home of free speech online. We work on Gab Social 100% of the time as our full-time jobs. We positively encourage you to either join us on Gab.com or to spin up your own Gab Social server that you control to help take back control of the Web for the People.

View File

@ -5,7 +5,9 @@
.admin-wrapper
.sidebar-wrapper
.sidebar
= link_to root_path do
-# = link_to root_path do
-# homehack
= link_to '/home' do
= image_pack_tag 'logo.png', class: 'logo', alt: 'Gab Social'
= render_navigation

View File

@ -24,7 +24,6 @@ Rails.application.routes.draw do
get '.well-known/change-password', to: redirect('/auth/edit')
get '.well-known/keybase-proof-config', to: 'well_known/keybase_proof_config#show'
get '/src/gab-social.zip', to: 'downloads#source'
get 'manifest', to: 'manifests#show', defaults: { format: 'json' }
get 'intent', to: 'intents#show'
get 'custom.css', to: 'custom_css#show', as: :custom_css
@ -138,7 +137,7 @@ Rails.application.routes.draw do
resources :filters, except: [:show]
resource :relationships, only: [:show, :update]
get '/public', to: redirect('/'), as: :public_timeline
get '/public', to: redirect('/home'), as: :public_timeline # homehack
get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy
# Remote follow

View File

@ -95,13 +95,13 @@ module.exports = merge(sharedConfig, {
'**/*-webfont-*.svg',
'**/*.woff',
],
ServiceWorker: {
entry: `imports-loader?ATTACHMENT_HOST=>${encodeURIComponent(JSON.stringify(attachmentHost))}!${encodeURI(path.join(__dirname, '../../app/javascript/gabsocial/service_worker/entry.js'))}`,
cacheName: 'gabsocial',
output: '../assets/sw.js',
publicPath: '/sw.js',
minify: true,
},
// ServiceWorker: {
// entry: `imports-loader?ATTACHMENT_HOST=>${encodeURIComponent(JSON.stringify(attachmentHost))}!${encodeURI(path.join(__dirname, '../../app/javascript/gabsocial/service_worker/entry.js'))}`,
// cacheName: 'gabsocial',
// output: '../assets/sw.js',
// publicPath: '/sw.js',
// minify: true,
// },
}),
],
});

View File

@ -67,7 +67,7 @@ services:
ports:
- "127.0.0.1:4000:4000"
depends_on:
- db
# - db
- redis
sidekiq:
@ -77,7 +77,7 @@ services:
env_file: .env.production
command: bundle exec sidekiq
depends_on:
- db
# - db
- redis
networks:
- external_network

View File

@ -0,0 +1,16 @@
# frozen_string_literal: true
task fix_account_stats: 'gabsocial:fix-account-stats'
namespace :gabsocial do
desc 'Re-compute user statistics (following cnt, followers cnt, etc.)'
task :fix_account_stats => :environment do
Account.select(:id, :username).all.each do |a|
a.account_stat.following_count = Follow.where(account_id: a.id).count
a.account_stat.followers_count = Follow.where(target_account_id: a.id).count
a.account_stat.statuses_count = Status.where(account_id: a.id).count
a.account_stat.save!
# puts(a.username)
end
end
end

View File

@ -0,0 +1,13 @@
# frozen_string_literal: true
task force_regenerate_feeds: 'gabsocial:force-regenerate-feeds'
namespace :gabsocial do
desc 'Re-generate home feeds for all users (run after any migrations)'
task :force_regenerate_feeds => :environment do
Account.select(:id, :username).all.each do |a|
Redis.current.set("account:#{a.id}:regeneration", true)
puts(a.username)
end
end
end