ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,499 Commits
10 Branches
15 Tags
251 MiB
Commit Graph

10224 Commits (e59c40eb686684c353e5b322753c5022b444a92b)

Author SHA1 Message Date
Ariadne Conill e59c40eb68 activitypub: switch to fedibird:quoteUri 2022-12-26 03:18:03 +00:00
Ariadne Conill 5a8d4265ef glitch: fix up quote indicator 2022-12-26 02:53:01 +00:00
Ariadne Conill 214a4c9e6b glitch: reducers: set up correct state for quoting 2022-12-26 01:41:45 +00:00
Ariadne Conill 766a643811 add styles for quote indicator 2022-12-26 01:41:32 +00:00
Ariadne Conill a47d917072 flavors: glitch: add quote handling to status feature 2022-12-26 01:31:57 +00:00
Ariadne Conill c7e00d4c4e flavors: glitch: add quote indicator component 2022-12-26 01:27:58 +00:00
Ariadne Conill 9d4851e3cd glitch: actions: add quoteCompose and cancelQuoteCompose 2022-12-26 01:23:25 +00:00
Ariadne Conill adf1e9fc2e flavors: glitch: action bar: add quote button 2022-12-26 01:15:54 +00:00
Ariadne Conill 08aecd24ba flavors: glitch: show emojified display name in quotes 2022-12-26 00:59:04 +00:00
Ariadne Conill 005256ae8c javascript: glitch: start rendering quotes 2022-12-25 21:11:11 +00:00
Ariadne Conill 5be6a59f80 javascript: glitch: dont render cards if the status has a quote attached 2022-12-25 10:58:25 +00:00
Ariadne Conill 0d3df3e8cf javascript: glitch: pre-process misskey quotes to remove the URL part 2022-12-25 10:46:18 +00:00
Ariadne Conill b36e884cc1 activitypub: note serializer: support _misskey keys 2022-12-25 09:16:44 +00:00
Ariadne Conill 14d001574c activitypub: case transform: support _misskey keys without messing them up 2022-12-25 09:16:44 +00:00
Ariadne Conill 61565488a6 status: support either _misskey_quote or quoteUrl for fetching quotes 2022-12-25 09:16:42 +00:00
Ariadne Conill 36955a7a56 status: prevent recursion when serializing 2022-12-25 04:20:17 +00:00
Ariadne Conill 1cef1eb847 status: disallow quoting of non-public posts 2022-12-25 04:20:16 +00:00
Ariadne Conill 28fb5c8c52 rest: status serializer: include quote data 2022-12-25 03:58:18 +00:00
Ariadne Conill 56d4b04358 views: add quote status html view 2022-12-25 03:58:16 +00:00
Ariadne Conill ee98c0a6f8 services: post status service: add quote_id to status parameters 2022-12-25 03:25:22 +00:00
Ariadne Conill ba965bec3d statuses controller: accept quote_id parameter 2022-12-25 03:25:22 +00:00
Ariadne Conill 968bd6f0ee activitypub: resolve quoted objects when new create activities are received 2022-12-25 03:25:22 +00:00
Ariadne Conill 6b07407820 context helper: add quoteUrl as as:quoteUrl, even though its wrong 2022-12-25 03:25:22 +00:00
Ariadne Conill 0990d5ac75 activitypub: note serializer: begrudgingly serialize quotes using misskey quoteUrl 2022-12-25 03:25:22 +00:00
Ariadne Conill b1bce9d193 models: status: add support for quoting 2022-12-25 03:25:20 +00:00
Ariadne Conill 78e8693388 services: link fetcher: do not fetch links for quotes 2022-12-25 02:00:29 +00:00
Rin aa24b2d072
make glitch style consistent 2022-12-08 18:26:32 +11:00
Rin 0cd76aa22a
make default masto style consistent 2022-12-08 18:24:41 +11:00
Rin 06a2259577
fix default masto style too 2022-12-08 16:58:48 +11:00
Rin 7bf26a1094
fix missing link style in admin.scss - actually this time 2022-12-08 16:31:42 +11:00
Rin d25d8d2c07
fix no-style links in admin panel 2022-11-21 18:34:21 +11:00
kouhai dev b247829276 Merge remote-tracking branch 'glitch/main' 2022-11-15 12:03:46 -08:00
Claire ceafd1f68f
Fix infinite loop when system emoji font is enabled (#1931) 
Fixes #1930
 2022-11-15 00:32:59 +01:00
Claire 8aa56aedfd [Glitch] Fix nodes order being sometimes mangled when rewriting emoji 
Port ccbca50a25 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 22:32:00 +01:00
Claire b5698af25f Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 22:30:30 +01:00
Claire ccbca50a25
Fix nodes order being sometimes mangled when rewriting emoji (#20677) 
* Fix front-end emoji tests

* Fix nodes order being sometimes mangled when rewriting emoji
 2022-11-14 22:14:55 +01:00
Claire 71982e5c83 [Glitch] Fix emoji substitution not applying only to text nodes in Web UI 
Port 625e086996 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:28:22 +01:00
Claire 767630be24 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile`:
  Upstream removed blank lines.
 2022-11-14 20:27:31 +01:00
Claire 71c92d3f56
Fix emoji substitution not applying only to text nodes in backend code (#20641) 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:26:21 +01:00
Claire 625e086996
Fix emoji substitution not applying only to text nodes in Web UI (#20640) 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 20:26:03 +01:00
Claire 96c1ef6d50 [Glitch] Fix media metadata being only editable once 
Port 2d54986a03 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 18:32:33 +01:00
Claire 9ab4e3fc6d Merge branch 'main' into glitch-soc/merge-upstream 2022-11-14 18:31:04 +01:00
Claire 2d54986a03
Fix media metadata being only editable once (#20665) 2022-11-14 17:52:31 +01:00
trwnh c31e756644 [Glitch] Move V2 Filter methods under /api/v2 prefix 
Port b59ce0a60f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:17:59 +01:00
Eugen Rochko 9db90d2ebe [Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI 
Port 6da9df774e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:16:41 +01:00
Samuel Kaiser 9fd866f38e [Glitch] Stick batch table toolbar to the top 
Port e62b514e95 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-14 09:05:56 +01:00
Claire 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
  Upstream change too close to theming-related glitch-soc change.
  Ported upstream changes.
 2022-11-14 08:35:55 +01:00
trwnh b59ce0a60f
Move V2 Filter methods under /api/v2 prefix (#20622) 
* Move V2 Filter methods under /api/v2 prefix

* move over the tests too
 2022-11-14 08:34:07 +01:00
Eugen Rochko 552d69ad96
Fix error when invalid domain name is submitted (#19474) 
Fix #19175
 2022-11-14 08:07:14 +01:00
Eugen Rochko 523e106cbf
Fix style of username in navigation bar above compose form in web UI (#20628) 
Regression from #20540
 2022-11-14 08:06:17 +01:00