3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,733 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

6733 Commits (9ad5de8a3a5a14760f83f3d0f95eddca1fc4b106)

Author SHA1 Message Date
David Yip 9ad5de8a3a
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks 
Make active bookmarks red (fixes #493)
 2018-06-01 00:36:48 -05:00
David Yip 0aba716fe1
Merge pull request #471 from impiaaa/thread-icon 
Add an extra icon to indicate that a status is part of a conversation
 2018-06-01 00:35:13 -05:00
Spencer Alves e5f25a73f2 Adjust spacing between status icons 2018-05-31 21:55:44 -07:00
Spencer Alves 7d2e6429c2 Merge branch 'glitch' into thread-icon 2018-05-31 21:33:16 -07:00
Thibaut Girka b9fdeceb3c Make active bookmarks red (fixes #493) 2018-05-31 14:39:48 +02:00
Thibaut Girka e396fbfe3b Fix direct timeline 2018-05-31 14:37:13 +02:00
Thibaut Girka e7b3a4263e [Glitch] Fix low-contrasted cancel button of reply indicator 
Port 86efccce2a to glitch-soc
 2018-05-29 21:25:47 +02:00
Thibaut Girka 08dbe29e29 [Glitch] Improve load gap styling in web UI 
Port 45c9f16f71 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka cc589d6ec0 [Glitch] Use randomized setTimeout when fallback-polling and re-add since_id 
Port dafd7afc5e to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka fbc25bdd2d [Glitch] Do not crash in getStatusIds when there is a gap in the timeline 
Port b1938d7853 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 5cc4d34250 [Glitch] Fix gap insertion for timeline disconnection 
Port 66359ec522 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 15bef77add [Glitch] Fix ID duplication in timelines 
Port 306267dbd2 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 4b38ac3bed [Glitch] Fix comparing id 
Port 0ba49eca8b to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 6020a21130 [Glitch] Fix LoadMore on account media gallery 
Port 3523aa440b to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 5d16fd3f28 [Glitch] Add missing null handling in notification reducer 
Port 2f3ac14a43 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 4eba8c50c3 [Glitch] Allow clients to fetch notifications made while they were offline 
Port cbf97c03bb to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 0ad3eedd4c [Glitch] Allow clients to fetch statuses made while they were offline 
Port 9a1a55ce52 to glitch-soc
 2018-05-29 21:25:28 +02:00
Thibaut Girka 532fb8e215 Fix error when unmuting a domain without listing muted domains first 2018-05-29 16:26:39 +02:00
David Yip 6a1544bd46
Merge pull request #525 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-05-29 09:06:00 -05:00
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream 2018-05-29 13:52:26 +02:00
abcang 90908fc24b Fix N+1 on AtomSerializer (#7669) 2018-05-29 13:34:02 +02:00
Yamagishi Kazutoshi 13b60e6a14 Use URL polyfill (#7664) 2018-05-29 13:33:20 +02:00
Eugen Rochko 8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661) 2018-05-29 02:01:24 +02:00
Eugen Rochko 90b64c0069
Always display tab navigation on local/federated timeline even when empty (#7663) 
Fix #7659
 2018-05-29 02:01:04 +02:00
Eugen Rochko e599d7caf2 Rescue Mastodon::DimensionsValidationError in Remoteable (#7662) 
Fix #7660
 2018-05-29 08:39:02 +09:00
Akihiko Odaki d95642f6d9 Cache attachments on external host with service worker (#7493) 2018-05-29 00:43:47 +02:00
takayamaki 03f4c214b4 fix: Don't validate MX record in development (#7654) 2018-05-28 19:14:24 +02:00
Lynx Kotoura c0355878ba Fix embed, error and onboarding modals in light theme (#7656) 2018-05-28 19:13:20 +02:00
Eugen Rochko 04a2cf8bcc
Fix incomplete flex style on trends items (#7655) 2018-05-28 19:12:53 +02:00
Shuhei Kitagawa b0b34a5e38 Add a test for emojis_controller (#7652) 2018-05-28 22:56:58 +09:00
tateisu b87a1229c7 optimize direct timeline (#7614) 
* optimize direct timeline

* fix typo in class name

* change filter condition for direct timeline

* fix codestyle issue

* revoke index_accounts_not_silenced because direct timeline does not use it.

* revoke index_accounts_not_silenced because direct timeline does not use it.

* fix rspec test condition.

* fix rspec test condition.

* fix rspec test condition.

* revoke adding column and partial index

* (direct timeline) move merging logic to model

* fix pagination parameter

* add method arguments that switches return array of status or cache_ids

* fix order by

* returns ActiveRecord.Relation in default behavor

* fix codestyle issue
 2018-05-28 11:04:06 +02:00
Eugen Rochko ab36e0ef72 Record trending tags from ActivityPub, too (#7647) 2018-05-28 12:21:04 +09:00
Eugen Rochko dfbadd6837
Replace recursion in status mapStateToProps (#7645) 2018-05-28 02:42:06 +02:00
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638) 
* Track trending tags

- Half-life of 1 day
- Historical usage in daily buckets (last 7 days stored)
- GET /api/v1/trends

Fix #271

* Add trends to web UI

* Don't render compose form on search route, adjust search results header

* Disqualify tag from trends if it's in disallowed hashtags setting

* Count distinct accounts using tag, ignore silenced accounts
 2018-05-27 21:45:30 +02:00
Thibaut Girka 8b98afa781 [Glitch] Replace onScrollToBottom with onLoadMore 
Port b0664a5e6c to glitch-soc
 2018-05-27 20:40:58 +02:00
Thibaut Girka a81ed7b205 Do not needlessly refresh pinned toots 
Port missing part of 6ae70a92c9 to glitch-soc
 2018-05-27 20:40:58 +02:00
Thibaut Girka 60addb14ce [Glitch] Change icon for domain blocks 
Port fa04945365 to glitch-soc
 2018-05-27 20:40:58 +02:00
Thibaut Girka b7508940b7 [Glitch] Add option to show only local toots in timeline preview 
Port missing changes from 4e4f1b0dcb to glitch-soc
 2018-05-27 20:39:25 +02:00
Thibaut Girka 1fa3586db5 [Glitch] Use streaming API for standalone timelines on /about and /tag pages 
Port 0128b86d30 to glitch-soc
 2018-05-27 20:39:25 +02:00
Thibaut Girka d959d04133 Change direct message warning to match upstream 2018-05-27 15:46:00 +02:00
ThibG 458ec31791
Merge pull request #520 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-05-27 14:24:57 +02:00
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/locales/ca.yml
	config/locales/nl.yml
	config/locales/oc.yml
	config/locales/pt-BR.yml

Resolved conflicts by removing upstream-specific changes
 2018-05-27 13:20:15 +02:00
Thibaut Girka c2e528916c Implement client-size image resizing from upstream 2018-05-27 11:02:54 +02:00
Thibaut Girka d253449ff0 Port upstream's result section headers (fixes #366) 2018-05-27 11:02:44 +02:00
Eugen Rochko 63c7b91572 Validate that e-mail resolves with MX and it's not blacklisted (#7631) 
Original patch by @j-a4
 2018-05-27 11:58:08 +09:00
Eugen Rochko 182bdbc5f4 Don't use Object.assign with Notification, only display actions for mentions (#7632) 
Fix #7627
 2018-05-27 11:55:19 +09:00
bsky 422f92f3f8 Fix lock icon position in account card (#7630) 2018-05-26 15:29:32 +02:00
ThibG 22bc07998c
Merge pull request #508 from ThibG/glitch-soc/fixes/remove-leftover-from-attachment-url-insertion 
Fix caret position after inserting suggestions
 2018-05-26 13:22:49 +02:00
Thibaut Girka 18d9a7fd71 Fix caret position after inserting suggestions (fixes #281) 2018-05-26 12:17:03 +02:00
Thibaut Girka d8793e1bee Remove unneeded code now that attachment URL isn't appended to toots 2018-05-26 12:17:03 +02:00