Kirishima21
2172dec88d
fix poll fotter layout
...
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
2019-03-11 12:09:30 +01:00
ThibG
dc285ec4ca
Merge pull request #950 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-10 20:43:54 +01:00
Thibaut Girka
88d4b28714
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-10 16:48:44 +01:00
ThibG
05aa8b9303
Reject existing Follows when suspending a remote account ( #10230 )
...
* Reject existing Follows when suspending a remote account
Partial fix to #10229
* Add tests
2019-03-10 16:18:58 +01:00
Eugen Rochko
d182fec01a
Fix SSL configuration regression in streaming API ( #10225 )
...
* Fix SSL configuration regression in streaming API
Fix #10223
* Fix code style issues and integrate #10219
* Fix dumb thing
2019-03-10 16:00:54 +01:00
Armand Fardeau
31c7cd0942
Add clearer error when/if gpg fails to install ( #10228 )
2019-03-10 16:00:22 +01:00
Aditoo17
caa40e9d9b
Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server ( #10224 )
2019-03-09 17:07:59 +01:00
ThibG
dad42ecee0
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 20:43:51 +01:00
Thibaut Girka
96e7f430de
Fix min/max duration poll limits being inverted
2019-03-08 20:43:18 +01:00
Thibaut Girka
bed7758022
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 20:15:57 +01:00
ThibG
32f0cc5ccd
Fix setting up fields of a previously suspended account ( #10222 )
...
Fix #10177 for real
2019-03-08 19:59:08 +01:00
Ben Lubar
f461d0a193
Re-organize Dockerfile to improve incremental builds. ( #10212 )
...
- 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-08 16:12:48 +01:00
Sascha
291fbe21c2
config: add DB_SSLMODE for managed/remote PG ( #10210 )
...
* config: add DB_SSLMODE for managed/remote PG
* streaming: set PG sslmode, defaults to prefer
2019-03-08 14:36:28 +01:00
dependabot[bot]
51faba7b59
Bump pkg-config from 1.3.4 to 1.3.5 ( #10218 )
...
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-08 19:16:55 +09:00
ThibG
5baae3d9c0
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-08 01:47:36 +01:00
Eugen Rochko
b9a799c343
[Glitch] Fix NaN in Poll component
...
Port 19cccea89a
to glitch-soc
2019-03-08 01:01:19 +01:00
Eugen Rochko
7565b8afa3
[Glitch] Fix public timelines being broken by new toots when they are not mounted
...
Port 8e9db67a6a
to glitch-soc
2019-03-08 01:00:14 +01:00
Thibaut Girka
9b093dfcde
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-08 00:57:13 +01:00
ThibG
dcbe6c16ba
Do not allow adding votes to expired polls ( #10214 )
...
* Do not allow adding votes to expired polls
* Only validate expires_at on create
2019-03-08 00:54:50 +01:00
Eugen Rochko
b7a8a52bc5
Immediately display poll results to poll author ( #10187 )
...
* Immediately display poll results to poll author
* Refactor Poll#loaded_options and add Poll#voted? to improve DRYness
2019-03-07 22:53:47 +01:00
Eugen Rochko
19cccea89a
Fix NaN in Poll component ( #10213 )
2019-03-07 22:18:05 +01:00
Eugen Rochko
8e9db67a6a
Fix public timelines being broken by new toots when they are not mounted ( #10131 )
2019-03-07 22:17:52 +01:00
ThibG
641384d288
Handle StaleObjectError when retrieving polls ( #10208 )
2019-03-07 15:52:38 +01:00
ThibG
51e37e9d6a
Merge pull request #944 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-07 13:45:43 +01:00
Thibaut Girka
d8d8c64965
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
dependabot[bot]
adc68b7a2e
Bump webpush from 0.3.6 to 0.3.7 ( #10205 )
...
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-07 20:38:10 +09:00
marcin mikołajczak
5232eccc5c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07 02:52:43 +01:00
ThibG
db21a6c5ee
Avoid unnecessarily fetching the replies collection when it is empty ( #10201 )
2019-03-07 01:50:37 +01:00
ThibG
401a3cfdf0
Fix AddLockVersionToPolls migration ( #10200 )
2019-03-07 01:50:06 +01:00
rinsuki
ed3d470069
Fix #10202 ( #10203 )
2019-03-07 01:49:42 +01:00
Thibaut Girka
a9597fd8a6
Allow setting whether this is a single choice poll or multiple choices one
2019-03-06 23:56:53 +01:00
Thibaut Girka
81a92465f2
Disable file upload when there is a poll
2019-03-06 23:56:53 +01:00
Thibaut Girka
49c4e57973
Use server-provided poll limits instead of hardcoded ones
...
Also does not enable polls if no limits are provided by the server
2019-03-06 23:56:53 +01:00
Thibaut Girka
9f06da948b
Serialize poll limits in instance serializer and initial state
2019-03-06 23:56:53 +01:00
Thibaut Girka
e2d56cc90d
[Glitch] Port polls creation UI from upstream
2019-03-06 23:56:53 +01:00
Thibaut Girka
8124b60a99
Fix AddLockVersionToPolls migration
2019-03-06 23:56:43 +01:00
ThibG
cff221b519
Merge pull request #942 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 22:59:07 +01:00
ThibG
6b4eb1ac96
[Glitch] Disable the underlying button element when an ItemButton is disabled
...
Port 365f875f57
to glitch-soc
2019-03-06 22:40:17 +01:00
Thibaut Girka
f123b809a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 22:39:22 +01:00
ThibG
4f2eb43d8a
Add optimistic lock to avoid race conditions when handling votes ( #10196 )
...
* Add optimistic lock to avoid race conditions when handling votes
* Force-reload polls when getting `ActiveRecord::StaleObjectError`
2019-03-06 19:53:57 +01:00
ThibG
365f875f57
Disable the underlying button element when an ItemButton is disabled ( #10194 )
...
Fixes #10191
2019-03-06 15:10:32 +01:00
ThibG
0b7c53937f
Disable file upload when there is a poll ( #10195 )
2019-03-06 15:09:18 +01:00
Thibaut Girka
8d82e153f3
Add an icon to highlight polls behind a Content Warning
2019-03-06 13:01:27 +01:00
ThibG
1397836898
Merge pull request #939 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-03-06 12:20:17 +01:00
Eugen Rochko
9844b44e99
Fix poll options not rendering text after vote/refresh
...
Port 9cae3a3b48
to glitch-soc
2019-03-06 11:44:27 +01:00
Eugen Rochko
31017d18a5
Avoid line breaks in poll options
...
Port 0d8890f073
to glitch-soc
2019-03-06 11:43:14 +01:00
Eugen Rochko
3ce4d88e6c
Render unicode emoji in polls using emoji pack
...
Port 73d3bb4a2c
to glitch-soc
2019-03-06 11:42:25 +01:00
Thibaut Girka
3ebbc1f017
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 11:29:06 +01:00
dependabot[bot]
67764e36f9
Bump active_record_query_trace from 1.5.4 to 1.6 ( #10192 )
...
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-06 14:58:13 +09:00
Eugen Rochko
9cae3a3b48
Fix poll options not rendering text after vote/refresh ( #10189 )
...
* Fix poll options not rendering text after vote/refresh
* Fix poll options not showing up on public pages
* Fix code style issue
2019-03-06 05:35:52 +01:00