me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8948 commits 2 branches 0 tags 429 MiB
Commit graph

8948 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
fa1b843522 Fix non-numeric account identifiers leading to /web/accounts/NaN 
I'm not sure what purpose these “+” served?!
 2019-02-22 17:52:21 +01:00
Hinaloe
7517957a91 Randomize emoji filename (#10090) 2019-02-22 16:52:04 +01:00
dependabot[bot]
7b03dd3db9 Bump pry-byebug from 3.6.0 to 3.7.0 (#10098) 
Bumps [pry-byebug](https://github.com/deivid-rodriguez/pry-byebug) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/deivid-rodriguez/pry-byebug/releases)
- [Changelog](https://github.com/deivid-rodriguez/pry-byebug/blob/master/CHANGELOG.md)
- [Commits](https://github.com/deivid-rodriguez/pry-byebug/compare/v3.6.0...v3.7.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-22 20:06:01 +09:00
ThibG
abfa8617f3 Do not error out when performing admin actions on no statuses (#10094) 
Same as #8220 but for reports
 2019-02-21 19:36:48 +01:00
Hinaloe
2ab3932110 correct opt-out showing application (#10086) 
* correct opt-out showing application

refs #9994

* Revert "correct opt-out showing application"

This reverts commit 0e9bb70f145be42962416a6b87c08d59a2896486.

* User#shows_application? calls wrong value
 2019-02-20 17:47:38 +01:00
Daigo 3 Dango
85c9cdaed0 Upgrade Ruby to 2.6.1 (#9956) 2019-02-20 11:57:08 +01:00
dependabot[bot]
98c55a5116 Bump pkg-config from 1.3.3 to 1.3.4 (#10081) 
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.3 to 1.3.4.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases)
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS)
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.3...1.3.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-20 15:56:12 +09:00
dependabot[bot]
ac59623c1c Bump oj from 3.7.8 to 3.7.9 (#10082) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.8 to 3.7.9.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.8...v3.7.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-20 15:55:50 +09:00
ThibG
4b9b5f3bc0 Merge pull request #925 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-19 22:42:22 +01:00
Thibaut Girka
5758ec9aeb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-19 20:18:40 +01:00
ThibG
8a8e476a32 Fix crash when conversations have no valid participants (#10078) 
* Never return empty participants for conversations

Fixes #10068

* Fix client-side crash when conversations have no participants
 2019-02-19 20:00:41 +01:00
ThibG
1533336b98 Fix “reset” button of instance filter switching to custom emoji admin panel (#10076) 2019-02-19 14:01:22 +01:00
Thibaut Girka
8ded9a0c02 [Glitch] Internationalize unexpected error message 
Port e8a1d0b4d4 to glitch-soc,
fixing a crash in the process
 2019-02-18 19:49:06 +01:00
Eugen Rochko
e34c5db19e Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-18 18:16:35 +01:00
ThibG
c0340994a7 Add quick link from admin account view to block/unblock instance (#10073) 2019-02-18 14:59:46 +01:00
ThibG
9b7de13928 Add domain search/filter to the "Federation" (/admin/instances) page (#10071) 2019-02-18 14:59:19 +01:00
ThibG
d94db4536f Hide domain filter in admin page when “local” filter is active (#10074) 
Since the “domain” field is ignored in this case.
 2019-02-18 13:37:13 +01:00
Thibaut Girka
2bf47542f3 Fix video player width not being updated to fit container width 2019-02-18 10:44:37 +01:00
ThibG
eaba640112 Fix video player width not being updated to fit container width (#10069) 2019-02-18 00:10:21 +01:00
Eugen Rochko
db31bef536 Bump version to 2.7.2 (#10067) 2019-02-17 20:24:12 +01:00
ThibG
45768b3b9d Merge pull request #920 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-17 16:00:24 +01:00
Thibaut Girka
561520a2be Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 15:43:12 +01:00
Thibaut Girka
389ca4605e Fix CW fold/unfold in remote interaction dialog 2019-02-17 15:40:49 +01:00
Ben Lubar
9ad1ca9a2b Allow multi-line image descriptions. (Glitch) 2019-02-17 15:19:12 +01:00
Eugen Rochko
6068b479f6 Fix Announce activities of unknown statuses not fetching those statuses (#10065) 
Regression from #9998
 2019-02-17 15:16:36 +01:00
ThibG
c15f676bc9 Merge pull request #918 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-17 15:13:17 +01:00
Thibaut Girka
e8ae6b050b [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 3547e3e59e to glitch-soc
 2019-02-17 14:28:25 +01:00
Thibaut Girka
bb6edcfd1d Fix static error page to use the correct pack 2019-02-17 13:34:40 +01:00
Thibaut Girka
09c6d1c534 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 6534acc019 to glitch-soc
 2019-02-17 12:39:44 +01:00
Thibaut Girka
9b89a7b2f2 Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka
da24c6aced Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
 2019-02-17 12:26:55 +01:00
Eugen Rochko
397f180493 Add logging for rejected ActivityPub payloads and add tests (#10062) 2019-02-17 03:38:25 +01:00
ThibG
3547e3e59e Fix crash on public hashtag pages when streaming fails (#10061) 2019-02-16 14:53:27 +01:00
ThibG
1cbb97ea7f Merge pull request #916 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-16 13:43:23 +01:00
Eugen Rochko
8ff757ed6a Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 
Regression from #9581
 2019-02-16 11:56:09 +01:00
Eugen Rochko
99f902f224 Add vapid_key to the application entity in the REST API (#10058) 
Fix #8785
 2019-02-16 05:27:05 +01:00
Eugen Rochko
c7b6f2f6c6 Add registrations attribute to instance entity in REST API (#10060) 
Fix #9350
 2019-02-16 05:23:47 +01:00
Eugen Rochko
66758328ba Change error graphic to hover-to-play (#10055) 
Fix #6060
 2019-02-15 23:33:25 +01:00
Eugen Rochko
6534acc019 Change buttons on timeline preview to open the interaction dialog (#10054) 
Fix #9922
 2019-02-15 19:43:09 +01:00
Eugen Rochko
85ef358a0a Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
Thibaut Girka
f29b69c08b [Glitch] Fix hashtags select styling in default and high contrast skins 
Port bc9930f59d to glitch-soc
 2019-02-15 18:21:00 +01:00
Eugen Rochko
0230b3c41d Filter incoming Announce activities by relation to local activity (#10041) 
* Filter incoming Announce activities by relation to local activity

Reject if announcer is not followed by local accounts, and is not
from an enabled relay, and the object is not a local status

Follow-up to #10005

* Fix tests
 2019-02-15 18:19:45 +01:00
Eugen Rochko
74d84d2109 Fix color of static page links in high contrast theme (#10028) 2019-02-15 18:10:26 +01:00
Thibaut Girka
c8086b6efb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
Thibaut Girka
dabbbe1e71 [Glitch] Fix occasional crash in detailed toot view 
Port f9a338b473 to glitch-soc
 2019-02-15 17:34:15 +01:00
Eugen Rochko
ce470feefc Fix relay enabling/disabling not resetting inbox availability status (#10048) 
Fix #10033
 2019-02-15 16:08:59 +01:00
Eugen Rochko
4b9df07eac Change conversations to always show names of other participants (#10047) 
Fix #9190
 2019-02-15 16:08:48 +01:00
dependabot[bot]
e45f98c499 Bump better_errors from 2.5.0 to 2.5.1 (#10050) 
Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-02-15 15:38:29 +01:00
rinsuki
1a12ef6099 Fix breaks when opening a reply tree in WebUI (#10046) 
fix #10045
 2019-02-14 17:03:01 +01:00
Eugen Rochko
dae31d8799 Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-14 15:46:42 +01:00