36dab188fd
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
7775225d17
[Security] Bump rack from 2.0.5 to 2.0.6 ( #9214 )
...
Bumps [rack](https://github.com/rack/rack ) from 2.0.5 to 2.0.6. **This update includes security fixes.**
- [Release notes](https://github.com/rack/rack/releases )
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rack/rack/compare/2.0.5...2.0.6 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
535ce84896
Bump active_model_serializers from 0.10.7 to 0.10.8 ( #9209 )
...
Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers ) from 0.10.7 to 0.10.8.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases )
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/master/CHANGELOG-0-10.md )
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.7...v0.10.8 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
6a1216d2cd
Temporarily hold timeline if mouse moved recently ( fixes #8630 ) ( #9200 )
...
- On recent mouse movement, hold timeline position so statuses remain in
place for interactions in progress.
- If the timeline had been scrolled to the top before mouse movement,
restore scroll on mouse idle.
6 years ago
cd41c2c6ad
Update resolve_url_service.rb ( #9188 )
6 years ago
4c03e05a4e
Allow joining several hashtags in a single column ( #8904 )
...
* Nascent tag menu on frontend
* Hook up frontend to search
* Tag intersection backend first pass
* Update yarnlock
* WIP
* Fix for tags not searching correctly
* Make radio buttons function
* Simplify radio buttons with modeOption
* Better naming
* Rearrange options
* Add all/any/none functionality on backend
* Small PR cleanup
* Move to service from scope
* Small cleanup, add proper service tests
* Don't use send with user input :D
* Set appropriate column header
* Handle auto updating timeline
* Fix up toggle function
* Use tag value correctly
* A bit more correct to use 'self' rather than 'all' in status scope
* Fix some style issues
* Fix more code style issues
* Style select dropdown more better
* Only use to_id'ed value to ensure no SQL injection
* Revamp frontend to allow for multiple selects
* Update backend / col header to account for more flexible tagging
* Update brakeman ignore
* Codeclimate suggestions
* Fix presenter tag_url
* Implement initial PR feedback
* Handle additional tag streaming
* CodeClimate tweak
6 years ago
bb5558de62
Implement adding a user to a list from their profile ( #9062 )
...
* Add add user to list from thier profile
* Fix listAdderCss
6 years ago
a7e3bd0300
Check for empty "last_status" before sorting DM column ( #9207 )
...
* Check for empty "last_status" before sorting
* Small touchups for codeclimate
6 years ago
d6c7b01d08
fix(reset): Property name for styled scrollbars ( #9210 )
...
https://webplatform.news/issues/2018-10-26
6 years ago
f5ebb739ec
Bump rack-attack from 5.4.1 to 5.4.2 ( #9186 )
...
Bumps [rack-attack](https://github.com/kickstarter/rack-attack ) from 5.4.1 to 5.4.2.
- [Release notes](https://github.com/kickstarter/rack-attack/releases )
- [Changelog](https://github.com/kickstarter/rack-attack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kickstarter/rack-attack/compare/v5.4.1...v5.4.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
87ca51878d
Bump redis from 4.0.2 to 4.0.3 ( #9187 )
...
Bumps [redis](https://github.com/redis/redis-rb ) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/redis/redis-rb/releases )
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/redis-rb/compare/v4.0.2...v4.0.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
34209c0340
Fix timestamp position in public pages with RTL languages
6 years ago
b3c1380980
Fix styling of display names in public pages
6 years ago
a78ec63afa
Merge pull request #803 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes (v2.6.1)
6 years ago
75b48dc177
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2b2facbbdf
[Glitch] Port some of upstream's getting started footer links
6 years ago
ba06a5f485
Bump version to 2.6.1 ( #9172 )
6 years ago
b9d0d209cd
Fix reducer error when conversation has no last status in web UI ( #9173 )
...
Fix #9170
6 years ago
ce2ee68b64
Revert "Fix FetchAtomService content type handling ( #9132 )" ( #9171 )
...
This reverts commit c36a4a1617
6 years ago
50ce347ef9
Bump version to 2.6.0 ( #9149 )
...
* Bump version to 2.6.0
* Update CHANGELOG.md
6 years ago
804586172e
[i18n] Update for Occitan ( #9169 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
* Update simple_form.oc.yml
* Update oc.json
6 years ago
f2290e311b
Remove progress estimate from MigrateAccountConversations ( #9168 )
6 years ago
08c0f8b67c
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
7800e1af7e
Specify node version to not use node11 ( #9166 )
...
uWS has no support node11 yet.
6 years ago
0d6b8f36aa
[Glitch] Fix empty display name precedence over username in web UI
...
Port f59b840549
6 years ago
1c448d6474
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
6 years ago
7e18e95716
Add a local setting for inline preview cards
6 years ago
bdc2338833
Add a “link” status icon for toots with a preview card
6 years ago
b21615e957
[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning
...
Port 9c38c5daa3
6 years ago
ac9780b844
[Glitch] Include preview cards in status entity in REST API
...
Port 795f0107d2
6 years ago
66019b0ec4
Bump version to 2.6.0rc4 ( #9164 )
...
* Bump version to 2.6.0rc4
* Update CHANGELOG.md
6 years ago
f59b840549
Fix empty display name precedence over username in web UI ( #9163 )
...
Fix #9131
6 years ago
cc45a8f9f7
Fix td instead of th in sessions table header ( #9162 )
...
Fix #9130
6 years ago
5c8e7f0e1d
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" ( #9161 )
...
This reverts commit 10680f93e7
6 years ago
c36a4a1617
Fix FetchAtomService content type handling ( #9132 )
...
* Add profile to json+ld in Accept
It's required by the ActivityPub spec
* Use headers['Content-type'] instead of mime_type
mime_type strips the profile from the content type, but it's still available raw in the headers hash
* Add test for ld+json with profile
6 years ago
a3d40ba53b
[i18n] Update for Occitan ( #9157 )
...
* Update oc.json
* Update devise.oc.yml
* Update oc.yml
* Update oc.json
6 years ago
be202f9377
Accept the same payload in multiple inboxes and deliver ( #9150 )
6 years ago
47b8d195e6
Always let through notifications from staff ( #9152 )
...
* Always let through notifications from staff
Follow-up to #8993
* Let messages from staff through, but no other notifications
6 years ago
a03d506626
Fix Pleroma mentions being fetched as preview cards ( #9158 )
6 years ago
c1eec9869e
[Security] Bump loofah from 2.2.2 to 2.2.3 ( #9160 )
...
Bumps [loofah](https://github.com/flavorjones/loofah ) from 2.2.2 to 2.2.3. **This update includes security fixes.**
- [Release notes](https://github.com/flavorjones/loofah/releases )
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md )
- [Commits](https://github.com/flavorjones/loofah/compare/v2.2.2...v2.2.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
7f24242ef6
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
48be335f4f
Remove duplicate and outdated specs
6 years ago
3aa2418217
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port e961a763a2
6 years ago
e32a4f55fe
[Glitch] RTL: fix preferences page checkbox margins
...
Port 5ee0b51ac8
6 years ago
94ad76a5b9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6771e8c88c
Bump oj from 3.6.12 to 3.7.0 ( #9155 )
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.6.12 to 3.7.0.
- [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.6.12...v3.7.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
6 years ago
2cc099c70f
Make detailed-status__wrapper actually wrap detailed status ( #8547 )
...
* Remove class from scrollable div
.detailed-status__wrapper does not actually wrap the detailed status here
* Re-add class to focusable div
.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area
6 years ago
d4415cc316
Bump i18n-tasks from master to 0.9.28 ( #9148 )
6 years ago
e961a763a2
RTL: fix toot privacy preferences radio buttonss ( #9146 )
6 years ago
5ee0b51ac8
RTL: fix preferences page checkbox margins ( #9145 )
...
* RTL: fix preferences page checkbox margins
* Update rtl.scss
6 years ago
Thibaut Girka