about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-10-31Fix timestamp position in public pages with RTL languagesThibaut Girka
2018-10-31Fix styling of display names in public pagesThibaut Girka
2018-10-31Merge pull request #803 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes (v2.6.1)
2018-10-31Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-31[Glitch] Port some of upstream's getting started footer linksThibaut Girka
2018-10-31Bump version to 2.6.1 (#9172)Eugen Rochko
2018-10-31Fix reducer error when conversation has no last status in web UI (#9173)Eugen Rochko
Fix #9170
2018-10-31Revert "Fix FetchAtomService content type handling (#9132)" (#9171)Eugen Rochko
This reverts commit c36a4a16178441968715e13c77859b1eb813c2af.
2018-10-30Bump version to 2.6.0 (#9149)Eugen Rochko
* Bump version to 2.6.0 * Update CHANGELOG.md
2018-10-30[i18n] Update for Occitan (#9169)Quentí
* Update oc.json * Update oc.yml * Update simple_form.oc.yml * Update simple_form.oc.yml * Update oc.json
2018-10-30Remove progress estimate from MigrateAccountConversations (#9168)Eugen Rochko
2018-10-30Merge pull request #802 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-30Specify node version to not use node11 (#9166)Jeong Arm
uWS has no support node11 yet.
2018-10-30[Glitch] Fix empty display name precedence over username in web UIThibaut Girka
Port f59b840549d1b4dfd02ae4f52b64149ff8de0165 to glitch-soc
2018-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
2018-10-30Add a local setting for inline preview cardsThibaut Girka
2018-10-30Add a “link” status icon for toots with a preview cardThibaut Girka
2018-10-30[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warningThibaut Girka
Port 9c38c5daa3d7298f02c763a84a74680dcc89dac2 to glitch-soc
2018-10-30[Glitch] Include preview cards in status entity in REST APIThibaut Girka
Port 795f0107d23c1c9bd039f6449fa1e094ab7653a7 to glitch-soc
2018-10-30Bump version to 2.6.0rc4 (#9164)Eugen Rochko
* Bump version to 2.6.0rc4 * Update CHANGELOG.md
2018-10-30Fix empty display name precedence over username in web UI (#9163)Eugen Rochko
Fix #9131
2018-10-30Fix td instead of th in sessions table header (#9162)Eugen Rochko
Fix #9130
2018-10-30Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out ↵Eugen Rochko
(8627)" (#9161) This reverts commit 10680f93e7d6333d43aabc4c6f251a076120231c.
2018-10-30Fix FetchAtomService content type handling (#9132)valerauko
* 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
2018-10-30[i18n] Update for Occitan (#9157)Quentí
* Update oc.json * Update devise.oc.yml * Update oc.yml * Update oc.json
2018-10-30Accept the same payload in multiple inboxes and deliver (#9150)Eugen Rochko
2018-10-30Always let through notifications from staff (#9152)Eugen Rochko
* Always let through notifications from staff Follow-up to #8993 * Let messages from staff through, but no other notifications
2018-10-30Fix Pleroma mentions being fetched as preview cards (#9158)ThibG
2018-10-30[Security] Bump loofah from 2.2.2 to 2.2.3 (#9160)dependabot[bot]
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>
2018-10-30Merge pull request #801 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-30Remove duplicate and outdated specsThibaut Girka
2018-10-30[Glitch] RTL: fix toot privacy preferences radio buttonssMasoud Abkenar
Port e961a763a2cf722bd5f1311a2de706e28d6c33c6 to glitch-soc
2018-10-30[Glitch] RTL: fix preferences page checkbox marginsMasoud Abkenar
Port 5ee0b51ac8363da1687cc518e80eac53c23b048a to glitch-soc
2018-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-30Bump oj from 3.6.12 to 3.7.0 (#9155)dependabot[bot]
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>
2018-10-30Make detailed-status__wrapper actually wrap detailed status (#8547)trwnh
* 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
2018-10-30Bump i18n-tasks from master to 0.9.28 (#9148)Eugen Rochko
2018-10-30RTL: fix toot privacy preferences radio buttonss (#9146)Masoud Abkenar
2018-10-30RTL: fix preferences page checkbox margins (#9145)Masoud Abkenar
* RTL: fix preferences page checkbox margins * Update rtl.scss
2018-10-30Do not hide boost notifications from followed people with hidden boosts (#9147)ThibG
* 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
2018-10-29move some constants to rails environmentash lea
2018-10-29Merge pull request #798 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Bump version to 2.6.0rc3 (#9142)Eugen Rochko
* Bump version to 2.6.0rc3 * Update CHANGELOG.md
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Update AUTHORS.md (#9141)Eugen Rochko
2018-10-29Bump sanitize from 4.6.6 to 5.0.0 (#9140)Eugen Rochko
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
2018-10-29Update i18n-tasks to master (#9139)Eugen Rochko
2018-10-29Improved grammar in German translation (#9092)Julian
Just a grammar improvement.
generated by cgit-pink (git 2.37.1) at 2024-11-28 11:14:57 +0000