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

11215 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sasha Sorokin
67e19f7977 Improve notifications page (#12497) 
Currently notifications page seems a bit cluttered with no clear
separation between e-mail and filtering settings. This commit tries to
address them by adding clear separation with headers, hints and removing
continuously reused texts for events checkboxes.
 2019-11-29 17:03:06 +01:00
ThibG
af891f82be Add hotkey for opening media files (#12498) 
* [WiP] Add hotkey to open media

* Give focus to play/pause button when opening video modal
 2019-11-29 17:02:35 +01:00
ThibG
9b3ebf9166 Fix pending upload count not being decremented on error (#12499) 
The arguments were passed to the wrong function… also, there is no
need to have a conditional decrementation: failure to upload means
we marked an upload as pending, in all cases.
 2019-11-29 17:02:18 +01:00
Eugen Rochko
fcae5c77de Fix n+1 query for bookmarks on statuses (#12494) 2019-11-28 04:08:00 +01:00
Eugen Rochko
5761622a1e Fix proofs API being inaccessible in secure mode (#12495) 2019-11-28 04:07:49 +01:00
Thibaut Girka
510f98c7c2 Link move target account 2019-11-27 17:37:01 +01:00
Thibaut Girka
b78c9e0980 Show acct of target account 2019-11-27 17:37:01 +01:00
Thibaut Girka
5bf65f4e97 Add moved account warning 2019-11-27 17:37:01 +01:00
Thibaut Girka
06e0f3bfb6 Do not consider moved accounts as non-functional 
This might be somewhat controversial, but putting a redirection up
makes the account unusable, which works against use cases such as
using the moved account as backup in case the new one temporarily fails
(sure, the redirection can be temporarily removed, but it is a hassle)
 2019-11-27 17:37:01 +01:00
dependabot-preview[bot]
2337455895 Bump net-ldap from 0.16.1 to 0.16.2 (#12479) 
Bumps [net-ldap](https://github.com/ruby-ldap/ruby-net-ldap) from 0.16.1 to 0.16.2.
- [Release notes](https://github.com/ruby-ldap/ruby-net-ldap/releases)
- [Changelog](https://github.com/ruby-ldap/ruby-net-ldap/blob/master/History.rdoc)
- [Commits](https://github.com/ruby-ldap/ruby-net-ldap/compare/v0.16.1...v0.16.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 21:33:20 +09:00
dependabot-preview[bot]
fa994d78dd Bump parallel from 1.18.0 to 1.19.1 (#12475) 
Bumps [parallel](https://github.com/grosser/parallel) from 1.18.0 to 1.19.1.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](https://github.com/grosser/parallel/compare/v1.18.0...v1.19.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 20:49:19 +09:00
Yamagishi Kazutoshi
4ca914f4c0 Use override_csp options on pghero (#12489) 2019-11-27 05:28:11 +01:00
dependabot-preview[bot]
9c0deae4cc Bump browser from 2.6.1 to 2.7.1 (#12490) 
Bumps [browser](https://github.com/fnando/browser) from 2.6.1 to 2.7.1.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v2.6.1...v2.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 13:19:27 +09:00
dependabot-preview[bot]
61073846e5 Bump @babel/plugin-transform-react-inline-elements from 7.2.0 to 7.7.4 (#12467) 
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 13:13:55 +09:00
dependabot-preview[bot]
e27aa4b00e Bump @babel/preset-env from 7.7.1 to 7.7.4 (#12471) 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.1 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.1...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 12:24:13 +09:00
dependabot-preview[bot]
02ed19848e Bump rack-cors from 1.0.6 to 1.1.0 (#12477) 
Bumps [rack-cors](https://github.com/cyu/rack-cors) from 1.0.6 to 1.1.0.
- [Release notes](https://github.com/cyu/rack-cors/releases)
- [Changelog](https://github.com/cyu/rack-cors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cyu/rack-cors/compare/v1.0.6...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:59:57 +09:00
dependabot-preview[bot]
a2a3f54beb Bump browser from 2.6.1 to 2.7.0 (#12476) 
Bumps [browser](https://github.com/fnando/browser) from 2.6.1 to 2.7.0.
- [Release notes](https://github.com/fnando/browser/releases)
- [Changelog](https://github.com/fnando/browser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/browser/compare/v2.6.1...v2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:54:40 +09:00
dependabot-preview[bot]
b0c9c62954 Bump charlock_holmes from 0.7.6 to 0.7.7 (#12474) 
Bumps [charlock_holmes](https://github.com/brianmario/charlock_holmes) from 0.7.6 to 0.7.7.
- [Release notes](https://github.com/brianmario/charlock_holmes/releases)
- [Commits](https://github.com/brianmario/charlock_holmes/compare/0.7.6...v0.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:53:50 +09:00
dependabot-preview[bot]
275c06cfe7 Bump @babel/plugin-transform-react-jsx-self from 7.2.0 to 7.7.4 (#12466) 
Bumps [@babel/plugin-transform-react-jsx-self](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:36:47 +09:00
dependabot-preview[bot]
a52d7fda37 Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 (#12469) 
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel) from 7.2.0 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.2.0...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:36:29 +09:00
dependabot-preview[bot]
15d5057c88 Bump @babel/runtime from 7.7.2 to 7.7.4 (#12472) 
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.7.2 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.7.4/packages/babel-runtime)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:36:09 +09:00
dependabot-preview[bot]
779e6dd4a2 Bump @babel/plugin-transform-runtime from 7.5.5 to 7.7.4 (#12473) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.5.5 to 7.7.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.5.5...v7.7.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 11:35:39 +09:00
dependabot-preview[bot]
7c78c5142f Bump pghero from 2.3.0 to 2.4.1 (#12478) 
Bumps [pghero](https://github.com/ankane/pghero) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/ankane/pghero/releases)
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v2.3.0...v2.4.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-27 09:03:02 +09:00
ThibG
1fc03686ea Fix empty poll options not being filtered on remote poll update (#12484) 
If a poll contains empty options (which is apparently possible on Pleroma),
it is created without them. However, the poll update code doesn't filter
empty options, and thus:
1. Clear known votes, as it assumes the set of options has changed
2. Errors out because it tries adding empty options, which fails validation

This commit fixes that by filtering them out the same way they are filtered
out at poll creation time.
 2019-11-26 22:46:31 +01:00
ThibG
c872f1cdb6 Fix OCR with delete & redraft (#12465) 2019-11-25 01:42:51 +01:00
ThibG
eb8dd9e094 Revert "Bump tesseract.js from 2.0.0-alpha.16 to 2.0.0-beta.2 (#12311)" (#12454) 
This reverts commit dd1e0c1c31.
 2019-11-24 12:16:41 +09:00
ThibG
ab7d0ff1da Merge pull request #1247 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-11-24 00:36:35 +01:00
ThibG
c3afeaf0fc [Glitch] Fix blur behind closed registration message 
Port SCSS changes from d1eebde0ff to glitch flavour

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-23 19:08:46 +01:00
ThibG
d72c04a88e [Glitch] Change media description label to be context-sensitive 
Port ed940a3a4a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-23 19:07:23 +01:00
Thibaut Girka
5aa79af7cb Merge branch 'master' into glitch-soc/merge-upstream 2019-11-23 19:03:01 +01:00
Dimitri Merejkowsky
b93456fd64 Fix an eslint warning (#12426) 2019-11-22 15:57:22 +01:00
ThibG
d1eebde0ff Fix blur behind closed registration message (#12442) 
* Fix closed registration message blur

* Adjust overlay margins to account for blur

Fixes #12425
 2019-11-22 15:56:59 +01:00
Eugen Rochko
0342c42e05 Fix OEmbed discovery not handling different URL variants in query (#12439) 
Fix #12433
 2019-11-21 19:03:07 +01:00
ThibG
c6c0b30608 Simplify SQL query when performing account search amongst followings (#12302) 2019-11-21 17:35:04 +01:00
ThibG
32ef133fa6 Fix FetchLinkCardServices crashing on a tags without a target (#12159) 
* Add test for links without targets

* Fix FetchLinkCardServices crashing on a tags without a target
 2019-11-21 16:04:52 +01:00
ThibG
ed940a3a4a Change media description label to be context-sensitive (#12270) 
“Describe for the visually impaired” makes no sense when the uploaded media
is an audio file.
 2019-11-21 11:39:07 +01:00
ThibG
27b7ec1043 Change domain block behavior to update user records before deleting data (#12247) 
When suspending or silencing a domain, one probably wants the silence or
suspend parts to take effect as soon as possible. Deleting media files can
take a while (possibly days), so perform silencing as soon as possible, and
clean up media afterwards.
 2019-11-21 11:36:15 +01:00
noiob
0fe0be988e Fix whitelist federation for subdomains (#12435) 2019-11-21 11:35:39 +01:00
ThibG
8e7ffce57d Merge pull request #1246 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-11-21 10:01:26 +01:00
Thibaut Girka
06b56ac4b7 Fix weird edge case in load_schema 2019-11-20 19:19:57 +01:00
Thibaut Girka
8a037844d5 Revert CircleCI and some webpack changes to match upstream 2019-11-20 18:05:24 +01:00
Thibaut Girka
d0be1d0cde Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 17:57:17 +01:00
ThibG
333b93e632 [Glitch] Fix unread toot indicator not honoring onlyMedia in public and community timelines 
Port 6364adba64 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-11-20 17:56:35 +01:00
dependabot-preview[bot]
1346774607 Bump webpacker from 4.0.7 to 4.2.0 (#12416) 
* Bump webpacker from 4.0.7 to 4.2.0

Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.7 to 4.2.0.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.7...v4.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Use NODE_ENV=tests instead of test, to work around async modules not having a chunk
 2019-11-20 17:56:11 +01:00
Thibaut Girka
562534a9d3 Override Migrator.new instead of Migrator#initialize, it's easier to understand 2019-11-20 17:31:22 +01:00
Thibaut Girka
13f738e229 Add documentation about the migration hack 2019-11-20 17:18:00 +01:00
Thibaut Girka
f046c03787 Monkey-patch Rails' migrator to ignore duplicate migrations across Mastodon and glitch-soc 2019-11-20 17:03:25 +01:00
Thibaut Girka
a96375d2ef Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
 2019-11-20 15:36:09 +01:00
Eugen Rochko
c4601b8eb6 Fix account dropdown not opening due to regression from #12377 (#12430) 2019-11-20 00:56:22 +01:00
dependabot-preview[bot]
772f4d649e Bump react-dom from 16.11.0 to 16.12.0 (#12415) 
Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.11.0 to 16.12.0.
- [Release notes](https://github.com/facebook/react/releases)
- [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/react/commits/v16.12.0/packages/react-dom)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-20 05:28:00 +09:00