Thibaut Girka
de57627588
[Glitch] Remove unused computation of reblog references from updateTimeline
6 years ago
Thibaut Girka
d457964527
[Glitch] Don't remove originals of boosted toots from timeline
...
Port 019c39bf1d
to glitch-soc
6 years ago
Thibaut Girka
1dc409ffa6
Fix drawer waves being displayed in the list editor
6 years ago
Thibaut Girka
e48b428ef3
[Glitch] Implement adding a user to a list from their profile
...
Port bb5558de62
to glitch-soc
6 years ago
Thibaut Girka
235e9b13ff
Fix timestamp position in public pages with RTL languages
6 years ago
Thibaut Girka
080a6cb6f3
Fix styling of display names in public pages
6 years ago
ThibG
960ebc9e36
Merge pull request #803 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes (v2.6.1)
6 years ago
Thibaut Girka
33ad16faa7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
13567f13af
[Glitch] Port some of upstream's getting started footer links
6 years ago
Eugen Rochko
56e256b686
Bump version to 2.6.1 ( #9172 )
6 years ago
Eugen Rochko
083f015f9f
Fix reducer error when conversation has no last status in web UI ( #9173 )
...
Fix #9170
6 years ago
Eugen Rochko
3981da6f90
Revert "Fix FetchAtomService content type handling ( #9132 )" ( #9171 )
...
This reverts commit c20d55f7dd
.
6 years ago
Eugen Rochko
15fd0fb2cf
Bump version to 2.6.0 ( #9149 )
...
* Bump version to 2.6.0
* Update CHANGELOG.md
6 years ago
Quentí
407cab9844
[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
Eugen Rochko
1fad3301a1
Remove progress estimate from MigrateAccountConversations ( #9168 )
6 years ago
ThibG
64fedb341a
Merge pull request #802 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Jeong Arm
24aa422858
Specify node version to not use node11 ( #9166 )
...
uWS has no support node11 yet.
6 years ago
Thibaut Girka
5ad4bcbece
[Glitch] Fix empty display name precedence over username in web UI
...
Port 4084814d8a
to glitch-soc
6 years ago
Thibaut Girka
fd18ed4cea
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
Thibaut Girka
8bef422043
Add a local setting for inline preview cards
6 years ago
Thibaut Girka
4fe81a99c6
Add a “link” status icon for toots with a preview card
6 years ago
Thibaut Girka
7f023b3b98
[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning
...
Port 766a808de4
to glitch-soc
6 years ago
Thibaut Girka
18870c45f1
[Glitch] Include preview cards in status entity in REST API
...
Port cf2ab9c394
to glitch-soc
6 years ago
Eugen Rochko
4c8ac98fa0
Bump version to 2.6.0rc4 ( #9164 )
...
* Bump version to 2.6.0rc4
* Update CHANGELOG.md
6 years ago
Eugen Rochko
4084814d8a
Fix empty display name precedence over username in web UI ( #9163 )
...
Fix #9131
6 years ago
Eugen Rochko
e242688a74
Fix td instead of th in sessions table header ( #9162 )
...
Fix #9130
6 years ago
Eugen Rochko
ca87d98d16
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" ( #9161 )
...
This reverts commit 0c756cfd54
.
6 years ago
valerauko
c20d55f7dd
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
Quentí
a43fdd72ba
[i18n] Update for Occitan ( #9157 )
...
* Update oc.json
* Update devise.oc.yml
* Update oc.yml
* Update oc.json
6 years ago
Eugen Rochko
d84886f35e
Accept the same payload in multiple inboxes and deliver ( #9150 )
6 years ago
Eugen Rochko
c15b8ee75b
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
ThibG
cfe92b50bb
Fix Pleroma mentions being fetched as preview cards ( #9158 )
6 years ago
dependabot[bot]
4d5a219013
[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
ThibG
a22e278344
Merge pull request #801 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
d004994787
Remove duplicate and outdated specs
6 years ago
Masoud Abkenar
bdcdc35df7
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port 27b5a57f6d
to glitch-soc
6 years ago
Masoud Abkenar
cecd8b25c4
[Glitch] RTL: fix preferences page checkbox margins
...
Port 4e034437e3
to glitch-soc
6 years ago
Thibaut Girka
7406141a71
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
dependabot[bot]
8633ac4b68
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
trwnh
fcd79aba0b
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
Eugen Rochko
bd79977354
Bump i18n-tasks from master to 0.9.28 ( #9148 )
6 years ago
Masoud Abkenar
27b5a57f6d
RTL: fix toot privacy preferences radio buttonss ( #9146 )
6 years ago
Masoud Abkenar
4e034437e3
RTL: fix preferences page checkbox margins ( #9145 )
...
* RTL: fix preferences page checkbox margins
* Update rtl.scss
6 years ago
ThibG
1cbcb09d67
Do not hide boost notifications from followed people with hidden boosts ( #9147 )
...
* Do not hide boost notifications from followed people with hidden boosts
Not displaying boosts from a followed user in the Home timeline and not
having notifications when they reblog your own content are two very
separate concerns, tying them together seem counter-intuitive and unwanted.
* Update specs accordingly
6 years ago
ash lea
5fbafbb54d
move some constants to rails environment
6 years ago
ThibG
42ee366e8e
Merge pull request #798 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
915a202260
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
e6c91483fb
Bump version to 2.6.0rc3 ( #9142 )
...
* Bump version to 2.6.0rc3
* Update CHANGELOG.md
6 years ago
Thibaut Girka
bc97c2ab8a
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
9795dc5509
Update AUTHORS.md ( #9141 )
6 years ago