Age | Commit message (Collapse) | Author |
|
Update theming system to use new paths for media files
|
|
Port SCSS changes from 1c113fd72df18999de1d6f09fa3790dd1f715506 to glitch-soc
|
|
Conflicts:
- app/controllers/settings/follower_domains_controller.rb
Removed upstream. Did the same here. Maybe we should not have?
- config/locales/en.yml
Upstream removed the “Authorized followers” page and associated
translations. This is too close in the file to our glitch-soc-specific
“flavour” string. No actual conflict.
- config/locales/ja.yml
Same as above.
- config/locales/pl.yml
Same as above.
- config/navigation.rb
No real conflict. New route added too close to the glitch-soc-specific
“flavours” one.
- config/webpack/configuration.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpack/loaders/babel.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
The contents of this file have been moved to package.json.
- config/webpack/shared.js
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- config/webpacker.yml
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- jest.config.js
The contents of this file have been moved to package.json.
- package.json
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
- yarn.lock
Upstream refactored the webpack(er) configuration quite a bit.
Tried to keep up.
|
|
|
|
* Do not crash the whole UI when loading an invalid column
* Add error boundary component to catch Web UI crashes
* Add stack trace on supported browsers
* Add component stack info, pre-format everything for github
* Make “Reload” a clickable link that calls window.location.reload()
* Remove elephant friend from error boundary, make title stand out more
* Simplify error boundary to only a graphic
|
|
|
|
Port SCSS changes from 51e154f5e87968d6bb115e053689767ab33e80cd to glitch-soc
|
|
Port 6e3936aa6f4296ac202b54c0b178b4fa825d7885 to glitch-soc
|
|
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
|
|
Fix #6856
Fix #6951
|
|
|
|
|
|
|
|
* 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
|
|
Port 5b50c2cbaa75a07b5f665a0d55cbfd79de67cc63 to glitch-soc
|
|
Port da45b8b4c9bf00495bb967dda38064ac74b85ead to glitch-soc
|
|
Port 65fffeac3f960f9c74d693525a73ac14b201bf2b to glitch-soc
|
|
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
|
|
* 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.
|
|
|
|
|
|
|
|
|
|
|
|
Merge upstream changes
|
|
Port front-end parts of 3a92885a860df12b12d8356faf179a3fc63be6f2 to glitch-soc
|
|
|
|
画面の幅が充分でないときに
表示外にまでボタンが拡大されてしまわないように修正。
|
|
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.
|
|
* 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
|
|
Port 75cb93676b1dd41d3e47f62466c0c6430691a990 to glitch-soc
|
|
mounted
Port be1c634b2b4372a525d304d2ff830392f04c5cc5 to glitch-soc
|
|
|
|
|
|
(#10131)
|
|
|
|
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
|
|
|
|
|
|
Also does not enable polls if no limits are provided by the server
|
|
|
|
Port b3668a79eca2d185ea57a9ffc2fa012db52e49f0 to glitch-soc
|
|
|
|
Fixes #10191
|
|
|
|
|
|
Port fd128b9c7aa5c71adbfc2e223212514c0baee675 to glitch-soc
|
|
Port 57643557b64bc1853c4aeb65fc652dac3467fa18 to glitch-soc
|
|
Port 4407f07014096bcbaf5a06015a5791984282846d to glitch-soc
|
|
|