mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 06:06:22 +01:00
Code Issues Projects Releases Wiki Activity
9,848 Commits 135 Branches 269 Tags 886 MiB
19c3a941e8
Commit Graph

6865 Commits

Author SHA1 Message Date
Lady Lumb
0ed0c77266 Add env variable to control search limit 
Changed the default search limit to allow a variable called MAX_SEARCH_RESULTS in the .env.production file to change the maximum search results limit.
 2019-07-20 16:39:48 +02:00
Thibaut Girka
249b7c7c12 Fix filtering behaviors 2019-07-19 19:21:20 +02:00
Thibaut Girka
f170e0492f Fix timestamp display in boost/fav modals in RTL locales 2019-07-18 20:56:20 +02:00
Thibaut Girka
4c28511e4e Fixups 2019-07-18 20:56:20 +02:00
Thibaut Girka
45cee95b14 Public pages RTL fixes 2019-07-18 20:56:20 +02:00
Thibaut Girka
c1752b238f Unfiy status__prepend with upstream 2019-07-18 20:56:20 +02:00
Thibaut Girka
b021efdefe RTL fixes 2019-07-18 20:56:20 +02:00
Thibaut Girka
964c78c118 Fix some SCSS for RTL behavior 2019-07-18 20:56:20 +02:00
Thibaut Girka
4199f7fd87 Minor fixup 2019-07-18 20:56:20 +02:00
Eugen Rochko
b743308928 [Glitch] Fix RTL layout of status display names 
Port d723f2a0a8 to glitch-soc
 2019-07-18 20:56:20 +02:00
Masoud Abkenar
bcaea5a9e9 [Glitch] RTL: fix settings button margins in column headers 
Port ef11347281 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-18 20:56:20 +02:00
Thibaut Girka
fabfa90e6c Make width breakpoint for removing margins consistent and match upstream 
Fixes #1136
 2019-07-18 20:55:38 +02:00
