about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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
2019-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-08Do not allow adding votes to expired polls (#10214)ThibG
* Do not allow adding votes to expired polls * Only validate expires_at on create
2019-03-07Immediately display poll results to poll author (#10187)Eugen Rochko
* Immediately display poll results to poll author * Refactor Poll#loaded_options and add Poll#voted? to improve DRYness
2019-03-07Fix NaN in Poll component (#10213)Eugen Rochko
2019-03-07Fix public timelines being broken by new toots when they are not mounted ↵Eugen Rochko
(#10131)
2019-03-07Handle StaleObjectError when retrieving polls (#10208)ThibG
2019-03-07Merge pull request #944 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-07Bump webpush from 0.3.6 to 0.3.7 (#10205)dependabot[bot]
Bumps [webpush](https://github.com/zaru/webpush) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/zaru/webpush/releases) - [Changelog](https://github.com/zaru/webpush/blob/master/CHANGELOG.md) - [Commits](https://github.com/zaru/webpush/compare/v0.3.6...v0.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-07i18n:🇵🇱 (#10199)marcin mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07Avoid unnecessarily fetching the replies collection when it is empty (#10201)ThibG
2019-03-07Fix AddLockVersionToPolls migration (#10200)ThibG
2019-03-07Fix #10202 (#10203)rinsuki
2019-03-06Allow setting whether this is a single choice poll or multiple choices oneThibaut Girka
2019-03-06Disable file upload when there is a pollThibaut Girka
2019-03-06Use server-provided poll limits instead of hardcoded onesThibaut Girka
Also does not enable polls if no limits are provided by the server
2019-03-06Serialize poll limits in instance serializer and initial stateThibaut Girka
2019-03-06[Glitch] Port polls creation UI from upstreamThibaut Girka
2019-03-06Fix AddLockVersionToPolls migrationThibaut Girka
2019-03-06Merge pull request #942 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-06[Glitch] Disable the underlying button element when an ItemButton is disabledThibG
Port b3668a79eca2d185ea57a9ffc2fa012db52e49f0 to glitch-soc
2019-03-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-06Add optimistic lock to avoid race conditions when handling votes (#10196)ThibG
* Add optimistic lock to avoid race conditions when handling votes * Force-reload polls when getting `ActiveRecord::StaleObjectError`
2019-03-06Disable the underlying button element when an ItemButton is disabled (#10194)ThibG
Fixes #10191
2019-03-06Disable file upload when there is a poll (#10195)ThibG
2019-03-06Add an icon to highlight polls behind a Content WarningThibaut Girka
2019-03-06Merge pull request #939 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-06Fix poll options not rendering text after vote/refreshEugen Rochko
Port fd128b9c7aa5c71adbfc2e223212514c0baee675 to glitch-soc
2019-03-06Avoid line breaks in poll optionsEugen Rochko
Port 57643557b64bc1853c4aeb65fc652dac3467fa18 to glitch-soc
2019-03-06Render unicode emoji in polls using emoji packEugen Rochko
Port 4407f07014096bcbaf5a06015a5791984282846d to glitch-soc
2019-03-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-06Bump active_record_query_trace from 1.5.4 to 1.6 (#10192)dependabot[bot]
Bumps [active_record_query_trace](https://github.com/brunofacca/active-record-query-trace) from 1.5.4 to 1.6. - [Release notes](https://github.com/brunofacca/active-record-query-trace/releases) - [Changelog](https://github.com/brunofacca/active-record-query-trace/blob/v1.6/HISTORY.md) - [Commits](https://github.com/brunofacca/active-record-query-trace/compare/v1.5.4...v1.6) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-06Fix poll options not rendering text after vote/refresh (#10189)Eugen Rochko
* Fix poll options not rendering text after vote/refresh * Fix poll options not showing up on public pages * Fix code style issue
2019-03-06Avoid line breaks in poll options (#10188)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-06 20:52:36 +0000