eef8d9a5f7
Add locality check to ActivityPub::FetchRemoteAccountService ( #9109 )
...
* Add locality check to ActivityPub::FetchRemoteAccountService
Fix #8643
Because there are a few places where it is called, it is difficult
to confirm if they all previously checked it for locality. It's better
to make sure within the service.
* Remove faux-remote duplicates of local accounts
2018-10-26 23:08:34 +02:00
6e1a4f85ad
RTL: fix column-back-button__icon margins/content ( #9112 )
...
* RTL: fix column-back-button__icon margins/content
* Update rtl.scss
* Update rtl.scss
2018-10-26 22:49:39 +02:00
215e649391
Fix styling in /auth/edit ( #9117 )
2018-10-26 22:49:17 +02:00
e53cc673e7
Ignore invalid hashtags on remote statuses instead of rejecting them ( #9118 )
...
Fixes #9115
2018-10-26 22:48:35 +02:00
5bb8563f6c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml
Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.
Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.
2018-10-26 20:41:43 +02:00
82e7988afc
Fix missing `mention` argument when processing incoming Create activities ( #9114 )
...
* Fix missing `mention` argument when processing incoming Create activities
* Fix typo (param → params)
2018-10-26 12:59:59 +02:00
1e2695198a
Skip link-back check if body is nil ( #9107 )
2018-10-26 03:31:23 +02:00
161aeadbb4
Remove character counter from edit profile ( #9100 )
...
* Remove display name and bio counter hint, simply limit input
* Remove now redundant translations
* Fix code style issue
2018-10-26 01:55:24 +02:00
768b0f132d
Fix direct messages column not loading more items on scroll ( #9102 )
...
Fix #9097
2018-10-26 01:55:08 +02:00
a2e3401e48
Fix conversations not being marked read on click ( #9103 )
...
Fix #9096
2018-10-26 01:54:58 +02:00
7fee968e9f
Do not fetch preview card for mentioned users ( #6934 )
2018-10-25 18:13:19 +02:00
d4cf963749
Allow inbox owner to view implicitly targeted ActivityPub payload ( #9093 )
...
Fix #9091
2018-10-25 18:12:22 +02:00
4ea718ef18
Migrate all old direct messages to new conversations schema ( #9085 )
2018-10-25 01:44:02 +02:00
e8ffecbd36
Set @body_classes to admin layout ( #9081 )
2018-10-25 00:10:01 +02:00
d723f2a0a8
Fix RTL layout of status display names ( #9075 )
...
Fix #2350
2018-10-24 18:18:08 +02:00
288e435fe5
Show upload options on click as well as hover ( #9074 )
...
Fix #8918
2018-10-24 18:17:15 +02:00
01c169e796
Fix JS error when posting from page without router context ( #9073 )
...
Fix #9057
2018-10-24 01:31:31 +02:00
ed8d06212f
Keep back own DMs in Home timeline
...
Follow-up to e45a6edd65
2018-10-23 20:03:35 +02:00
8f3096b846
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-23 17:15:57 +02:00
39abec4d25
Fix public timelines not instantly updating on compose ( #9050 )
...
Fix #9034
2018-10-23 00:43:18 +02:00
ad510db3a1
Show suggested follows on search screen in mobile layout ( #9010 )
...
Reminder: Suggestions were added in #7918 and are based on who you
interact with who you do not follow. E.g. if you boost someone a lot
from seeing other people's boosts of that person, it makes sense you
might be interested in following the original source; or if you reply
to someone a lot, maybe you'd want to follow them
Each suggestion can be dismissed
2018-10-23 00:08:39 +02:00
81017eaea7
Revert "RTL: remove blank character inside bdi ( #9038 )" ( #9056 )
...
This reverts commit c7e9f9ff1e
2018-10-22 23:23:00 +02:00
0c7f710be1
[Glitch] Surround mid-text display names with bdi tags
...
Port 7861c5f108
2018-10-22 18:57:20 +02:00
323ae1403a
[Glitch] fix: initial state of PrivacyDropdown is should not be null
...
Port bebe8ec887
2018-10-22 18:41:34 +02:00
1bb23d0407
[Glitch] RTL: fix cardbar margins and alignment
...
Port c73864c137
2018-10-22 18:39:37 +02:00
c9b19e05e2
[Glitch] RTL: fix admin account avatar margin in about page
...
Port 3a157210c8
2018-10-22 18:38:52 +02:00
c14be538a6
[Glitch] RTL: fix column settings toggle label
...
Port bf58461d36
2018-10-22 18:38:11 +02:00
a1f512f18b
[Glitch] Fix domain label position and color
...
Port 25f9ead041
2018-10-22 18:37:17 +02:00
9950db2e1c
[Glitch] RTL: fix preferences layout
...
Port 029943d59b
2018-10-22 18:34:48 +02:00
076f0a0eb6
[Glitch] Fix admin account avatar margin
...
Port 065b39e7a4
2018-10-22 18:33:35 +02:00
aa277ab5fb
[Glitch] RTL: fix user stats in about page
...
Port 301cbcc980
2018-10-22 18:31:50 +02:00
ef9c11e050
[Glitch] RTL: fix domain append at signup form
...
Port 65b3804a6c
2018-10-22 18:31:50 +02:00
e18724363d
[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"
...
Port d35801aaa2
2018-10-22 18:31:50 +02:00
1139b758c5
[Glitch] RTL: fix admin account margins in about page
...
Port f8c1b32541
2018-10-22 18:31:50 +02:00
bf9c4b6d98
[Glitch] undo part of PR 8202 to fix RTL
...
Port efd09e2ebb
2018-10-22 18:22:01 +02:00
9f1c9b6135
[Glitch] Improve style of notice/alert messages
...
Port b972478812
2018-10-22 18:20:43 +02:00
e45a6edd65
Keep new DMs in home feeds and in the old DM timeline
...
Revert server-side part of 87fdd139b8
2018-10-22 18:15:51 +02:00
dcded13a99
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
c7e9f9ff1e
RTL: remove blank character inside bdi ( #9038 )
...
* RTL: remove blank character inside bdi
* Update app/javascript/mastodon/components/display_name.js
Co-Authored-By: mabkenar <ampbox@gmail.com>
2018-10-22 01:04:32 +02:00
84cf78da8a
Fix og:url on toots' public view ( #9047 )
...
Fixes #9045
2018-10-21 22:52:10 +02:00
c73864c137
RTL: fix cardbar margins and alignment ( #9044 )
2018-10-21 18:37:57 +02:00
3a157210c8
RTL: fix admin account avatar margin in about page ( #9039 )
...
* RTL: fix admin account avatar margin in about page
* fix code style
2018-10-21 16:45:08 +02:00
4739e0f090
Put a video camera emoji or a picture frame emoji instead of “.”
...
This uses the same logic as the status icons in the glitch flavor.
2018-10-21 16:09:18 +02:00
8729f5e466
Do not move CWs to toot body when toot body is empty
...
Fixes #395
Instead of leaving the toot body blank, it replaces it with a single “.” in
order for the fold/unfold CW behavior to not look *too* weird on upstream
Mastodon. Note that this does not fix upstream's CW-dropping behavior, as
that is decided at the time the toot is posted, not received.
2018-10-21 16:09:18 +02:00
04bedd237b
Attempt at fixing inline video player
2018-10-21 16:09:07 +02:00
dfa5b0576f
Update mediaGallery component's width when opening CWs
2018-10-21 16:09:07 +02:00
bf58461d36
RTL: fix column settings toggle label ( #9037 )
2018-10-21 20:31:40 +09:00
25f9ead041
Fix domain label position and color ( #9033 )
...
* Fix position of the domain label
* Fix position of the domain label for RTL
- Fix color mismatch of linear gradient which assigned to "::after" pseudo class
2018-10-21 14:35:25 +09:00
e4c3ea1809
Force sensitive content flag when posting a toot with a CW
...
Indeed, when the “Always enable the Content Warning field” setting is enabled,
sending a content-less toot with a CW would move the CW to the toot's content
and leave the toot not marked as sensitive.
2018-10-20 17:06:21 +02:00
13c3fa8d36
Focus the UI when pressing Escape in the CW field
2018-10-20 15:00:39 +02:00
fd5285658f
Add option to block reports from domain ( #8830 )
2018-10-20 08:02:44 +02:00
9486f0ca77
Add "disable" button to report screen ( #9024 )
...
* Add "disable" button to report screen
* i18n-tasks remove-unused
2018-10-20 02:39:39 +02:00
eb1b9903a6
Redesign direct messages column ( #9022 )
2018-10-20 02:23:58 +02:00
029943d59b
RTL: fix preferences layout ( #9021 )
2018-10-20 01:05:17 +02:00
065b39e7a4
Fix admin account avatar margin ( #9020 )
2018-10-19 20:35:42 +02:00
301cbcc980
RTL: fix user stats in about page ( #9018 )
2018-10-19 20:16:13 +09:00
a38a452481
Add unread indicator to conversations ( #9009 )
2018-10-19 01:47:29 +02:00
bebe8ec887
fix: initial state of PrivacyDropdown is should not be null ( #9008 )
2018-10-19 00:00:19 +02:00
65b3804a6c
RTL: fix domain append at signup form ( #9007 )
2018-10-18 21:19:31 +02:00
007f7690fa
Fix fav/boosts hotkeys not working on detailed statuses ( #9006 )
2018-10-18 19:52:00 +02:00
b13c34de3a
Fix fav/boosts hotkeys not working on detailed statuses
2018-10-18 19:00:59 +02:00
f8c1b32541
RTL: fix admin account margins in about page ( #9005 )
2018-10-18 14:35:49 +02:00
72d7d3003b
Do not show "limited" visibility in default visibility preference ( #8999 )
...
* Do not show "limited" visibility in default visibility preference
Fix regression from #8950
* Fix code style issue
2018-10-17 22:04:40 +02:00
ddd30f331c
Improve support for aspects/circles ( #8950 )
...
* Add silent column to mentions
* Save silent mentions in ActivityPub Create handler and optimize it
Move networking calls out of the database transaction
* Add "limited" visibility level masked as "private" in the API
Unlike DMs, limited statuses are pushed into home feeds. The access
control rules between direct and limited statuses is almost the same,
except for counter and conversation logic
* Ensure silent column is non-null, add spec
* Ensure filters don't check silent mentions for blocks/mutes
As those are "this person is also allowed to see" rather than "this
person is involved", therefore does not warrant filtering
* Clean up code
* Use Status#active_mentions to limit returned mentions
* Fix code style issues
* Use Status#active_mentions in Notification
And remove stream_entry eager-loading from Notification
2018-10-17 17:13:04 +02:00
adb06baef6
Handle global hotkeys even when no element has focus ( #8998 )
...
This fixes hotkeys not working when pressing the column
“back” button, for instance.
2018-10-17 16:56:16 +02:00
f5e2e96e95
always allow DMs from staff ( #8993 )
2018-10-16 19:55:05 +02:00
35b576dbec
Improve form for selecting media display preference ( #8965 )
...
Regression from #8569
2018-10-16 14:07:54 +02:00
d35801aaa2
Fixes 8987 broken alignment at "Remote interaction dialog" ( #8988 )
2018-10-15 16:09:08 +02:00
efd09e2ebb
undo part of PR 8202 to fix RTL ( #8979 )
2018-10-15 04:39:20 +02:00
b0527a4ce7
Handle alt+enter in the spoiler input as shortcut for secondary post
...
Fixes #780
2018-10-14 12:00:21 +02:00
b972478812
Improve style of notice/alert messages ( #8973 )
2018-10-13 01:51:30 +02:00
7d182442a7
Weblate translations (2018-10-12) ( #8972 )
...
* Translated using Weblate (Welsh)
Currently translated at 64.4% (448 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Arabic)
Currently translated at 98.0% (682 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Arabic)
Currently translated at 94.3% (82 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Welsh)
Currently translated at 88.7% (297 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (French)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (French)
Currently translated at 100,0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Czech)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (87 of 87 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Persian)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Translated using Weblate (Arabic)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Czech)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Galician)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (696 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Greek)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (Greek)
Currently translated at 98.8% (331 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Greek)
Currently translated at 99.7% (694 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Persian)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Czech)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (French)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (German)
Currently translated at 99.6% (693 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 100,0% (93 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (692 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.9% (695 of 696 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (335 of 335 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 94.6% (88 of 93 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* i18n-tasks normalize
* yarn manage:translations
2018-10-13 01:51:14 +02:00
70d346ea95
Fix auto-unfold CWs when no regexp is set
...
Fixes #778
2018-10-12 23:34:26 +02:00
3d5d899094
Allow selecting both default flavour and theme
...
Fixes #672
2018-10-12 19:06:35 +02:00
fac529975b
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
2018-10-12 07:00:41 +02:00
9d4541c612
Display customized mascot in web UI and fix admin form for it ( #8964 )
...
Follow-up to #8766
2018-10-12 04:04:08 +02:00
22de24b8ca
Fix missing protocol in dns-prefetch, improve code style ( #8963 )
...
Regression from #8942
2018-10-12 02:19:10 +02:00
5cbbd2c3b5
Fix microformats on statuses according to updated spec ( #8958 )
2018-10-12 02:04:07 +02:00
8fd2cc54c1
Fix type of conversation ID in conversations API ( #8961 )
2018-10-12 01:36:51 +02:00
21ad21cb50
Improve signature verification safeguards ( #8959 )
...
* Downcase signed_headers string before building the signed string
The HTTP Signatures draft does not mandate the “headers” field to be downcased,
but mandates the header field names to be downcased in the signed string, which
means that prior to this patch, Mastodon could fail to process signatures from
some compliant clients. It also means that it would not actually check the
Digest of non-compliant clients that wouldn't use a lowercased Digest field
name.
Thankfully, I don't know of any such client.
* Revert "Remove dead code (#8919 )"
This reverts commit a00ce8c92c
2018-10-12 00:15:55 +02:00
0075964244
Merge pull request #775 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-11 21:28:03 +02:00
2d27c11061
Set Content-Security-Policy rules through RoR's config ( #8957 )
...
* Set CSP rules in RoR's configuration
* Override CSP setting in the embed controller to allow frames
2018-10-11 20:35:46 +02:00
8f720be9f3
Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into glitch-soc/merge-upstream
2018-10-11 14:12:36 +02:00
61d44dd11f
Fix typo in ActivityPub Create handler ( #8952 )
...
Regression from #8951
2018-10-11 02:10:15 +02:00
87fdd139b8
Do not push DMs into the home feed ( #8940 )
...
* Do not push DMs into the home feed
* Show DMs column after sending a DM, if DMs column is not already shown
2018-10-11 01:31:03 +02:00
790d3bc637
Move network calls out of transaction in ActivityPub handler ( #8951 )
...
Mention and emoji code may perform network calls, but does not need
to do that inside the database transaction. This may improve availability
of database connections when using pgBouncer in transaction mode.
2018-10-11 00:50:18 +02:00
bb1103d974
Really fix HotKeys
2018-10-10 17:40:06 +02:00
2459da29c2
Add description meta tag additionally to og:description ( #8941 )
...
Fix #8685
2018-10-10 02:21:30 +02:00
da7705b274
Add dns-prefetch if using different host for assets or uploads ( #8942 )
2018-10-10 01:31:10 +02:00
a02244f17c
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/packs/public.js
Changes made to app/javascript/packs/publics.js were applied to
app/javascript/core/settings.js
2018-10-09 21:08:26 +02:00
e50cb5f4bd
Fix that the copy button of verify link did not work. ( #8938 )
2018-10-09 19:36:13 +02:00
7f9dd92a27
Track historical space stats in PgHero to determine PostgreSQL growth ( #8906 )
2018-10-09 19:35:14 +02:00
269edc0e48
Fix CW icon color in local-settings modal
2018-10-09 18:10:54 +02:00
721aec40cd
Define some local-settings hints
2018-10-09 18:10:54 +02:00
26409f3e8e
Add support for hints (or extended descriptions) in local-settings pages
2018-10-09 18:10:54 +02:00
5f308a7f05
When screen width is too narrow, hide local-settings page text, keep only icons
2018-10-09 18:10:54 +02:00
6cd793f0ac
Change “preferences” icon to match settings page icon
2018-10-09 18:10:54 +02:00
edb9ec8543
Add icons for each of the local-setting pages
2018-10-09 18:10:54 +02:00
122ac9cd1d
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-09 12:12:03 +02:00
4134a10549
Merge pull request #770 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-10-09 12:11:14 +02:00
Eugen Rochko