David Yip
c10df6cf00
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
bbe1731bb0
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
559ce5c098
Adjust spacing between status icons
2018-05-31 21:55:44 -07:00
Spencer Alves
c86cd2041d
Merge branch 'glitch' into thread-icon
2018-05-31 21:33:16 -07:00
Thibaut Girka
93e6984be8
Make active bookmarks red ( fixes #493 )
2018-05-31 14:39:48 +02:00
Thibaut Girka
663c9dcf36
Fix direct timeline
2018-05-31 14:37:13 +02:00
Thibaut Girka
06a6f1759e
[Glitch] Fix low-contrasted cancel button of reply indicator
...
Port 63f6da9a9d
to glitch-soc
2018-05-29 21:25:47 +02:00
Thibaut Girka
febaae28f4
[Glitch] Improve load gap styling in web UI
...
Port 93a1afb66c
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
14961cc8ee
[Glitch] Use randomized setTimeout when fallback-polling and re-add since_id
...
Port 4b5cde3f2d
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
44e534c1a5
[Glitch] Do not crash in getStatusIds when there is a gap in the timeline
...
Port 8ccc863ae8
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
d73c0e14b0
[Glitch] Fix gap insertion for timeline disconnection
...
Port 575c5753e4
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
d7aac92316
[Glitch] Fix ID duplication in timelines
...
Port 33a8c3ab6c
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
27cf820859
[Glitch] Fix comparing id
...
Port 9dff61a5ba
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
54c32199af
[Glitch] Fix LoadMore on account media gallery
...
Port 2111defbbf
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
f4a929a74a
[Glitch] Add missing null handling in notification reducer
...
Port 9487e8a4c0
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
7096611df6
[Glitch] Allow clients to fetch notifications made while they were offline
...
Port 9eaa47845c
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
7a953db0b6
[Glitch] Allow clients to fetch statuses made while they were offline
...
Port 34cb1a5461
to glitch-soc
2018-05-29 21:25:28 +02:00
Thibaut Girka
6a0f32b359
Fix error when unmuting a domain without listing muted domains first
2018-05-29 16:26:39 +02:00
David Yip
88d1061b85
Merge pull request #525 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-29 09:06:00 -05:00
Thibaut Girka
c822ecfa01
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
abcang
f0ee3f8f8a
Fix N+1 on AtomSerializer ( #7669 )
2018-05-29 13:34:02 +02:00
Yamagishi Kazutoshi
7e042c97d1
Use URL polyfill ( #7664 )
2018-05-29 13:33:20 +02:00
Eugen Rochko
744d47dee2
Add GET /api/v2/search which returns rich tag objects, adjust web UI ( #7661 )
2018-05-29 02:01:24 +02:00
Eugen Rochko
bc464619f3
Always display tab navigation on local/federated timeline even when empty ( #7663 )
...
Fix #7659
2018-05-29 02:01:04 +02:00
Eugen Rochko
776b996964
Rescue Mastodon::DimensionsValidationError in Remoteable ( #7662 )
...
Fix #7660
2018-05-29 08:39:02 +09:00
Akihiko Odaki
0cb1524dc1
Cache attachments on external host with service worker ( #7493 )
2018-05-29 00:43:47 +02:00
takayamaki
5a242be7ec
fix: Don't validate MX record in development ( #7654 )
2018-05-28 19:14:24 +02:00
Lynx Kotoura
49ee254971
Fix embed, error and onboarding modals in light theme ( #7656 )
2018-05-28 19:13:20 +02:00
Eugen Rochko
bc64ef560e
Fix incomplete flex style on trends items ( #7655 )
2018-05-28 19:12:53 +02:00
Shuhei Kitagawa
8bf3eb0571
Add a test for emojis_controller ( #7652 )
2018-05-28 22:56:58 +09:00
tateisu
9a4bed4837
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
adeb99bc8c
Record trending tags from ActivityPub, too ( #7647 )
2018-05-28 12:21:04 +09:00
Eugen Rochko
20a23c7d08
Replace recursion in status mapStateToProps ( #7645 )
2018-05-28 02:42:06 +02:00
Eugen Rochko
8a3b9d26fb
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
5ad747727f
[Glitch] Replace onScrollToBottom with onLoadMore
...
Port 01d10b0bd8
to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka
c7e5a0af57
Do not needlessly refresh pinned toots
...
Port missing part of b29feb5c67
to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka
4f2bf28a86
[Glitch] Change icon for domain blocks
...
Port 3774cbce91
to glitch-soc
2018-05-27 20:40:58 +02:00
Thibaut Girka
89f4e0298c
[Glitch] Add option to show only local toots in timeline preview
...
Port missing changes from 6528c0c101
to glitch-soc
2018-05-27 20:39:25 +02:00
Thibaut Girka
b2a316bc16
[Glitch] Use streaming API for standalone timelines on /about and /tag pages
...
Port 895e3c2e6c
to glitch-soc
2018-05-27 20:39:25 +02:00
Thibaut Girka
2a78acb354
Change direct message warning to match upstream
2018-05-27 15:46:00 +02:00
ThibG
d81286f99a
Merge pull request #520 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-05-27 14:24:57 +02:00
Thibaut Girka
3dc4f8e2ca
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
185bc62a15
Implement client-size image resizing from upstream
2018-05-27 11:02:54 +02:00
Thibaut Girka
dc67caa371
Port upstream's result section headers ( fixes #366 )
2018-05-27 11:02:44 +02:00
Eugen Rochko
03c8890e09
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
a48e008c8e
Don't use Object.assign with Notification, only display actions for mentions ( #7632 )
...
Fix #7627
2018-05-27 11:55:19 +09:00
bsky
c72db8ef90
Fix lock icon position in account card ( #7630 )
2018-05-26 15:29:32 +02:00
ThibG
fecc496e34
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
f9a8240394
Fix caret position after inserting suggestions ( fixes #281 )
2018-05-26 12:17:03 +02:00
Thibaut Girka
2e017e752f
Remove unneeded code now that attachment URL isn't appended to toots
2018-05-26 12:17:03 +02:00