marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,389 Commits
2 Branches
0 Tags
486 MiB
Commit Graph

9389 Commits (cf557f18497e98aea0dbf8a799186aa92dc34663)

Author SHA1 Message Date
multiple creatures cf557f1849 Plain AAC audio uploads live again. -DT 2019-05-21 03:16:21 -05:00
Thibaut Girka f119ef489c [Glitch] Adds follow action timestamp to notification 
Port 330e320b40 to glitch-soc
 2019-05-21 03:16:21 -05:00
multiple creatures 6a0c65d461 allow searching bookmarks 2019-05-21 03:16:21 -05:00
multiple creatures 706c177c8e also make packmate roars pinnable in web app 2019-05-21 03:16:21 -05:00
multiple creatures 3c17de7724 allow pinning packmate roars 2019-05-21 03:16:20 -05:00
multiple creatures 17a7aeb807 additional secure headers 2019-05-21 03:16:20 -05:00
multiple creatures 918f7b7478 disallow indexing 2019-05-21 03:16:20 -05:00
Daggertooth 3f79556155 Change default colmns in Glitch flavor, too. 2019-05-21 03:16:20 -05:00
Daggertooth b90ad78073 Change default columns for new users 2019-05-21 03:16:20 -05:00
Daggertooth 28724df663 Let moderators manage blocklist 2019-05-21 03:16:20 -05:00
Daggertooth 49353be9f1 Let moderators manage Emoji 2019-05-21 03:16:20 -05:00
Daggertooth 5db1301d7a Raise description text max length 2019-05-21 03:16:20 -05:00
Daggertooth b8ef3027da Raise description text max length 2019-05-21 03:16:20 -05:00
Daggertooth 41642c6668 Allow 4k image uploads 2019-05-21 03:16:20 -05:00
Daggertooth 70649ca277 Store more statuses in home timeline 2019-05-21 03:16:20 -05:00
Daggertooth 71066e4ad6 Return more accounts in searches 2019-05-21 03:16:20 -05:00
Daggertooth a607195dc0 Email mention notifications by default 2019-05-21 03:16:20 -05:00
Daggertooth d0d22f3c68 Opt users out of search engine indexing by default 2019-05-21 03:16:20 -05:00
Daggertooth cf3aee91ca Confirm boosts by default 2019-05-21 03:16:20 -05:00
Daggertooth ae1576691f Confirm unfollows by default 2019-05-21 03:16:20 -05:00
Daggertooth 4df5e5c01c Rename default site title 2019-05-21 03:16:20 -05:00
Thibaut Girka 4fbce23992 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Thibaut Girka 2cd7bfac23 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
ThibG 0998e3ade8
Merge pull request #1055 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-19 22:07:42 +02:00
Thibaut Girka 08a2af27c3 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
ThibG 46811f92e4
Merge pull request #1054 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-19 21:52:27 +02:00
ThibG ae18386558 Fix “invited by” not showing up for invited accounts in admin interface (#10791) 2019-05-19 21:40:36 +02:00
Marek Ľach 37a04c329c sk.yml grammar update (#10786) 
* sk.yml grammar update

* bundle exec i18n-tasks normalize
 2019-05-20 02:27:32 +09:00
Hinaloe bb9d7fad9f fix `isSubmitting` prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka f509815379 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Marek Ľach 692e7cea2a Small corrections for sk translation (#10784) 2019-05-19 22:42:10 +09:00
ThibG 4edf5213dc Add post-deployment migration script to delete public-boosts-of-private-toots (#10783) 2019-05-19 13:49:31 +02:00
Shlee ab829d4aa8 Upgrade redis in docker-compose.yml from 4 to 5 (#9063) 2019-05-19 11:29:26 +02:00
Aditoo17 5ff06af2d2 I18n: Update Czech translation (#10781) 2019-05-19 14:39:16 +09:00
Ben Lubar 2f3e4a64be add og:image:alt for media attachments in embeds (#10779) 2019-05-18 20:57:45 +02:00
Eugen Rochko 6fe474837c
Change poll options to alphabetic letters when status text is hidden (#10685) 
Fix #10569
 2019-05-18 14:41:16 +02:00
Yusuke Nakamura 2c12620adb Remove 'Weblate' from CONTRIBUTING.md (#10778) 
The mastodon project no longer used weblate to translate UI
sentences. (ref #10385)
 2019-05-18 14:40:55 +02:00
ThibG 4beb8d7788
Merge pull request #1053 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-18 10:18:52 +02:00
Thibaut Girka 6e227ecb04 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
ThibG a1519a8ef5 Prevent from publicly boosting one's own private toots (#10775) 2019-05-18 00:28:51 +02:00
Thibaut Girka 9ca21e93cc Minor optimization 2019-05-17 23:51:14 +02:00
Thibaut Girka 56245a2a72 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka dd5bf40b97 Properly escape HTML in code blocks 2019-05-17 23:51:14 +02:00
Thibaut Girka a6b7c23f6f Add option for default toot content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka 0be93820f3 Fix autolinking, and newlines in code blocks 
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
 2019-05-17 23:51:14 +02:00
Thibaut Girka 9df1ef87c2 Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier c2fa36bbae Content-Type Dropdown: use the selected option icon for the menu 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka 93d98f62a8 Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi f34a402a94 Add status content type dropdown to compose box. 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-17 23:51:14 +02:00
Thibaut Girka 14d7ddcb1c Add API support for setting status content-type 2019-05-17 23:51:14 +02:00