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

39662 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thibaut Girka
896beb16c5 [Glitch] Internationalize unexpected error message 
Port 4e71b104e6 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
Eugen Rochko
be9352266c 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
3a8cb6c737 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
6840a77711 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
ThibG
2f7f6af26a 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
Thibaut Girka
d974988541 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
ThibG
d1d7d14f77 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
Eugen Rochko
7853be1f06
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
ThibG
1aa87a1967
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
f6a4493a58 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
Thibaut Girka
ec18359c3d 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
Ben Lubar
fa9635c741 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
Eugen Rochko
1a1b8170bb
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
ThibG
a2b4b82f0f
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
e31fc2b458 [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 041ff5fa9a 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
cac75e01b8 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
91c9cb6022 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 71e28ba399 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
9a47f2cbdf 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
Thibaut Girka
369a475a70 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
Eugen Rochko
147b4c2c3a
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
041ff5fa9a 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
ThibG
ab9082b332
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
ea7ad59af2
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
cc84a407f4
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
a006d4afbe
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