about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2019-03-13[Glitch] Add UI for enabling/disabling poll notificationsThibG
2019-03-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-13Add UI for enabling/disabling poll notifications (#10255)ThibG
* Add UI for enabling/disabling poll notifications * Add poll notifications to the (advanced) quick filter bar * Update poll notification message “Your poll has ended” → “A poll you have voted in has ended” * Clear up associated notifications when a poll is deleted
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-13i18n: Add Japanese translations for new landing page (#10254)mayaeh
* yarn manage:translations && i18n-tasks add-missing * Update Japanese translations for new landing page. I don't change the tagline from English yet. I think that translating a tagline is difficult and requires time-consuming discussions. Some translations related about the poll are already done in Weblate, so I will leave it as it is.
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-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-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 branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-11Remove leftover console.logThibaut Girka
2019-03-11Make clicking on the account and status column headers scroll to topThibaut Girka
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-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 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-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-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 branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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 #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