ThibG
a7415de00d
Fix error when unmuting a domain without listing muted domains first ( #7670 )
2018-05-29 16:25:05 +02:00
ThibG
0345cd5a0f
Fix error when unmuting a domain without listing muted domains first ( #7670 )
2018-05-29 16:25:05 +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
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
c822ecfa01
Merge branch 'master' into glitch-soc/merge-upstream
2018-05-29 13:52:26 +02:00
Thibaut Girka
c087738270
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
abcang
90908fc24b
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
Yamagishi Kazutoshi
13b60e6a14
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
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
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
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
776b996964
Rescue Mastodon::DimensionsValidationError in Remoteable ( #7662 )
...
Fix #7660
2018-05-29 08:39:02 +09:00
Eugen Rochko
e599d7caf2
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
Akihiko Odaki
d95642f6d9
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
takayamaki
03f4c214b4
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
Lynx Kotoura
c0355878ba
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
Eugen Rochko
04a2cf8bcc
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
Shuhei Kitagawa
b0b34a5e38
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
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
adeb99bc8c
Record trending tags from ActivityPub, too ( #7647 )
2018-05-28 12:21:04 +09:00
Eugen Rochko
ab36e0ef72
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
dfbadd6837
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
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
5ad747727f
[Glitch] Replace onScrollToBottom with onLoadMore
...
Port 01d10b0bd8
2018-05-27 20:40:58 +02:00
Thibaut Girka
8b98afa781
[Glitch] Replace onScrollToBottom with onLoadMore
...
Port b0664a5e6c
2018-05-27 20:40:58 +02:00
Thibaut Girka
c7e5a0af57
Do not needlessly refresh pinned toots
...
Port missing part of b29feb5c67
2018-05-27 20:40:58 +02:00
Thibaut Girka
a81ed7b205
Do not needlessly refresh pinned toots
...
Port missing part of 6ae70a92c9
2018-05-27 20:40:58 +02:00
Thibaut Girka
4f2bf28a86
[Glitch] Change icon for domain blocks
...
Port 3774cbce91
2018-05-27 20:40:58 +02:00
Thibaut Girka
60addb14ce
[Glitch] Change icon for domain blocks
...
Port fa04945365
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
2018-05-27 20:39:25 +02:00
Thibaut Girka
b7508940b7
[Glitch] Add option to show only local toots in timeline preview
...
Port missing changes from 4e4f1b0dcb
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
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
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
Thibaut Girka
d959d04133
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
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
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
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
