ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,880 Commits
10 Branches
15 Tags
251 MiB
Commit Graph

8880 Commits (200cd3b5a70f7f1f187dee780858f383260c439a)

Author SHA1 Message Date
Aditoo17 6c0a96912a Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server (#10224) 2019-03-09 17:07:59 +01:00
ThibG 42cc93e892
Merge pull request #947 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-08 20:43:51 +01:00
Thibaut Girka 93daa97fc3 Fix min/max duration poll limits being inverted 2019-03-08 20:43:18 +01:00
Thibaut Girka 674fe32f97 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 20:15:57 +01:00
ThibG 3f4a6d44fe Fix setting up fields of a previously suspended account (#10222) 
Fix #10177 for real
 2019-03-08 19:59:08 +01:00
Ben Lubar d36fcb54c4 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 42e733681a 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] 9e33a71efa 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 29a09858f6
Merge pull request #945 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-08 01:47:36 +01:00
Eugen Rochko ca45198ccb [Glitch] Fix NaN in Poll component 
Port 75cb93676b to glitch-soc
 2019-03-08 01:01:19 +01:00
Eugen Rochko 6fe48dd050 [Glitch] Fix public timelines being broken by new toots when they are not mounted 
Port be1c634b2b to glitch-soc
 2019-03-08 01:00:14 +01:00
Thibaut Girka 5528719bc9 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-08 00:57:13 +01:00
ThibG 3aaac4f134 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 054bbb3da2
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 75cb93676b
Fix NaN in Poll component (#10213) 2019-03-07 22:18:05 +01:00
Eugen Rochko be1c634b2b
Fix public timelines being broken by new toots when they are not mounted (#10131) 2019-03-07 22:17:52 +01:00
ThibG 09c042aa10 Handle StaleObjectError when retrieving polls (#10208) 2019-03-07 15:52:38 +01:00
ThibG 38e9c66f34
Merge pull request #944 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-07 13:45:43 +01:00
Thibaut Girka 9c5e7805cc Merge branch 'master' into glitch-soc/merge-upstream 2019-03-07 13:24:30 +01:00
dependabot[bot] 637c952ccb 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 44475bbc9c i18n:🇵🇱 (#10199) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2019-03-07 02:52:43 +01:00
ThibG 34f261e6af Avoid unnecessarily fetching the replies collection when it is empty (#10201) 2019-03-07 01:50:37 +01:00
ThibG dfb45374d2 Fix AddLockVersionToPolls migration (#10200) 2019-03-07 01:50:06 +01:00
rinsuki f44091d653 Fix #10202 (#10203) 2019-03-07 01:49:42 +01:00
Thibaut Girka 84c807a0dc Allow setting whether this is a single choice poll or multiple choices one 2019-03-06 23:56:53 +01:00
Thibaut Girka cb6e351f4d Disable file upload when there is a poll 2019-03-06 23:56:53 +01:00
Thibaut Girka 235be596bc 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 3b1390dc78 Serialize poll limits in instance serializer and initial state 2019-03-06 23:56:53 +01:00
Thibaut Girka 8fe86cebaa [Glitch] Port polls creation UI from upstream 2019-03-06 23:56:53 +01:00
Thibaut Girka 3e5a0bc825 Fix AddLockVersionToPolls migration 2019-03-06 23:56:43 +01:00
ThibG da8ce25fa1
Merge pull request #942 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-06 22:59:07 +01:00
ThibG 6e295beab2 [Glitch] Disable the underlying button element when an ItemButton is disabled 
Port b3668a79ec to glitch-soc
 2019-03-06 22:40:17 +01:00
Thibaut Girka cf4fd8bcfe Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 22:39:22 +01:00
ThibG 96f905f409 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 b3668a79ec Disable the underlying button element when an ItemButton is disabled (#10194) 
Fixes #10191
 2019-03-06 15:10:32 +01:00
ThibG cb217444b8 Disable file upload when there is a poll (#10195) 2019-03-06 15:09:18 +01:00
Thibaut Girka 1bb23100b1 Add an icon to highlight polls behind a Content Warning 2019-03-06 13:01:27 +01:00
ThibG fefacb7b7a
Merge pull request #939 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-06 12:20:17 +01:00
Eugen Rochko 94a0149ff3 Fix poll options not rendering text after vote/refresh 
Port fd128b9c7a to glitch-soc
 2019-03-06 11:44:27 +01:00
Eugen Rochko 94f1a751bf Avoid line breaks in poll options 
Port 57643557b6 to glitch-soc
 2019-03-06 11:43:14 +01:00
Eugen Rochko 7f32d675b0 Render unicode emoji in polls using emoji pack 
Port 4407f07014 to glitch-soc
 2019-03-06 11:42:25 +01:00
Thibaut Girka 4806232997 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 11:29:06 +01:00
dependabot[bot] ad6f7ea250 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 fd128b9c7a
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
Eugen Rochko 57643557b6
Avoid line breaks in poll options (#10188) 2019-03-06 04:54:32 +01:00
Eugen Rochko 5996be994d
Fix poll validation issues (#10186) 
- Fix missing interpolation argument in PollValidator
- Fix PollValidator rejecting exact allowed min/max durations
 2019-03-06 04:54:11 +01:00
Eugen Rochko d97cbb0da6
Add UI for creating polls (#10184) 
* Add actions and reducers for polls

* Add poll button

* Disable media upload if poll enabled

* Add poll form

* Make delete & redraft work with polls
 2019-03-06 04:53:37 +01:00
Eugen Rochko 4407f07014
Render unicode emoji in polls using emoji pack (#10185) 2019-03-06 03:57:46 +01:00
Thibaut Girka e80fabfd84 Fix toots opening in dynamic column when trying to interact with them 
This fixes inline preview cards and polls, preventing them from opening
the toot in detailed view when clicking on an interactive element.
 2019-03-06 00:20:43 +01:00
ThibG bd3567b3f8
Merge pull request #938 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-06 00:20:30 +01:00