ThibG
4e36959693
Merge pull request #633 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-11 16:17:29 +02:00
Thibaut Girka
03ac196126
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-11 15:45:42 +02:00
Thibaut Girka
6c1e770658
Fix statuses batch checkboxes in admin panel ( fixes #411 )
2018-08-11 15:45:12 +02:00
Thibaut Girka
ac67589755
Don't prevent opening links in tabs with keyboard modifiers
...
Ctrl+click usually allows opening a link in a new tab. This
was prevented for hashtag or user links in toots.
2018-08-11 15:29:08 +02:00
ThibG
ad8543c962
Merge pull request #630 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-11 15:28:06 +02:00
ThibG
1d3b39e106
Ensure single user is a local user ( fixes #8154 ) ( #8157 )
2018-08-11 11:53:10 +02:00
Mélanie Chauvel (ariasuni)
92ae613358
Fix crash when clicking “Show more/less for all” when a toot is not visible ( #8118 )
2018-08-11 11:52:53 +02:00
Nathaniel Ekoniak
8254b9fb19
i18n: fix Slovak language name ( #8169 )
2018-08-11 14:52:05 +09:00
Yamagishi Kazutoshi
a74f0d2dd9
Weblate translations (2018-08-11) ( #8167 )
...
* Translated using Weblate (Japanese)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Japanese)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 98.5% (657 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/
* Translated using Weblate (Czech)
Currently translated at 61.2% (38 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Ukrainian)
Currently translated at 51.2% (42 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/
* Translated using Weblate (Czech)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Galician)
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (666 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (667 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Ukrainian)
Currently translated at 99.6% (306 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/
* Translated using Weblate (Czech)
Currently translated at 67.0% (55 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Ukrainian)
Currently translated at 97.0% (647 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/
* Translated using Weblate (Ukrainian)
Currently translated at 97.1% (648 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/
* Translated using Weblate (Czech)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 18.3% (18 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Danish)
Currently translated at 79.3% (529 of 667 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Czech)
Currently translated at 61.2% (60 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (Occitan)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/
* Translated using Weblate (German)
Currently translated at 96.5% (646 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Czech)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Corsican)
Currently translated at 99.3% (305 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 92.2% (617 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Arabic)
Currently translated at 91.4% (75 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 92.9% (622 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Danish)
Currently translated at 92.8% (91 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/da/
* Translated using Weblate (Greek)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Danish)
Currently translated at 82.0% (549 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Korean)
Currently translated at 98.2% (657 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/
* Translated using Weblate (Korean)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (German)
Currently translated at 97.7% (654 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Corsican)
Currently translated at 98.5% (659 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/co/
* Translated using Weblate (French)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Basque)
Currently translated at 96.2% (644 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eu/
* Translated using Weblate (Basque)
Currently translated at 90.2% (74 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Czech)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (2 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Asturian)
Currently translated at 29.8% (200 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/
* Translated using Weblate (Greek)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Greek)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Czech)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/
* Translated using Weblate (Greek)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/
* Translated using Weblate (German)
Currently translated at 96.3% (79 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99.7% (667 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/
* Translated using Weblate (German)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/de/
* Translated using Weblate (French)
Currently translated at 100.0% (98 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (German)
Currently translated at 97.5% (80 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (French)
Currently translated at 100.0% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (307 of 307 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (German)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 99.8% (668 of 669 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (German)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* Translated using Weblate (German)
Currently translated at 98.7% (82 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/
* i18n-tasks normalize && i18n-tasks remove-unused
* yarn manage:translations
* re-add simple_form.uk.yml
* remove ar.simple_form.hints.defaults.*.one
2018-08-11 14:51:30 +09:00
Marcin Mikołajczak
fd8ca84077
i18n: Update Polish translation ( #8155 )
...
* i18n: Update Polish translation
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n-tasks normalize && yarn manage:translations
2018-08-11 07:52:36 +09:00
Evgeny Petrov
399a008cfb
[RU] Updated translation ( #8164 )
2018-08-11 06:39:52 +09:00
Thibaut Girka
7def9b7026
Introduce OAuth scopes for bookmarks
2018-08-10 16:49:06 +02:00
Thibaut Girka
ca4fa96a99
Implement public profile endorsements in glitch-soc
...
Port WebUI changes from 6e3cb11f3c
to glitch-soc
2018-08-10 16:25:46 +02:00
Thibaut Girka
35ee061e42
Merge upstream SCSS changes for /about, /about/more and /terms
...
Port various commits to glitch-soc, mainly commits
9e8366d4cb
and
0dcd212735
.
2018-08-10 16:22:49 +02:00
Thibaut Girka
1e18374e53
Merge upstream styling for public profile endorsements
...
Port the SCSS part of 6e3cb11f3c
to glitch-soc
2018-08-10 16:22:49 +02:00
Thibaut Girka
5ed6f6db1d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/pl.json
app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
2018-08-10 16:22:31 +02:00
Thibaut Girka
3fd47f9bc0
Introduce OAuth scopes for bookmarks
2018-08-10 15:26:52 +02:00
Eugen Rochko
0dcd212735
Adjust responsive design for /about/more and /terms ( #8158 )
...
Follow-up to #8142
2018-08-10 06:43:02 +02:00
Aaron Brady
98577df03a
Update docker-compose to cope with build-time assets ( #8156 )
...
#7780 means that asset compilation happens as a build step.
Having the assets and packs volumes defined in `docker-compose.yml` breaks this. For people who run under Docker Compose, I believe this will fix their CSS (which even running the asset recompilation separately did not).
2018-08-09 22:37:48 +02:00
Eugen Rochko
d0b6cbfb92
When follow is removed, remove endorsement ( #8149 )
2018-08-09 15:24:29 +02:00
Eugen Rochko
9e8366d4cb
Update /terms and /about/more to use public layout ( #8142 )
2018-08-09 12:58:20 +02:00
Eugen Rochko
6e3cb11f3c
Public profile endorsements (accounts picked by profile owner) ( #8146 )
2018-08-09 09:56:53 +02:00
Evgeny Petrov
f1fe022a13
[RU] Translation update: ( #8147 )
...
* [RU] Translation update:
• Added translation to Welcome timeline
• Doorkeeper: changed date format to more common in Russia
• Doorkeeper: added translation to scopes
• Added translation to Dashboard settings (I didn't have a chance to test it on Live server, so some strings may be a bit incorrect)
• Added translation to Relays settings
• Added translation to Filters settings
• Some other small fixes and improvements
* Quoted string for "joined" key to avoid mapping error
* [RU] Changed "повторить" (repeat) to "исправить" (change, fix) for a more correct translation.
* i18n-tasks normalize
2018-08-09 08:50:42 +02:00
Eugen Rochko
3a8d839200
Remove protocol handler registration ( #8127 )
...
Browser UI too confusing / scares people, protocol URIs not used much
2018-08-08 21:12:45 +02:00
Thibaut Girka
2107ea78c3
Good bye, CW rainbows
...
Accessibility issues largely outweigh the joke and consistency with upstream.
2018-08-07 18:49:49 +02:00
Mozinet
092ad32063
Update fr.yml for 3 spelling mistakes and a typo ( #8135 )
2018-08-08 01:02:34 +09:00
Thibaut Girka
929324cf60
Scroll to linked status in public status view
2018-08-07 16:58:00 +02:00
ThibG
80d02cf8f9
Scroll to linked status in public status view ( fixes #7884 ) ( #8130 )
...
When there is a single detailed status on a public page, scroll to it and
replace the history state to not scroll back on refresh (simulates # anchors).
2018-08-06 15:16:02 +02:00
Thibaut Girka
dc85e5a379
Restore glitch-soc's 500 characters limit for bios ( fixes #625 )
2018-08-06 08:20:29 +02:00
Thibaut Girka
dfe8240f8d
Import upstream's emojify function in settings.js
...
This fixes updating the profile preview when changing display name.
2018-08-05 12:57:20 +02:00
ThibG
193ebf3cf4
Serialize text-less statuses as '.' over OStatus ( fixes #7856 ) ( #8126 )
2018-08-05 12:22:23 +02:00
Marcin Mikołajczak
b5d5fc9855
i18n: Make Polish translation more gender neutral + update ( #8119 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-03 00:09:24 +02:00
ThibG
8f61dfe044
Render custom emoji in display name on public profile ( #8115 )
2018-08-02 15:08:29 +02:00
Thibaut Girka
d99f8674ab
Fix styling of toot prepended text on public profiles
...
Fixes how “Pinned toot”, “… boosted” etc. are styled on public profiles.
2018-08-02 12:43:00 +02:00
ThibG
b66ce62579
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-02 11:57:52 +02:00
Thibaut Girka
30c9fef4d4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/settings.yml
2018-08-01 22:20:25 +02:00
Yamagishi Kazutoshi
9e0015e834
Do not show pinned toots when min_id is set ( #8111 )
2018-08-01 17:57:02 +02:00
Thibaut Girka
52b61a8b71
Delete leftovers from keyword_mutes
2018-08-01 16:49:27 +02:00
ThibG
e77e055739
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-01 15:29:35 +02:00
Thibaut Girka
8d2f582bf7
Fix toot styling on public pages
...
The public pages now use CSS from the WebUI to style toots, but the glitch-soc
UI is widely different. Hack around that for now by hardcoding upstream-like
values.
2018-08-01 00:18:42 +02:00
Thibaut Girka
d87eac4663
Reintroduce glitch-soc avatar styling in public pages
2018-08-01 00:18:42 +02:00
Thibaut Girka
89b05c7d68
[Glitch] Do not hide hashtag timeline in mobile view, make it full-window
...
Port d39e0ad4d5
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
658fc6bc1e
[Glitch] Compensate for scrollbar disappearing when media modal
...
Port a78672ae50
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
28cdf3da09
[Glitch] Show media modal on public timeline
...
Port c1427f90f6
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
8c4fc00ece
[Glitch] Add missing formatting to the text in hero widget
...
Port bdb76122bc
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
ca256cca22
Port profile redesign to glitch-soc
...
Port 13df3889f0
to glitch-soc
2018-08-01 00:18:42 +02:00
Thibaut Girka
1159490f00
Merge branch 'master' into glitch-soc/merge-upstream
...
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
Eugen Rochko
934d50daf0
Add separate setting for sidebar text (site_short_description) ( #8107 )
...
* Add separate setting for sidebar text (site_short_description)
* Fix tests
2018-07-31 18:59:34 +02:00
Thibaut Girka
4277328e9c
Drop glitch-style account bio fields
...
Upstream's implementation has been merged a while ago and is the preferred
way to set fields, as it is the only one compatible with upstream and is
more user-friendly.
This commit deletes the legacy glitch-soc FrontMatter functionality in order
to clean up the code and make it easier to maintain.
2018-07-31 16:26:36 +02:00
Thibaut Girka
919fc15097
Disallow remote users from viewing local-only toots
2018-07-31 15:41:04 +02:00