Thibaut Girka
6ff285d948 Fix *another* typo and crash in StatusIcons 2019-07-18 09:54:59 +02:00
Thibaut Girka
a2df11ebaf Fix typo and crash in StatusIcons 2019-07-18 09:42:22 +02:00
Thibaut Girka
46687a3cbd Shorten status icon tooltip text 2019-07-17 21:35:34 +02:00
Thibaut Girka
572009cf56 Add status icon for local-only toots 2019-07-17 21:35:34 +02:00
Thibaut Girka
7db7cb31b1 Add tooltips to status icons 2019-07-17 21:35:34 +02:00
Eugen Rochko
e91bf82083 [Glitch] Add option to disable real-time updates in web UI 
Port 729723f857 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-07-16 16:51:08 +02:00
Eugen Rochko
729723f857 Add option to disable real-time updates in web UI (#9984) 
Fix #9031
Fix #7913
 2019-07-16 16:11:50 +02:00
han@highemelry
0442fcdbc8 Change the retry limit in error of web push notification (#11292) 
- Change the maximum count of retry for web push notification (Default -> 5).
   - In case of high load of subscribe server, the retries will be repeated many times.
   - Because the retries occupy the default queue, maximum retry count should be reduced.
 2019-07-15 00:48:50 +02:00
ThibG
99c1f0811b Fix BlockService trying to reject incorrect follow request (#11288) 
Fixes #11148
 2019-07-15 00:48:50 +02:00
ThibG
9f67e3b9cc Fix Status.remote scope matching *all* statuses (#11265) 2019-07-15 00:48:50 +02:00
ThibG
bd77fd6ff3 Fix BackupService crashing when an attachment is missing (#11241) 
* Fix BackupService crashing when an attachment is missing

For various reasons such as admin error or out-of-sync media and
database backups, it might be possible for local attachments to be lost.

This commit allows the BackupService to continue its work even if some media
file is missing.

* Change error message
 2019-07-15 00:48:49 +02:00
Thibaut Girka
1b074d2a50 Add link to edit each listed filter 2019-07-15 00:48:28 +02:00
Thibaut Girka
f7fa11c4cd Make some strings translatable 2019-07-15 00:48:28 +02:00
Thibaut Girka
fc8577cf2b Minor refactoring 2019-07-15 00:48:28 +02:00
Thibaut Girka
707b8d7d75 Move the “Show why” button inline 2019-07-15 00:48:28 +02:00
Thibaut Girka
85f3bc1ab3 Implement feature to add filtered phrases to content warnings 2019-07-15 00:48:28 +02:00
Thibaut Girka
42b59b730b Implement option to completely hide filtered toots 2019-07-15 00:48:28 +02:00
Thibaut Girka
16b79a6237 Add options to configure filtering behavior 2019-07-15 00:48:28 +02:00
Thibaut Girka
bde7a415b9 Add a way to know why a status has been filtered, and show it anyway 2019-07-15 00:48:28 +02:00
Thibaut Girka
e9fac2def9 Do not keep polls pre-filled in thread mode 2019-07-15 00:41:09 +02:00
Thibaut Girka
e0bfa685c6 Fix error boundary CSS 2019-07-15 00:28:31 +02:00
Thibaut Girka
0baaee495f Fix report dialog crashing when a toot gets deleted 
Fixes #1155
 2019-07-10 19:53:31 +02:00
ThibG
fce885f271
Merge pull request #1152 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-07 22:26:10 +02:00
ThibG
64f3bc77ac [Glitch] Only scroll to the compose form if it's not horizontally in the viewport 
Port c07cca4727 to glitch-soc
 2019-07-07 14:03:12 +02:00
ThibG
a0b614f10a Fix support for HTTP proxies (#11245) 
* Disable incorrect check for hidden services in Socket

Hidden services can only be accessed with an HTTP proxy, in which
case the host seen by the Socket class will be the proxy, not the
target host.

Hidden services are already filtered in `Request#initialize`.

* Use our Socket class to connect to HTTP proxies

Avoid the timeout logic being bypassed

* Add support for IP addresses in Request::Socket

* Refactor a bit, no need to keep the DNS resolver around
 2019-07-07 13:53:09 +02:00
Thibaut Girka
7039dca12c Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream 
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
 2019-07-07 13:49:31 +02:00
ThibG
c07cca4727 Only scroll to the compose form if it's not horizontally in the viewport (#11246) 
Avoids jumping the scroll around vertically when giving it focus and
editing long toots.
 2019-07-06 18:18:08 +02:00
Eugen Rochko
ae003d54f9
Fix option to send e-mail notification about account action always being true (#11242) 2019-07-06 13:54:32 +02:00
ThibG
ed544f3166 Fix HTTP requests to IPv6 hosts (#11240) 2019-07-05 22:03:00 +02:00
Thibaut Girka
e5f4d83e60 Allow serializing local-only toots in backup service 
Fixes #1153
 2019-07-05 21:50:19 +02:00
Eugen Rochko
0c1b1069c9
Remove deprecated REST API GET /api/v1/statuses/:id/card (#11213) 2019-07-05 02:15:24 +02:00
Eugen Rochko
3fd6ab99e6
Remove deprecated REST API GET /api/v1/timelines/direct (#11212) 2019-07-05 02:14:56 +02:00
ThibG
47c30be8d8 [Glitch] Memoize ancestorIds and descendantIds in detailed status view 
Port 99924f282f to glitch-soc
 2019-07-04 16:26:17 +02:00
ThibG
894d82a325 [Glitch] When deleting & redrafting a poll, fill in closest expires_in 
Port dc88d226e1 to glitch-soc
 2019-07-04 16:24:48 +02:00
Thibaut Girka
6ab84c12a7 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-04 16:21:39 +02:00
ThibG
99924f282f Memoize ancestorIds and descendantIds in detailed status view (#11234) 2019-07-02 16:03:54 +02:00
Eugen Rochko
1a747f7020
Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230) 2019-07-02 01:01:17 +02:00
Eugen Rochko
bc60d794f8
Change ActivityPub::DeliveryWorker to not retry HTTP 501 errors (#11233) 2019-07-02 00:59:53 +02:00