about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-11-06[Glitch] Update reset.scss from upstreamThibaut Girka
2018-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-06[Security] Bump rack from 2.0.5 to 2.0.6 (#9214)dependabot[bot]
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>
2018-11-05Bump active_model_serializers from 0.10.7 to 0.10.8 (#9209)dependabot[bot]
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>
2018-11-05Temporarily hold timeline if mouse moved recently (fixes #8630) (#9200)Les Orchard
- 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.
2018-11-05Update resolve_url_service.rb (#9188)m.b
2018-11-05Allow joining several hashtags in a single column (#8904)James Kiesel
* 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
2018-11-05Implement adding a user to a list from their profile (#9062)namelessGonbai
* Add add user to list from thier profile * Fix listAdderCss
2018-11-05Check for empty "last_status" before sorting DM column (#9207)Steven Tappert
* Check for empty "last_status" before sorting * Small touchups for codeclimate
2018-11-05fix(reset): Property name for styled scrollbars (#9210)Sorin Davidoi
https://webplatform.news/issues/2018-10-26
2018-11-05Bump rack-attack from 5.4.1 to 5.4.2 (#9186)dependabot[bot]
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>
2018-11-03Bump redis from 4.0.2 to 4.0.3 (#9187)dependabot[bot]
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>
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