about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-03-13Merge pull request #957 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-13[Glitch] Add muted style for polls in web UIEugen Rochko
Port 5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc
2019-03-13[Glitch] Fix public timeline page not paginating correctlyEugen Rochko
Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
2019-03-13[Glitch] Redesign landing pageEugen Rochko
Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
2019-03-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb
2019-03-13Fix `tagged` param not being normalized before querying tags (#10249)Eugen Rochko
2019-03-13Fix to limit to discoverable accounts. (#10253)mayaeh
2019-03-13Bump active_record_query_trace from 1.6.1 to 1.6.2 (#10252)dependabot[bot]
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6.1 to 1.6.2. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6.1...v1.6.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-12Fix poll update handler calling method was that was not available (#10246)Eugen Rochko
* Fix poll update handler calling method was that was not available Fix regression from #10209 * Refactor VoteService * Refactor ActivityPub::DistributePollUpdateWorker and optimize it * Fix typo * Fix typo
2019-03-12Optimize RemoveStatusService by removing n+1 query and using shared inboxes ↵Eugen Rochko
(#10247)
2019-03-12Add muted style for polls in web UI (#10248)Eugen Rochko
2019-03-12Fix public timeline page not paginating correctly (#10245)Eugen Rochko
2019-03-12Redesign landing page (#10232)Eugen Rochko
2019-03-12Bump concurrent-ruby from 1.1.4 to 1.1.5 (#10242)dependabot[bot]
Bumps [concurrent-ruby](https://github.com/ruby-concurrency/concurrent-ruby) from 1.1.4 to 1.1.5. - [Release notes](https://github.com/ruby-concurrency/concurrent-ruby/releases) - [Changelog](https://github.com/ruby-concurrency/concurrent-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/ruby-concurrency/concurrent-ruby/compare/v1.1.4...v1.1.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-11Squish username before validation (#10239)Aurélien Reeves
* Squish username before validation (#10101) Fix #10101 * Move before_validation hook to a private method Also add Unicode wite-spaces to the spec to support the use of squish over strip.
2019-03-11Fix remote interaction dialogs being indexed by search engines (#10240)Eugen Rochko
Fix #10116
2019-03-11Merge pull request #955 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-11Bump aws-sdk-s3 from 1.30.1 to 1.31.0 (#10236)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.30.1 to 1.31.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.30.1...1.31.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-11Remove leftover console.logThibaut Girka
2019-03-11Make clicking on the account and status column headers scroll to topThibaut Girka
2019-03-11Add `tootctl statuses remove` to sweep unreferenced statuses (#10063)Eugen Rochko
Query by @tateisu Fix #1554
2019-03-11Bump pkg-config from 1.3.5 to 1.3.6 (#10235)dependabot[bot]
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.5 to 1.3.6. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.5...1.3.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-11Bump active_record_query_trace from 1.6 to 1.6.1 (#10237)dependabot[bot]
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.6 to 1.6.1. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/master/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.6...v1.6.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-11Increase DNS timeouts (#10238)ThibG
2019-03-11Merge pull request #953 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-11[Glitch] Add support for poll ending notificationsThibaut Girka
Port front-end parts of 3a92885a860df12b12d8356faf179a3fc63be6f2 to glitch-soc
2019-03-11Do not leak instance-local polls to remote followersThibaut Girka
2019-03-11add local setting to auto reveal media behind cwash lea
2019-03-11fix poll fotter layoutKirishima21
画面の幅が充分でないときに 表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.
2019-03-11Fix streaming API always attempting to use SSL with Postgres (#10231)Eugen Rochko
Fix #10223
2019-03-11Avoid race conditions when creating backups (#10234)ThibG
Under load, multiple backups for a single user could be planned, which is very expensive.
2019-03-11Support pushing and receiving updates to poll tallies (#10209)ThibG
* Process incoming poll tallies update * Send Update on poll vote * Do not send Updates for a poll more often than once every 3 minutes * Include voters in people to notify of results update * Schedule closing poll worker on poll creation * Add new notification type for ending polls * Add front-end support for ended poll notifications * Fix UpdatePollSerializer * Fix Updates not being triggered by local votes * Fix tests failure * Fix web push notifications for closing polls * Minor cleanup * Notify voters of both remote and local polls when those close * Fix delivery of poll updates to mentioned accounts and voters
2019-03-10Merge pull request #950 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-10Reject existing Follows when suspending a remote account (#10230)ThibG
* Reject existing Follows when suspending a remote account Partial fix to #10229 * Add tests
2019-03-10Fix SSL configuration regression in streaming API (#10225)Eugen Rochko
* Fix SSL configuration regression in streaming API Fix #10223 * Fix code style issues and integrate #10219 * Fix dumb thing
2019-03-10Add clearer error when/if gpg fails to install (#10228)Armand Fardeau
2019-03-09Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on ↵Aditoo17
another server (#10224)
2019-03-08Merge pull request #947 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-08Fix min/max duration poll limits being invertedThibaut Girka
2019-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-08Fix setting up fields of a previously suspended account (#10222)ThibG
Fix #10177 for real
2019-03-08Re-organize Dockerfile to improve incremental builds. (#10212)Ben Lubar
- Always run apt update before any other apt command. (This fixes incremental builds failing if a remote package is updated.) - Only copy dependency lists before installing dependencies. (This means editing code doesn't force all dependencies to be re-downloaded.) - Delete cache in the same layer that it is created. (Otherwise, deleting cache *increases* the size of the image on non-squashed builds.) - Move the installation of some static dependencies to *before* Mastodon code is imported to Docker.
2019-03-08config: add DB_SSLMODE for managed/remote PG (#10210)Sascha
* config: add DB_SSLMODE for managed/remote PG * streaming: set PG sslmode, defaults to prefer
2019-03-08Bump pkg-config from 1.3.4 to 1.3.5 (#10218)dependabot[bot]
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.4 to 1.3.5. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.4...1.3.5) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-08Merge pull request #945 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-08[Glitch] Fix NaN in Poll componentEugen Rochko
Port 75cb93676b1dd41d3e47f62466c0c6430691a990 to glitch-soc
2019-03-08[Glitch] Fix public timelines being broken by new toots when they are not ↵Eugen Rochko
mounted Port be1c634b2b4372a525d304d2ff830392f04c5cc5 to glitch-soc
generated by cgit-pink (git 2.37.1) at 2024-12-26 02:31:03 +0000