Compare commits

...
Sign in to create a new pull request.

152 commits
main ... master

Author SHA1 Message Date
ida
8059e3574d make it say doot damn it 2022-06-14 13:49:00 -07:00
ida
e09482ad29 Merge tag 'v3.5.3' of https://github.com/mastodon/mastodon into HEAD 2022-06-14 13:41:49 -07:00
ida
2018caf677 respookify 2022-04-13 06:57:10 -07:00
ida
e4a23f53d0 fix version 2022-04-13 06:35:36 -07:00
ida
55bab038c9 Merge tag 'v3.5.1' of https://github.com/mastodon/mastodon 2022-04-13 06:14:50 -07:00
ida
f3cae1d606 Merge tag 'v3.4.6' of https://github.com/tootsuite/mastodon 2022-02-03 06:47:40 -07:00
Claire
93a6c143af
Fix insufficient sanitization of report comments (#17430) 2022-02-03 14:08:24 +01:00
ida
098fcb1978 Merge tag 'v3.4.5' of https://github.com/tootsuite/mastodon 2022-02-03 05:11:55 -07:00
Claire
bb7b2868a0 Bump version to 3.4.6 2022-02-02 23:48:38 +01:00
Wonderfall
a06dda41d0 disable legacy XSS filtering (#17289)
Browsers are phasing out X-XSS-Protection, but Safari and IE still support it.
2022-02-02 23:30:15 +01:00
Claire
bf005edd30 Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338)
Fixes #17297
2022-02-02 23:30:15 +01:00
Claire
df68d2eab8 Fix response_to_recipient? CTE 2022-02-02 23:30:15 +01:00
Claire
b27f50da5a Fix insufficient sanitization of report comments 2022-02-02 23:30:15 +01:00
Claire
e2009ced3a Fix compacted JSON-LD possibly causing compatibility issues on forwarding 2022-02-02 23:30:15 +01:00
Puck Meerburg
fe0210074f Compact JSON-LD signed incoming activities 2022-02-02 23:30:15 +01:00
Claire
c8dbbd60eb Fix error-prone SQL queries (#15828)
* Fix error-prone SQL queries in Account search

While this code seems to not present an actual vulnerability, one could
easily be introduced by mistake due to how the query is built.

This PR parameterises the `to_tsquery` input to make the query more robust.

* Harden code for Status#tagged_with_all and Status#tagged_with_none

Those two scopes aren't used in a way that could be vulnerable to an SQL
injection, but keeping them unchanged might be a hazard.

* Remove unneeded spaces surrounding tsquery term

* Please CodeClimate

* Move advanced_search_for SQL template to its own function

This avoids one level of indentation while making clearer that the SQL template
isn't build from all the dynamic parameters of advanced_search_for.

* Add tests covering tagged_with, tagged_with_all and tagged_with_none

* Rewrite tagged_with_none to avoid multiple joins and make it more robust

* Remove obsolete brakeman warnings

* Revert "Remove unneeded spaces surrounding tsquery term"

The two queries are not strictly equivalent.

This reverts commit 86f16c537e06c6ba4a8b250f25dcce9f049023ff.
2022-02-02 23:30:15 +01:00
Claire
6d831fe274
Fix spurious errors when receiving an Add activity for a private post (#17425) 2022-02-02 22:59:34 +01:00
Claire
1c8c318281 Bump version to 3.4.5 2022-01-31 18:04:24 +01:00
Claire
d722222fe1 Add more advanced migration tests (#17393)
- populate the database with some data when testing migrations
- try both one-step and two-step migrations (`SKIP_POST_DEPLOYMENT_MIGRATIONS`)
2022-01-31 11:23:58 +01:00
Claire
03f0e98b32 Fix followers synchronization mechanism not working when URI has empty path (#16510)
* Fix followers synchronization mechanism not working when URI has empty path

To my knowledge, there is no current implementation on the fediverse
that can use bare domains (e.g., actor is at https://example.org instead of
something like https://example.org/actor) that also plans to support the
followers synchronization mechanism. However, Mastodon's current implementation
would exclude such accounts from followers list.

Also adds tests and rename them to reflect the proper method names.

* Move url prefix regexp to its own constant
2022-01-31 10:59:00 +01:00
Eugen Rochko
2c83b9076d Add manual GitHub Actions runs (#17000) 2022-01-31 10:35:55 +01:00
Eugen Rochko
c8301bcfc3 Change workflow to push to Docker Hub (#16980) 2022-01-31 10:35:38 +01:00
Yusuke Nakamura
0ae91e45de Build container image by GitHub Actions (#16973)
* Build container image by GitHub Actions

* Trigger docker build only pushed to main branch

* Tweak tagging imgae

- "edge" is the main branch
- "latest" is the tagged latest release
2022-01-31 10:35:14 +01:00
Claire
2363b026e6 Bump ruby-saml from 1.11.0 to 1.13.0 (#16723)
Fixes #16720
2022-01-31 10:33:47 +01:00
Jeong Arm
959234c1e4 Save bundle config as local (#17188)
Some bundle options are saved as global user config and not project local.
Specially, `deployment` must be saved as local config to be run on copied environment
2022-01-31 10:32:46 +01:00
Claire
0dc103ea11 Fix edge case in migration helpers that caused crash because of PostgreSQL quirks (#17398) 2022-01-31 10:31:56 +01:00
Claire
b782f86b51 Fix some old migration scripts (#17394)
* Fix some old migration scripts

* Fix edge case in two-step migration from older releases
2022-01-31 10:31:36 +01:00
ida
34ab5fd793 change vagrant's rvm gpg key to mit keyservers; sks network is deprecated 2022-01-21 13:24:02 -07:00
ida
26eded41dd Merge tag 'v3.4.4' of https://github.com/tootsuite/mastodon 2021-12-06 17:33:46 -07:00
Eugen Rochko
fd868f8ca0 Bump version to 3.4.4 2021-11-26 01:32:31 +01:00
Claire
4cd33a2c71 Fix "bundle exec rails mastodon:setup" crashing in some circumstances (#16976)
Fix regression from #16896
2021-11-26 01:31:28 +01:00
Claire
f264cca1d2 Fix filtering DMs from non-followed users (#17042) 2021-11-26 01:22:33 +01:00
Claire
5e4b04de88 Fix handling of recursive toots in WebUI (#17041) 2021-11-26 01:22:27 +01:00
Claire
3c18311d86 Fix error when suspending user with an already-existing canonical email block (#17036)
* Fix error when suspending user with an already-existing canonical email block

Fixes #17033

While attempting to create a `CanonicalEmailBlock` with an existing hash would
raise an `ActiveRecord::RecordNotUnique` error, this being done within a
transaction would cancel the whole transaction. For this reason, checking for
uniqueness in Rails would query the database within the transaction and avoid
invalidating the whole transaction for this reason.

A race condition is still possible, where multiple accounts sharing a canonical
email would be blocked in concurrent transactions, in which only one would
succeed, but that is way less likely to happen that the current issue, and can
always be retried after the first failure, unlike the current situation.

* Add tests
2021-11-26 01:22:10 +01:00
Claire
e5113a8cad Fix overflow of long profile fields in admin view (#17010) 2021-11-26 01:21:57 +01:00
Claire
22cd1e6ab5 Fix confusing error when webfinger request returns empty document (#16986)
For some reason, some misconfigured servers return an empty document when
queried over webfinger. Since an empty document does not lead to a parse
error, the error is not caught properly and triggers uncaught exceptions
later on.

This PR fixes that by immediately erroring out with `Webfinger::Error` on
getting an empty response.
2021-11-26 01:21:50 +01:00
Claire
e65ede1ac5 Fix upload of remote media with OpenStack Swift sometimes failing (#16998)
Under certain conditions, files fetched from remotes trigger an error when
being uploaded using OpenStack Swift. This is because in some cases, the
remote server will not return a content-length, so our ResponseWithLimitAdapter
will hold a `nil` value for `#size`, which will lead to an invalid value
for the Content-Length header of the Swift API call.

This commit fixes that by taking the size from the actually-downloaded file
size rather than the upstream-provided Content-Length header value.
2021-11-26 01:21:43 +01:00
Takeshi Umeda
1bcb3daf7e Fix logout link not working in safari (#16574) 2021-11-26 01:21:37 +01:00
Claire
9c610ca0a4 Fix “open” link of media modal not closing modal (#16524) 2021-11-26 01:21:29 +01:00
Claire
77d0297313 Fix replying from modal (#16516)
Fixes #16515

Not using a router object somehow made `this.history` lag behind the real
browser history whenever pushing a new history item in `replyCompose`.

Not using the context-provided router in this case was an oversight made
when porting glitch-soc changes in #16499.
2021-11-26 01:21:21 +01:00
Eugen Rochko
4b6668868e Bump version to 3.4.3 2021-11-06 05:19:38 +01:00
Eugen Rochko
5c47a18c8d Fix login being broken due to inaccurately applied backport fix in 3.4.2
See #16943
2021-11-06 05:17:39 +01:00
Eugen Rochko
8a74d851d2 Bump version to 3.4.2 2021-11-06 00:24:30 +01:00
Claire
76c2028859 Fix AccountNote not having a maximum length (#16942) 2021-11-06 00:17:05 +01:00
Claire
3251b8eead Fix reviving revoked sessions and invalidating login (#16943)
Up until now, we have used Devise's Rememberable mechanism to re-log users
after the end of their browser sessions. This mechanism relies on a signed
cookie containing a token. That token was stored on the user's record,
meaning it was shared across all logged in browsers, meaning truly revoking
a browser's ability to auto-log-in involves revoking the token itself, and
revoking access from *all* logged-in browsers.

We had a session mechanism that dynamically checks whether a user's session
has been disabled, and would log out the user if so. However, this would only
clear a session being actively used, and a new one could be respawned with
the `remember_user_token` cookie.

In practice, this caused two issues:
- sessions could be revived after being closed from /auth/edit (security issue)
- auto-log-in would be disabled for *all* browsers after logging out from one
  of them

This PR removes the `remember_token` mechanism and treats the `_session_id`
cookie/token as a browser-specific `remember_token`, fixing both issues.
2021-11-06 00:17:05 +01:00
Claire
f60bb0784f Fix handling announcements with links (#16941)
Broken since #15827
2021-11-06 00:07:17 +01:00
Claire
c3a6f7b941 Fix user email address being banned on self-deletion (#16503)
* Add tests

* Fix user email address being banned on self-deletion

Fixes #16498
2021-11-05 23:46:24 +01:00
Claire
986397b3a2 Improve modal flow and back button handling (#16499)
* Refactor shouldUpdateScroll passing

So far, shouldUpdateScroll has been manually passed down from the very top of
the React component hierarchy even though it is a static function common to
all ScrollContainer instances, so replaced that with a custom class extending
ScrollContainer.

* Generalize “press back to close modal” to any modal and to public pages

* Fix boost confirmation modal closing media modal
2021-11-05 23:46:24 +01:00
Claire
c79d4711e9 Change references to tootsuite/mastodon to mastodon/mastodon (#16491)
* Change references to tootsuite/mastodon to mastodon/mastodon

* Remove obsolete test fixture

* Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG

And a few other places
2021-11-05 23:46:24 +01:00
Claire
be56033715 Change number_to_human calls to always use 3-digits precision (#16469)
Fixes #16435
2021-11-05 23:46:24 +01:00
Claire
8815e98aa2 Fix pop-in player display when poster has long username or handle (#16468) 2021-11-05 23:46:24 +01:00
Claire
4bc1fde105 Fix anonymous access to outbox not being cached by the reverse proxy (#16458)
* Fix anonymous access to outbox not being cached by the reverse proxy

Up until now, anonymous access to outbox was marked as public, but with a
0 duration for caching, which means remote proxies would only serve from cache
when the server was completely overwhelmed.

Changed that cache duration to one minute, so that repeated anonymous access
to one account's outbox can be appropriately cached.

Also added `Signature` to the `Vary` header in case a page is requested, so
that authenticated fetches are never served from cache (which only contains
public toots).

* Remove Vary: Accept header from webfinger controller

Indeed, we have stopped returning xrd, and only ever return jrd, so the
Accept request header does not matter anymore.

* Cache negative webfinger hits for 3 minutes
2021-11-05 23:46:24 +01:00
Claire
34ab4111a7 Fix WebUI crash when a toot with a playing video gets deleted (#16384)
* Fix WebUI crash when a toot with a playing video gets deleted

* Fix pop-up player not closing the moment a status is deleted
2021-11-05 23:46:24 +01:00
Claire
aebcb722aa Fix serialization of followers/following counts when user hides their network (#16418)
* Add tests

* Fix serialization of followers/following counts when user hides their network

Fixes #16382

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-11-05 23:46:24 +01:00
Claire
9a468c895b Fix inefficiencies in auto-linking code (#16506)
The auto-linking code basically rewrote the whole string escaping non-ascii
characters in an inefficient way, and building a full character offset map
between the unescaped and escaped texts before sending the contents to
TwitterText's extractor.

Instead of doing that, this commit changes the TwitterText regexps to include
valid IRI characters in addition to valid URI characters.
2021-11-05 23:46:24 +01:00
Claire
a1e5ff04e3 Fix tootctl self-destruct not sending Delete activities for recently-suspended accounts (#16688)
* Do not block existing users' emails on self-destruct

That is wasteful and unintuitive

* Do not close registrations when running tootctl self-destruct with --dry-run

* Close registrations on self-destruct regardless of known remote accounts

* Fix tootctl self-destruct not sending Deletes for recently-suspended accounts

* Suspend local users even if no remote account is known

* Do not show scary confirmation text if ran with --dry-run
2021-11-05 23:46:24 +01:00
Claire
e40d5414cc Fix crashes with Microsoft Translate on Microsoft Edge (#16525)
Fixes #16509

Microsoft Edge with translation enabled rewrites the DOM in ways that confuse
react and prevent it from working properly. Wrapping the offending parts in
a span avoids this issue.
2021-11-05 23:46:24 +01:00
Claire
40eaa8706b Fix suspicious sign-in mail text being out of date (#16690)
Fixes #16687
2021-11-05 23:46:24 +01:00
Claire
4cc7efcb08 Fix some Rails frameworks being unnecessarily loaded (#16725)
Saves about 10MiB of memory usage at boot
2021-11-05 23:46:23 +01:00
Claire
9b34647c9b Fix followers synchronization mechanism not working when URI has empty path (#16744)
Follow-up to #16510, forgot the controller exposing the actual followers…
2021-11-05 23:46:23 +01:00
Eugen Rochko
6b98fd0b4f Fix not being able to suspend accounts that already have a canonical e-mail block (#16455) 2021-11-05 20:34:12 +01:00
Claire
c7f534ab95 Fix missing on_delete: :cascade for canonical_email_blocks foreign key (#16448) 2021-11-05 20:31:51 +01:00
Eugen Rochko
d5a50e9dfb Add configuration attribute to GET /api/v1/instance (#16485)
List various values like file size limits and supported mime types
2021-11-05 20:30:02 +01:00
Jeong Arm
e1cf8d4d37 Fix statuses order in account's statuses admin page (#16937) 2021-11-05 20:29:22 +01:00
Jeong Arm
f366a23a23 Skip blocked domains media on tootctl media refresh (#16914) 2021-11-05 20:29:14 +01:00
Claire
aa828aea02 Fix mastodon:setup to take dotenv/docker-compose differences into account (#16896)
In order to work around https://github.com/mastodon/mastodon/issues/16895,
add a warning to .env.production.sample, and change the mastodon:setup rake
task to:
- output a warning if a variable will be interpreted differently by dotenv
  and docker-compose
- ensure the printed config is compatible with docker-compose
2021-11-05 20:29:06 +01:00
Claire
123a88b6b5 Fix some link previews being incorrectly generated from other prior links (#16885)
* Add tests

* Fix some link previews being incorrectly generated from different prior links

PR #12403 added a cache to avoid redundant queries when the OEmbed endpoint can
be guessed from the URL. This caching mechanism is not perfectly correct as
there is no guarantee that all pages from a given domain share the same
OEmbed provider endpoint.

This PR prevents the FetchOEmbedService from caching OEmbed endpoint that
cannot be generalized by replacing a fully-qualified URL from the endpoint's
parameters, greatly reducing the number of incorrect cached generalizations.
2021-11-05 20:28:59 +01:00
Claire
e63370db19 Fix scheduled statuses decreasing statuses counts (#16791)
* Add tests

* Fix scheduled statuses decreasing statuses counts

Fixes #16774
2021-11-05 20:28:41 +01:00
Claire
2396c9061a Fix webauthn secure key authentication (#16792)
* Add tests

* Fix webauthn secure key authentication

Fixes #16769
2021-11-05 20:28:33 +01:00
Holger
663b58aaae use relative path for scope (#16714)
Use relative path for `scope` in web manifest to allow users use PWA correctly via alternate domains.
2021-11-05 20:28:27 +01:00
Claire
75441ac63d Fix addressing of remote groups' followers (#16700)
Fixes #16699
2021-11-05 20:28:20 +01:00
Claire
5899fe70b6 Fix processing mentions to domains with non-ascii TLDs (#16689)
Fixes #16602
2021-11-05 20:28:11 +01:00
Claire
2688f18d06 Fix authentication failures after going halfway through a sign-in attempt (#16607)
* Add tests

* Add security-related tests

My first (unpublished) attempt at fixing the issues introduced (extremely
hard-to-exploit) security vulnerabilities, addressing them in a test.

* Fix authentication failures after going halfway through a sign-in attempt

* Refactor `authenticate_with_sign_in_token` and `authenticate_with_two_factor` to make the two authentication steps more obvious
2021-11-05 20:27:07 +01:00
Claire
f51c6cba1f Fix remotely-suspended accounts' toots being merged back into timelines (#16628)
* Fix remotely-suspended accounts' toots being merged back into timelines

* Mark remotely-deleted accounts as remotely suspended
2021-11-05 20:26:59 +01:00
Claire
4f852448e1 Fix crash when encountering invalid account fields (#16598)
* Add test

* Fix crash when encountering invalid account fields
2021-11-05 20:26:51 +01:00
Takeshi Umeda
c02d6c46e3 Fix invalid blurhash handling in Create activity (#16583) 2021-11-05 20:26:44 +01:00
Takeshi Umeda
987f945930 Fix when MoveWorker cannot get locale from remote account (#16576) 2021-11-05 20:26:36 +01:00
Claire
e62f488be5 Fix newlines in accout notes added by the Move handler (#16415)
* Fix newlines in account notes added by the move handler

* Make MoveWorker more robust
2021-11-05 20:25:04 +01:00
ida
c83c30d96d Merge tag 'v3.4.0' of https://github.com/tootsuite/mastodon 2021-05-16 22:30:33 -07:00
ida
a6c2b78904 update source url 2020-12-30 23:26:56 -07:00
ida
940db5c971 fix locales,,, again 2020-12-30 22:49:03 -07:00
ida
aaf688112c set RAILS_ENV to development in .env.vagrant 2020-12-30 22:48:37 -07:00
ida
8da7f04c80 Merge tag 'v3.3.0' of https://github.com/tootsuite/mastodon 2020-12-30 20:14:58 -07:00
ida
e0f62bab4e allow vagrant to use more resources 2020-12-01 03:48:36 -07:00
ida
7c3aaddafb Merge tag 'v3.3.0rc1' of https://github.com/tootsuite/mastodon 2020-12-01 03:47:54 -07:00
ida
a20c82de33 Merge tag 'v3.2.0' of https://github.com/tootsuite/mastodon 2020-07-28 07:27:59 -07:00
ida
2953d642d1 change public profile name/handle text to white 2020-06-22 23:41:18 -07:00
ida
59fd4bf803 tweak and fix summer theme 2020-06-22 20:46:27 -07:00
ida
6096805f5b summer theme fixes 2020-06-10 08:23:56 -07:00
ida
0db33e3a7b add summer theme 2020-06-10 07:42:27 -07:00
ida
3a478a0dd4 copy over 34 to summer, so we can start work on that 2020-06-10 01:57:03 -07:00
ida
aa34f53ad9 change naming scheme for custom themes, and make radtown names lowercase for consistency 2020-06-02 04:28:43 -07:00
ida
eed871a2a6 fix instance serializer 2020-05-17 01:08:26 +00:00
ida
946f03dbf4 fix locales again 2020-05-16 17:06:05 -07:00
ida
922c2d4d4c Merge tag 'v3.1.4' of https://github.com/tootsuite/mastodon 2020-05-14 20:21:36 -07:00
ida
dc7afa6af1 add beanskull 2020-05-01 04:00:37 -07:00
ida
82de7f13d2 Merge tag 'v3.1.3' of https://github.com/tootsuite/mastodon 2020-04-05 07:51:10 -07:00
ida
bdf40ba2d8 merge 34 and spring themes, fix spring theme 2020-03-12 06:23:59 -07:00
ida
73ac59e55c rename old spring theme to 34 2020-03-09 21:21:11 -07:00
ida
311c3d9f83 rework spring theme 2020-03-06 08:37:50 -07:00
ida
d200465682 minor tweaks to the spring theme 2020-03-06 05:59:06 -07:00
ida
30752198ad implement spring thjeme 2020-03-03 18:00:04 -07:00
ida
7c4fa1cf50 start work on spring theme 2020-03-02 16:49:29 -07:00
ida
0d31000271 Merge tag 'v3.1.2' of https://github.com/tootsuite/mastodon 2020-02-27 13:35:28 -07:00
ida
abe0067f7e fix locales 2020-02-10 11:49:24 -07:00
ida
577a36d1c0 Merge tag 'v3.1.1' 2020-02-10 11:46:25 -07:00
ida
a2124cd915 fix nzwsme theme's background in single column mode 2020-01-29 22:28:44 -07:00
ida
3bc7c85a68 Merge tag 'v3.1.0rc2' 2020-01-29 18:23:26 -07:00
ida
7abf700004 move to ruby 2.6.5 2019-12-27 00:15:59 -07:00
ida
c402323c01 fix black theme again fuck 2019-12-26 04:49:00 -07:00
ida
c5e8eacbed fix black theme whoops 2019-12-24 20:34:23 -07:00
ida
29c8e8b851 finish dark theme 2019-12-24 19:51:33 -07:00
ida
2cccf06053 fix black theme's name in the locales 2019-12-24 15:04:29 -07:00
ida
60d9a0dd52 start work on black/white theme 2019-12-24 14:40:50 -07:00
ida
682165eb1a fix mastodon-autumn so it imports the right theme 2019-12-23 14:03:50 -07:00
ida
ede68c47da Merge branch 'master' of git.skehsucks.xyz:ida/isnotalive 2019-12-23 13:50:34 -07:00
ida
c24da4d43f rename mastodon-spooky to mastodon-autumn 2019-12-23 13:49:12 -07:00
ida
121b927a1c finish up winter theme 2019-12-23 13:34:58 -07:00
ida
c8f3ad9860 tweak winter theme 2019-12-23 12:50:04 -07:00
ida
3cae436bc6 add winter theme 2019-12-23 12:04:11 -07:00
ida
277104aa05 fix toot character advertisement 2019-11-28 12:03:39 -07:00
ida
8e881e74f8 change max metadata field count to 8 2019-10-21 11:07:32 -07:00
ida
935b4c0761 Merge tag 'v3.0.1' of https://github.com/tootsuite/mastodon 2019-10-10 19:07:14 -07:00
ida
60d3d48778 add nzws theme 2019-10-06 00:51:48 -07:00
ida
1e0c4f2584 actually change github to gitea 2019-10-04 16:36:47 -07:00
ida
7896e3baad fix link footer to say gitea, as we're not using github 2019-10-04 16:29:30 -07:00
ida
aebf07aabd change source url to git repo 2019-10-04 16:11:18 -07:00
ida
327cf7f3ef keep ruby version at 2.6.1 2019-10-03 17:18:10 -07:00
ida
667b52ede4 Merge remote-tracking branch 'upstream/master' 2019-10-03 17:05:54 -07:00
ida
a782b0956e increase puma threads to 10, keeping only 2 workers 2019-10-01 15:30:13 -07:00
ida
0f3909531d Merge branch 'master' of git.skehsucks.xyz:ida/mastodonisnotalive 2019-10-01 12:34:07 -07:00
ida
d87a8772c1 Merge remote-tracking branch 'upstream/master' 2019-10-01 12:33:42 -07:00
ida
85d0e1b252 Merge branch 'master' of https://github.com/tootsuite/mastodon 2019-09-30 09:26:51 -07:00
ida
f141caf76c Merge remote-tracking branch 'upstream/master' 2019-09-24 23:54:40 -07:00
ida
d7be3a4fdf increase poll option limit to 25, text limit to 150, and allow single option polls 2019-09-24 05:04:47 -07:00
ida
1110ab2299 add required fonts for radtown themes 2019-09-23 19:18:14 -07:00
ida
b9810de0fa add images for radtown themes 2019-09-23 17:54:02 -07:00
ida
00460b79c7 add radtown theme files 2019-09-23 16:33:35 -07:00
ida
6fbbaa1684 Merge remote-tracking branch 'upstream/master' 2019-09-23 05:11:42 -07:00
ida
d578ea036c increase favorite button contrast in the spooky theme 2019-09-22 20:02:28 -07:00
ida
cf6b2c42cf spooky theme tweaks to make compose form placeholder text readable 2019-09-22 18:27:02 -07:00
ida
62044d3266 fix compose form displaying incorrect character limit 2019-09-22 18:27:02 -07:00
ida
ee0129135e fix compose placeholder text 2019-09-22 18:27:02 -07:00
ida
14b6644d43 fix compose form displaying incorrect character limit 2019-09-22 18:27:02 -07:00
ida
9a6c543609 change "on your mind" to "in your skull" 2019-09-22 18:27:02 -07:00
ida
47625d1184 remove unused diff.scss from spooky theme 2019-09-22 18:27:02 -07:00
ida
5779525704 add orange halloween theme 2019-09-22 18:27:02 -07:00
ida
7780abe790 completing change of locales, for spooky effect 2019-09-22 18:27:02 -07:00
ida
c6351a25cb change notif sounds to be more spooky 2019-09-22 18:27:02 -07:00
ida
b6ce1cc258 change post limit from 500 to 69420 2019-09-22 18:27:02 -07:00
ida
3a79f099a2 change metadata fields to 8, display name length to 150 2019-09-22 18:27:02 -07:00
ida
880c1679c4 change english locales to be more spooky 2019-09-22 18:27:02 -07:00
166 changed files with 2789 additions and 183 deletions

View file

@ -1,4 +1,5 @@
VAGRANT=true
RAILS_ENV=development
LOCAL_DOMAIN=mastodon.local
BIND=0.0.0.0
DB_HOST=/var/run/postgresql/

4
Vagrantfile vendored
View file

@ -87,10 +87,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.provider :virtualbox do |vb|
vb.name = "mastodon"
vb.customize ["modifyvm", :id, "--memory", "2048"]
vb.customize ["modifyvm", :id, "--memory", "4192"]
# Increase the number of CPUs. Uncomment and adjust to
# increase performance
# vb.customize ["modifyvm", :id, "--cpus", "3"]
vb.customize ["modifyvm", :id, "--cpus", "16"]
# Disable VirtualBox DNS proxy to skip long-delay IPv6 resolutions.
# https://github.com/mitchellh/vagrant/issues/1172

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

View file

@ -0,0 +1 @@
<svg aria-hidden="true" data-prefix="fas" data-icon="grip-vertical" class="svg-inline--fa fa-grip-vertical fa-w-10" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512"><path fill="currentColor" d="M96 32H32C14.33 32 0 46.33 0 64v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160H32c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zM288 32h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32V64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32zm0 160h-64c-17.67 0-32 14.33-32 32v64c0 17.67 14.33 32 32 32h64c17.67 0 32-14.33 32-32v-64c0-17.67-14.33-32-32-32z"></path></svg>

After

Width:  |  Height:  |  Size: 906 B

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
<path d="M72.53,3.033C85.265,3.033 95.605,13.372 95.605,26.108L95.605,58.412C95.605,78.789 79.062,95.332 58.685,95.332L26.38,95.332C13.645,95.332 3.305,84.993 3.305,72.257L3.305,39.953C3.305,19.576 19.848,3.033 40.225,3.033L72.53,3.033ZM42.991,66.039C39.151,68.269 34.514,69.384 29.081,69.384C23.029,69.384 18.215,67.627 14.64,64.115C11.065,60.602 9.278,55.819 9.278,49.766C9.278,43.679 11.224,38.692 15.118,34.808C19.011,30.923 24.161,28.981 30.568,28.981C34.744,28.981 38.372,29.583 41.451,30.786L41.451,38.139C38.443,36.317 34.744,35.405 30.355,35.405C26.479,35.405 23.325,36.684 20.892,39.241C18.458,41.798 17.242,45.174 17.242,49.368C17.242,53.651 18.339,56.983 20.533,59.363C22.728,61.743 25.736,62.933 29.559,62.933C31.895,62.933 33.842,62.553 35.399,61.792L35.399,53.164L27.382,53.164L27.382,47.006L42.991,47.006L42.991,66.039ZM58.547,68.694L58.547,29.618L50.981,29.618L50.981,68.694L58.547,68.694ZM89.632,35.91L89.632,29.618L67.865,29.618L67.865,68.694L75.43,68.694L75.43,52.872L88.517,52.872L88.517,46.661L75.43,46.661L75.43,35.91L89.632,35.91Z" style="fill:white;"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 120 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2 KiB

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