mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 07:34:58 +01:00
Code Issues Projects Releases Wiki Activity
7,360 Commits 137 Branches 269 Tags 929 MiB
9d2739d74d
Commit Graph

7360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThibG
42573b76f1 Do not crash if remote custom emoji does not define updated date (fixes #8376) (#8377) 2018-08-23 00:27:58 +02:00
ThibG
8aa58e34bb
Merge pull request #665 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-22 21:35:07 +02:00
Thibaut Girka
e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-22 20:56:32 +02:00
ThibG
56f882aed6 Avoid deleted attributes when building a Status from action log (fixes #8371) (#8373) 2018-08-22 20:55:50 +02:00
Eugen Rochko
802cf6a4c5
Improve federated ID validation (#8372) 
* Fix URI not being sufficiently validated with prefetched JSON

* Add additional id validation to OStatus documents, when possible
 2018-08-22 20:55:14 +02:00
Thibaut Girka
628fca50e2 Override CSP setting in the embed controller to allow frames 2018-08-22 20:39:33 +02:00
Thibaut Girka
e7a72439f1 Move CSP headers to the appropriate Rails configuration 
Also drop dev-static.glitch.social reference.
 2018-08-22 20:39:33 +02:00
Thibaut Girka
f34616eec1 Fix locale packs loading in embed layout 2018-08-22 20:39:33 +02:00
Thibaut Girka
3c49daeb8d Add glitch-soc local setting to display reply counters 
Defaults to false.
 2018-08-22 20:29:55 +02:00
Thibaut Girka
d62ea55d51 Move layout options to their own section 2018-08-22 20:29:55 +02:00
Thibaut Girka
87ad942d76 [Glitch] Display replies count in web UI 
Port 4df9cabb22 to glitch-soc
 2018-08-22 20:29:55 +02:00
M Somerville
ad41806e53 Allow use of plurals on about page stats. (#8363) 2018-08-22 19:42:47 +02:00
Eugen Rochko
1b282299df
Add favourites to archive takeout (#8351) 
Remove experimental key export
 2018-08-22 19:33:10 +02:00
Thibaut Girka
801919fc9b Add hashtag trendline support to glitch-soc flavour 
Port Mastodon's hashtag stats thing to glitch-soc.
This doesn't change how hashtags are ordered, and doesn't add a trending
hashtags section, but it does change how hashtag searches are rendered,
displaying a trend line alongside each hashtag.
 2018-08-22 19:27:06 +02:00
Thibaut Girka
360fbf1bd4 Add pinned accounts editor 2018-08-22 16:18:23 +02:00
Thibaut Girka
9fbaaefe59 Split list editor into components and containers 2018-08-22 16:18:23 +02:00
Thibaut Girka
d69f045681 Fix ColumnLink keys in getting_started_misc 2018-08-22 16:18:23 +02:00
masarakki
4bdab203ac exclude-other-silenced-accounts (#7528) 2018-08-22 13:20:50 +02:00
Eugen Rochko
2374a00c10
Add confirmation step to account suspensions (#8353) 
* Add confirmation page for suspensions

* Suspension confirmation closes reports, linked from report UI

* Fix tests
 2018-08-22 11:53:41 +02:00
Eugen Rochko
28de046b8b
Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
Eugen Rochko
025a06d322
Add missing indices for ON DELETE CASCADE constraints (#8332) 
Fix #8327
 2018-08-21 20:11:34 +02:00
ThibG
37965ac8d9
Merge pull request #660 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-21 19:54:21 +02:00
Yamagishi Kazutoshi
513cb20b75 Weblate translations (2018-08-22) (#8346) 
* Translated using Weblate (Greek)

Currently translated at 99.8% (667 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Persian)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 99.7% (666 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (668 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Arabic)

Currently translated at 95.2% (636 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (668 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.7% (666 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Polish)

Currently translated at 99.7% (666 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/

* Translated using Weblate (Czech)

Currently translated at 99.8% (667 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (French)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Galician)

Currently translated at 99.8% (667 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Occitan)

Currently translated at 99.8% (667 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Ukrainian)

Currently translated at 96.5% (645 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 69.3% (68 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/uk/

* Translated using Weblate (Ukrainian)

Currently translated at 43.9% (36 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/

* Translated using Weblate (Czech)

Currently translated at 99.8% (667 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Basque)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/

* Translated using Weblate (Basque)

Currently translated at 98.9% (661 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/

* Translated using Weblate (Basque)

Currently translated at 97.5% (80 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/

* Translated using Weblate (Czech)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Arabic)

Currently translated at 95.2% (636 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Japanese)

Currently translated at 99.7% (666 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (667 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Arabic)

Currently translated at 92.6% (76 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Arabic)

Currently translated at 97.1% (649 of 668 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Arabic)

Currently translated at 97.0% (650 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Greek)

Currently translated at 99.8% (669 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Japanese)

Currently translated at 99.7% (668 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Galician)

Currently translated at 99.8% (669 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (669 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Finnish)

Currently translated at 88.5% (593 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/

* Translated using Weblate (Occitan)

Currently translated at 99.8% (669 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Persian)

Currently translated at 100.0% (82 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Persian)

Currently translated at 99.7% (668 of 670 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/

* Translated using Weblate (Japanese)

Currently translated at 99.7% (670 of 672 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Arabic)

Currently translated at 96.7% (650 of 672 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Swedish)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/

* Translated using Weblate (Czech)

Currently translated at 99.8% (672 of 673 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Japanese)

Currently translated at 99.7% (671 of 673 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Danish)

Currently translated at 84.5% (569 of 673 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Danish)

Currently translated at 77.4% (48 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/

* Translated using Weblate (Arabic)

Currently translated at 97.0% (654 of 674 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 97.0% (655 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Japanese)

Currently translated at 99.7% (673 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Czech)

Currently translated at 99.8% (674 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Greek)

Currently translated at 99.8% (674 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Esperanto)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/

* Translated using Weblate (French)

Currently translated at 96.8% (654 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Esperanto)

Currently translated at 99.7% (673 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/

* Translated using Weblate (Danish)

Currently translated at 84.5% (571 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Danish)

Currently translated at 84.8% (573 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Occitan)

Currently translated at 99.7% (673 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Danish)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Danish)

Currently translated at 88.7% (55 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/

* Translated using Weblate (Italian)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Danish)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/

* Translated using Weblate (Danish)

Currently translated at 85.1% (575 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Hebrew)

Currently translated at 45.4% (307 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/

* Translated using Weblate (Danish)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Russian)

Currently translated at 98.0% (303 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/

* Translated using Weblate (Hebrew)

Currently translated at 97.4% (301 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/

* Translated using Weblate (Danish)

Currently translated at 100.0% (82 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/

* Translated using Weblate (Arabic)

Currently translated at 97.1% (656 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Danish)

Currently translated at 86.8% (586 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Italian)

Currently translated at 83.2% (562 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Danish)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/

* Translated using Weblate (Danish)

Currently translated at 100.0% (62 of 62 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/da/

* Translated using Weblate (Danish)

Currently translated at 93.8% (92 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/

* Translated using Weblate (Galician)

Currently translated at 100.0% (675 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Italian)

Currently translated at 83.4% (563 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Arabic)

Currently translated at 97.6% (659 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (675 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Arabic)

Currently translated at 97.7% (660 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 93.9% (77 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (675 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.8% (674 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/

* Translated using Weblate (Arabic)

Currently translated at 97.7% (660 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Danish)

Currently translated at 86.9% (587 of 675 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (309 of 309 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Danish)

Currently translated at 97.9% (96 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/

* yarn manage:translations

* i18n-tasks normalize
 2018-08-21 18:38:27 +02:00
Thibaut Girka
8b4abaa90d Merge branch 'master' into glitch-soc/master 
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
 2018-08-21 18:24:48 +02:00
ThibG
f06fa09962 Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339) 
* Fix uncaching worker

* Revert to using Paperclip's filesystem backend instead of fog-local

fog-local has lots of concurrency issues, causing failure to delete files,
dangling file records, and spurious errors UncacheMediaWorker
 2018-08-21 17:53:01 +02:00
Eugen Rochko
d98de8ada7
Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
Eugen Rochko
83746b6364
Remove annoying Notification#cache_ids scope warning (#8333) 2018-08-21 02:49:51 +02:00
NecroTechno
6a0d4d36ad reorder simple form ul to list vertically (fixes #8236) (#8322) 
* reorder simple form ul to list vertically (fixes #8236)

* remove browser specific prefixes
 2018-08-20 23:58:57 +02:00
ThibG
8ac5e651e1 Upgrade doorkeeper to 4.4.2 (#8321) 2018-08-20 22:42:02 +02:00
Thibaut Girka
c789181626 [Glitch] Add hotkey for follow requests 
Port 25f6f41052 to glitch-soc
 2018-08-20 21:25:02 +02:00
Thibaut Girka
b230c04e00 Make the privacy dropdown button not look strange when using top placement 
Inspired by 8fe1f8d4ce
 2018-08-20 20:10:53 +02:00
Thibaut Girka
24f39c0841 [Glitch] Skip pagination logic entirely for pinned toots 2018-08-20 20:09:19 +02:00
Thibaut Girka
0c091475df Make non-link ColumnLinks behave as links 2018-08-20 20:08:13 +02:00
ThibG
b34d6238cb Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
ThibG
5fbf12bbb8 Skip pagination logic entirely for pinned toots (fixes #8302) (#8310) 2018-08-20 13:32:43 +02:00
Eugen Rochko
6226aa83d7
Increase reach of Delete->Actor activities (#8305) 
Fix #7316
 2018-08-20 13:28:05 +02:00
Annika Backstrom
25f6f41052 Add hotkey for follow requests (#8307) 2018-08-20 03:44:16 +02:00
Thibaut Girka
f4d28ccfa3 Don't filter own toots 2018-08-19 21:36:46 +02:00
Oskari Noppa
1d1e0171ec Fix a variable for a Finnish translation (#8299) 2018-08-20 02:16:40 +09:00
ThibG
28163528e5 Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
cpsdqs
8fe1f8d4ce Make dropdown animations respect their placement (#8292) 
* Make dropdown animations respect their placement

Also fix the corner radius on the privacy dropdown button when using top placement

* Fix code style issue
 2018-08-19 17:11:12 +02:00
Marcin Mikołajczak
62cd097414 i18n: Update Polish translation (#8290) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-08-20 00:05:36 +09:00
Thibaut Girka
ea3c0ce321 Adapt github issue template to glitch-soc 
We don't have releases, so it don't make sense to mention.
On the other hand, a lot of our code is from upstream, so encourage people to
check whether it is a bug in glitch-soc or upstream.
 2018-08-19 16:56:42 +02:00
Thibaut Girka
432f6b88b0 Focus CW field when enabling it, focus compose textarea when disabling it 
Port a99179d31f and 09147186b7
to glitch-soc
 2018-08-19 16:56:31 +02:00
abcang
9e75aa30cd Unuse ActiveRecord::Base#cache_key (#8185) 
* Unuse ActiveRecord::Base#cache_key

* Enable cache_versioning

* Call cache_collection
 2018-08-19 15:52:38 +02:00
mayaeh
0d1d9b9a33 Fix report text color. (#8288) 2018-08-19 15:51:57 +02:00
Eugen Rochko
91c929a42c
Keep scheduler jobs unique until they're done (#8287) 2018-08-19 15:48:29 +02:00
ThibG
484b9314e3
Merge pull request #652 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-19 09:46:26 +02:00
Thibaut Girka
88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-19 09:27:18 +02:00
Eugen Rochko
59c68c1a74
Reduce user active duration from 7 days to 2 days (#8282) 
To minimize fanout work and redis home feed storage space when
there are lots of recent sign-ups
 2018-08-19 03:50:34 +02:00