Eugen Rochko
338f1327e9
[Glitch] Admission-based registrations mode
...
Port SCSS changes from 51e154f5e8
to glitch-soc
2019-03-14 17:54:44 +01:00
Eugen Rochko
d8b43f4bd6
[Glitch] Improve invites list with click-to-copy inputs
...
Port 6e3936aa6f
to glitch-soc
2019-03-14 17:44:39 +01:00
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
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
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
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
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
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
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
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
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
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
Thibaut Girka
9c5e7805cc
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-07 13:24:30 +01:00
marcin mikołajczak
44475bbc9c
i18n: 🇵🇱 ( #10199 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-03-07 02:52:43 +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
8fe86cebaa
[Glitch] Port polls creation UI from upstream
2019-03-06 23:56:53 +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
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
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
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
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
Thibaut Girka
f108c6a042
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-06 00:03:46 +01:00