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

3009 commits

Author SHA1 Message Date
Eugen Rochko
c128abc413 [Glitch] Improve invites list with click-to-copy inputs 
Port 2e6c6ce855 to glitch-soc
 2019-03-14 17:44:39 +01:00
Thibaut Girka
741766a01d 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
73fb7bfa0f Admission-based registrations mode (#10250) 
Fix #6856
Fix #6951
 2019-03-14 05:28:30 +01:00
Eugen Rochko
2e6c6ce855 Improve invites list with click-to-copy inputs (#10259) 2019-03-14 05:25:49 +01:00
ThibG
0381a07606 [Glitch] Add UI for enabling/disabling poll notifications 2019-03-13 22:21:52 +01:00
Thibaut Girka
5ce73f89f1 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 21:35:43 +01:00
ThibG
104c3879aa 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
177258aa57 [Glitch] Add muted style for polls in web UI 
Port de50bc6def to glitch-soc
 2019-03-13 16:02:36 +01:00
Eugen Rochko
ac5169aa31 [Glitch] Fix public timeline page not paginating correctly 
Port 3a435fa130 to glitch-soc
 2019-03-13 15:56:51 +01:00
Eugen Rochko
21366f9e05 [Glitch] Redesign landing page 
Port 56822606f4 to glitch-soc
 2019-03-13 15:53:00 +01:00
Thibaut Girka
d86033c352 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
c130aebba8 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
de50bc6def Add muted style for polls in web UI (#10248) 2019-03-12 22:08:18 +01:00
Eugen Rochko
3a435fa130 Fix public timeline page not paginating correctly (#10245) 2019-03-12 21:53:56 +01:00
Eugen Rochko
56822606f4 Redesign landing page (#10232) 2019-03-12 17:34:00 +01:00
Thibaut Girka
043978a20e Remove leftover console.log 2019-03-11 14:39:45 +01:00
Thibaut Girka
1e4ea4f391 Make clicking on the account and status column headers scroll to top 2019-03-11 14:19:16 +01:00
ThibG
91045bef61 Merge pull request #953 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-11 13:23:54 +01:00
Thibaut Girka
3a7fb657f3 [Glitch] Add support for poll ending notifications 
Port front-end parts of 11ce444b8b to glitch-soc
 2019-03-11 13:08:21 +01:00
ash lea
00bc35891b add local setting to auto reveal media behind cw 2019-03-11 12:14:45 +01:00
Kirishima21
2172dec88d fix poll fotter layout 
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
 2019-03-11 12:09:30 +01:00
Thibaut Girka
33001891b6 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
11ce444b8b 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
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
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
Thibaut Girka
d8d8c64965 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-07 13:24:30 +01:00
marcin mikołajczak
5232eccc5c i18n:🇵🇱 (#10199) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2019-03-07 02:52:43 +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
e2d56cc90d [Glitch] Port polls creation UI from upstream 2019-03-06 23:56:53 +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
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
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
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
Eugen Rochko
0d8890f073 Avoid line breaks in poll options (#10188) 2019-03-06 04:54:32 +01:00
Eugen Rochko
a15b0dc600 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
73d3bb4a2c Render unicode emoji in polls using emoji pack (#10185) 2019-03-06 03:57:46 +01:00
Thibaut Girka
bd97259b57 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
Thibaut Girka
9cb4a4c14e Merge branch 'master' into glitch-soc/merge-upstream 2019-03-06 00:03:46 +01:00
Thibaut Girka
6ad1fc3254 [Glitch] Perform deep comparison for card data when receiving new props 
Prevents embedded players from resetting when interacting with the toot
 2019-03-05 23:22:29 +01:00