me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
8831 commits 2 branches 0 tags 429 MiB
Commit graph

6199 commits

Author SHA1 Message Date
Thibaut Girka
07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.
 2019-03-14 17:17:20 +01:00
Eugen Rochko
874bd3ac0c
Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
Eugen Rochko
6841d8fc74
Fix wrong method used in PollExpirationNotifyWorker (#10265) 2019-03-14 14:04:07 +01:00
Eugen Rochko
51e154f5e8
Admission-based registrations mode (#10250) 
Fix #6856
Fix #6951
 2019-03-14 05:28:30 +01:00
Eugen Rochko
6e3936aa6f
Improve invites list with click-to-copy inputs (#10259) 2019-03-14 05:25:49 +01:00
Eugen Rochko
9e33174604
Refactor User model, extract PamAuthenticable, LdapAuthenticable (#10217) 2019-03-14 02:13:42 +01:00
ThibG
931ecc8824 [Glitch] Add UI for enabling/disabling poll notifications 2019-03-13 22:21:52 +01:00
Thibaut Girka
5ffdc5426e Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 21:35:43 +01:00
ThibG
65d9004ac9 Add UI for enabling/disabling poll notifications (#10255) 
* 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 19:29:54 +01:00
Eugen Rochko
387f253f31 [Glitch] Add muted style for polls in web UI 
Port 5b50c2cbaa to glitch-soc
 2019-03-13 16:02:36 +01:00
Eugen Rochko
458db4333a [Glitch] Fix public timeline page not paginating correctly 
Port da45b8b4c9 to glitch-soc
 2019-03-13 15:56:51 +01:00
Eugen Rochko
bbb9ff0e84 [Glitch] Redesign landing page 
Port 65fffeac3f to glitch-soc
 2019-03-13 15:53:00 +01:00
Thibaut Girka
02062aab55 Merge branch 'master' into glitch-soc/merge-upstream 
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-13 15:16:02 +01:00
mayaeh
c6f018091e i18n: Add Japanese translations for new landing page (#10254) 
* 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-13 14:56:40 +01:00
Eugen Rochko
06663fcf87
Fix tagged param not being normalized before querying tags (#10249) 2019-03-13 13:02:13 +01:00
mayaeh
d4ef90eae3 Fix to limit to discoverable accounts. (#10253) 2019-03-13 13:01:57 +01:00
Eugen Rochko
9f5b55ad4f
Fix poll update handler calling method was that was not available (#10246) 
* 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-12 22:58:59 +01:00
Eugen Rochko
a41afef80c
Optimize RemoveStatusService by removing n+1 query and using shared inboxes (#10247) 2019-03-12 22:34:55 +01:00
Eugen Rochko
5b50c2cbaa
Add muted style for polls in web UI (#10248) 2019-03-12 22:08:18 +01:00
Eugen Rochko
da45b8b4c9
Fix public timeline page not paginating correctly (#10245) 2019-03-12 21:53:56 +01:00
Eugen Rochko
65fffeac3f
Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
Aurélien Reeves
85537b0069 Squish username before validation (#10239) 
* 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-11 20:48:24 +01:00
Eugen Rochko
f5eeac0104
Fix remote interaction dialogs being indexed by search engines (#10240) 
Fix #10116
 2019-03-11 20:47:50 +01:00
Thibaut Girka
f3e7634156 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-11 17:31:02 +01:00
Thibaut Girka
a1c6e6de1b Remove leftover console.log 2019-03-11 14:39:45 +01:00
Thibaut Girka
4849eb8e7f Make clicking on the account and status column headers scroll to top 2019-03-11 14:19:16 +01:00
ThibG
79b00d294d Increase DNS timeouts (#10238) 2019-03-11 13:27:57 +01:00
ThibG
45e4c90a23
Merge pull request #953 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-11 13:23:54 +01:00
Thibaut Girka
9c620fc5c8 [Glitch] Add support for poll ending notifications 
Port front-end parts of 3a92885a86 to glitch-soc
 2019-03-11 13:08:21 +01:00
Thibaut Girka
7d026aa079 Do not leak instance-local polls to remote followers 2019-03-11 13:08:20 +01:00
ash lea
f534f4869e add local setting to auto reveal media behind cw 2019-03-11 12:14:45 +01:00
Kirishima21
1bf035fb67 fix poll fotter layout 
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
 2019-03-11 12:09:30 +01:00
Thibaut Girka
89bee860cd Merge branch 'master' into glitch-soc/merge-upstream 
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-11 11:23:50 +01:00
ThibG
5506b9406d Avoid race conditions when creating backups (#10234) 
Under load, multiple backups for a single user could be planned, which
is very expensive.
 2019-03-11 00:50:31 +01:00
ThibG
3a92885a86 Support pushing and receiving updates to poll tallies (#10209) 
* 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-11 00:49:31 +01:00
Thibaut Girka
dfe7322922 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-10 16:48:44 +01:00
ThibG
c11dff5049 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
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
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