80f89f9cf2
Merge commit '9974163776b3e65e7cfa41e6293876909a1635b7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/admin.html.haml`:
Upstream moved `javascript_pack_tag` calls around, but we don't use them in
the same way in glitch-soc due to the different theming system.
Kept glitch-soc's files unchanged.
1 year ago
406f3942a9
[Glitch] Change opacity of the delete icon in the search field to be more visible
...
Port 9a8190da4a
1 year ago
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
1 year ago
def58f8ac3
[Glitch] Fix some React warnings
...
Port 152b10b624
1 year ago
b6b68b44a1
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
1 year ago
d65aa507ca
Merge commit 'bd023a2637ce4df2102c4f760ca1d05ff2302d9f' into glitch-soc/merge-upstream
1 year ago
bdce78187c
[Glitch] Fix layout of the closed registrations modal
...
Port fe31571965
1 year ago
9b094f3653
[Glitch] Fix profile picture preview
...
Port SCSS changes from bb23116e8d
1 year ago
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
1 year ago
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
1 year ago
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
1 year ago
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
1 year ago
e67c28a5fe
[Glitch] Remove redundant ready() wrapper
...
Port bb51c0676d
1 year ago
7b09f585fa
Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream refactored slightly (but touching almost all the lines in the code),
glitch-soc had moved a few of the code to another file.
Refactored as upstream did.
1 year ago
9974163776
Consolidate inclusion of `admin` js pack link ( #26628 )
1 year ago
e3fd071973
Update dependency rspec-sidekiq to v4 ( #26627 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
8eb09466aa
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 1cb978bcc3
1 year ago
9a8190da4a
Change opacity of the delete icon in the search field to be more visible ( #26449 )
1 year ago
f337008819
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )
1 year ago
b91724fb9d
Add elastic search installation into Vagrantfile ( #26512 )
1 year ago
34f5b90dc7
Update dependency sass to v1.66.1 ( #26534 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
060b554a9d
Update dependency oj to v3.16.0 ( #26520 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
de8c2427a5
Update dependency immutable to v4.3.3 ( #26622 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
613cfd625c
Change hashtag bar tags to be de-emphasized ( #26606 )
1 year ago
152b10b624
Fix some React warnings ( #26609 )
1 year ago
44ba785242
Change the hashtag bar to be hidden when there is a CW and the post is not expanded ( #26615 )
1 year ago
85057865b4
Update Account Search to prioritize username over display name ( #26623 )
1 year ago
3aac12981c
Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough ( #26608 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
cf6f70799b
Add support for federating `memorial` attribute ( #26583 )
1 year ago
ea1a221e2d
Update dependency react-textarea-autosize to v8.5.3 ( #26607 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
74b8b8ea14
Update dependency rails to v7.0.7.2 ( #26612 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
58acaa9ae6
Better hashtag normalization when processing a post ( #26614 )
1 year ago
452f15be78
Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab
1 year ago
c053bfc45a
[Glitch] Fix “legal” report category not showing up in moderation interface
...
Port 0446394465
1 year ago
bd023a2637
Fix admin dashboard check when using Elasticsearch with `ES_PREFIX` ( #26605 )
1 year ago
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
1 year ago
245fe855be
[Glitch] Fix unfollow icon styling in advanced column
...
Port d9c21293aa
1 year ago
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
1 year ago
128daefc7a
Remove leftover `.orig` files that were mistakenly included ( #2379 )
1 year ago
25dc01660d
Add Kalmyk to languages dropdown ( #26013 )
1 year ago
c01ecd0879
Add cherokee to languages dropdown ( #26012 )
1 year ago
dc09c10fa8
Update dependency mime-types to v3.5.1 ( #26595 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
3249c06c73
Update `SECURITY.md` to indicate issues can be reported on Github ( #26599 )
1 year ago
bb2db2aec0
Add `circular-dependency-plugin` to detect any circular deps issues ( #26600 )
1 year ago
4f1d22628d
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 3a8370e1f4
1 year ago
b970ed6098
Update rubocop and rubocop-rspec ( #26329 )
1 year ago
fe31571965
Fix layout of the closed registrations modal ( #26593 )
1 year ago
724d773844
[Glitch] Fix "Create Account" button in interaction modal
...
Port a664e15702
1 year ago
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
1 year ago
facfec1ba3
Bump version to v4.2.0-beta2 ( #26579 )
1 year ago
Claire
Antonin Del Fabbro
Christian Schmidt
Matt Jankowski
renovate[bot]
Daniel M Brasil
jsgoldstein
Renaud Chaput
yufushiro
Robert R George
gunchleoc
Nick Schonning
mogaminsk