3ad3cee44c
[Glitch] Use real container width in MediaGallery srcSet
...
Port 22e067bf5c
2018-05-21 17:55:07 +02:00
463078dcc4
[Glitch] Do not override the default push notification settings
...
Port 1951ff41b3
2018-05-21 17:52:26 +02:00
a4c9bda771
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/styles/mastodon-light.scss
config/locales/en.yml
config/locales/fr.yml
config/locales/simple_form.pl.yml
config/themes.yml
Conflicts resolved by deleting config/themes.yml,
marking app/javascript/styles/mastodon-light.scss as added,
and taking all new translation strings, not removing anything from
them.
2018-05-21 16:40:02 +02:00
46061dc041
Add exact attribute to WrappedRoute for community timeline ( #7572 )
...
* Add extra attribute to WrappedRoute for community timeline
* fix
2018-05-21 16:26:00 +02:00
22e067bf5c
Use real container width in MediaGallery srcSet ( #7571 )
...
Fix #7568
2018-05-21 16:04:01 +02:00
e583f110c3
Unescape HTML entities in rich web push notifications in web UI ( #7569 )
2018-05-21 16:00:56 +02:00
c53aacdfa0
Recover glitch-soc specific styles that were removed by accident
2018-05-21 15:56:47 +02:00
41b2cfe5b8
i18n: Update Simplified Chinese translations ( #7565 )
...
* i18n: (zh-CN) #7532
* i18n: (zh-CN) #6984
* i18n: (zh-CN) #7391 , #7507
* i18n: (zh-CN) #6998
* i18n: (zh-CN) #7074
* i18n: (zh-CN) #7000 , #7032 , #7131 (#7032 , #7040 )
* i18n: (zh-CN) #7130 , #7188
* i18n: (zh-CN) #6486
* i18n: (zh-CN) #6292
* i18n: (zh-CN) #7347
* i18n: (zh-CN) #6661
* i18n: (zh-CN) #6425
* i18n: (zh-CN) #6597
* i18n: (zh-CN) #6695
* i18n: (zh-CN) #6325
* i18n: (zh-CN) #6460 , #7375
* i18n: (zh-CN) #6872
* i18n: (zh-CN) #6818
* i18n: (zh-CN) #7452
* i18n: (zh-CN) #7176
* i18n: (zh-CN) #6460
* i18n: (zh-CN) #7213
* i18n: (zh-CN) #7376
* i18n: (zh-CN) #6556
* i18n: (zh-CN) #6645
* i18n: (zh-CN) #6448
* i18n: (zh-CN) #5303
* i18n: (zh-CN) #7445
* i18n: (zh-CN) Normalization and improvements
* i18n: (zh-CN) #7391
* i18n: (zh-CN) #6627
* i18n: (zh-CN) #6956 , #7546
* i18n: (zh-CN) #6636
* i18n: (zh-CN) #6610 , #6875
* i18n: (zh-CN) #6887
* i18n: (zh-CN) #4514
* i18n: (zh-CN) #6628
* i18n: (zh-CN) #6771
* i18n: (zh-CN) #6772
* i18n: (zh-CN) #7178
* i18n: (zh-CN) #7521
* i18n: (zh-CN) #6570
* i18n: (zh-CN) #6593
* i18n: (zh-CN) #6423
* i18n: (zh-CN) #6157
* i18n: (zh-CN) #7089
* i18n: (zh-CN) #6733
* i18n: (zh-CN) #7072
* i18n: (zh-CN) #6520
* i18n: (zh-CN) Improvment
* i18n: (zh-CN) #6631
2018-05-21 13:40:48 +02:00
ea969000a5
Add a light theme ( #7027 )
...
* Add a light theme to Mastodon
This add a second default theme to Mastodon. This new theme is supposed to be a light version of the dark original one.
* Update locales
Update the English and French locales.
* Change capitalization of hexadecimal triplets
Change capitalization of hexadecimal color codes to match Code Climate's recomandation.
* Add variable
Add a new variable to use instead of hardcoding a color. Change made to match Code Climate's recomandation.
* Use Mastodon branding palette
Replace the colors previously used by the ones found in Mastodon branding palette.
The resulting theme is lighter than the previous version.
* Make the overlay background white
Make the overly background used on on sensitive medias white instead of black
* Change the color used on the envelop icon
Change the color used on the envelop icon for a darker one. The same color is now used on both the envelop icon and the padlock icon.
* Add contrast
Add contrast to various places inside the main interface and the profile pages.
* Change the text color used in the compose form
Change the text color used in the compose form for a darker one.
* Make the code easier to read
Add some blank lines to make the code easier to parse for a human eye.
* Change columns' background default colors
Change columns' background default colors, making the composition column the darker one.
* Change the color of the log in button
Change the log in button's text color to make it more readable.
* Fix the color of the boost buttons on the landing page
The disabled boost buttons on the landing page are now of the same color that the other disabled buttons.
* Change the colors used in the dropdown menu
Make the dropdown menu light instead of dark.
2018-05-21 13:40:31 +02:00
7403e5d306
Add media timeline ( #6631 )
2018-05-21 12:43:38 +02:00
9ada532809
Convert rich push notifications to plaintext in webapp ( #7563 )
...
* Convert rich push notifications to plaintext in webapp
* Fix code style issues
2018-05-21 03:35:37 +02:00
6eb2bc4348
[i18n] Update for Occitan ( #7558 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
2018-05-20 20:26:32 +02:00
779eb07d75
Improve default background of public profile header ( #7556 )
...
Looks better when no header image is set
2018-05-20 13:09:28 +02:00
d250e072a2
In footer, replace text "Mastodon" with logo
...
Port SCSS changes from 93c66f0c03
2018-05-20 11:29:06 +02:00
9ed8051961
Add preference to hide following/followers lists
...
Port SCSS from 1e02dc8715
2018-05-20 11:28:58 +02:00
50540446f5
[Glitch] Improvements to toots display in admin view
...
Port SCSS changes from 0f2fbf7d05
2018-05-20 11:28:58 +02:00
2f9bd86f6e
Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed
...
Widen clickable area of toots
2018-05-20 03:03:39 -05:00
07672e0609
🌍 : 🇵🇱 ⬆️ ( #7554 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-20 00:55:56 +02:00
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
6aa5ea1b5d
Weblate translations (2018-05-20) ( #7552 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/
* Translated using Weblate (Italian)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/it/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (French)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Italian)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 83.7% (525 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (627 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Galician)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Japanese)
Currently translated at 93.7% (60 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Galician)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (French)
Currently translated at 99.5% (624 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (French)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (64 of 64 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (French)
Currently translated at 99.6% (625 of 627 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Catalan)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/
* Translated using Weblate (Galician)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/
* Translated using Weblate (Japanese)
Currently translated at 93.9% (62 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (627 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.6% (626 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (628 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (295 of 295 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (French)
Currently translated at 99.6% (626 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Swedish)
Currently translated at 99.5% (625 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/
* Translated using Weblate (Slovak)
Currently translated at 98.4% (65 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Swedish)
Currently translated at 95.4% (63 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/
* Translated using Weblate (Japanese)
Currently translated at 99.8% (627 of 628 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Persian)
Currently translated at 100.0% (66 of 66 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (76 of 76 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fa/
* i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
2018-05-19 21:42:21 +02:00
4e1400cecb
Cache media only when storage can be freed ( #7547 )
2018-05-19 19:22:11 +02:00
1bbe12254d
Improve direct message warning again ( #7546 )
2018-05-19 18:37:33 +02:00
93c66f0c03
In footer, replace text "Mastodon" with logo ( #7545 )
2018-05-19 16:10:55 +02:00
4b94e9c65e
Improve payload format of Web Push API now that it's open ( #7521 )
...
> Good lord what is happening in there
Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification ). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload:
```json
{
"access_token": "...",
"preferred_locale": "en",
"notification_id": "12345",
"notification_type": "follow",
"title": "So and so followed you",
"body": "This is my bio",
"icon": "https://example.com/avatar.png "
}
```
The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.
2018-05-19 14:46:47 +02:00
1951ff41b3
Do not override the default push notification settings ( #6037 )
2018-05-19 14:45:58 +02:00
138512d204
Remove outline ( #7543 )
2018-05-19 12:16:52 +02:00
7871d29aff
Skip pagination logic for pinned account timelines in reducer ( #7540 )
...
Fix #7516
2018-05-19 02:51:29 +02:00
9d6788b30b
Prevent click on video from opening detailed toot
2018-05-18 17:49:51 +02:00
2154bd1b5a
Widen clickable area of toots
2018-05-18 17:33:58 +02:00
625c4f36ef
Merge pull request #490 from glitch-soc/merge-upstream
...
Merge with tootsuite @ 57b503d4ef
2018-05-18 17:20:32 +02:00
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
023dfa119e
Merge pull request #487 from ThibG/glitch-soc/cleanup
...
Remove service worker code that has never been used
2018-05-18 08:37:31 -05:00
2beeea1e7d
Change Japanese translation for privacy.private.short ( #7535 )
...
The old translation means "hidden," but it is vague in terms that it does
not specify the scope status is hidden. The new translation is a literal
translation of "Followers-only," without such ambiguity.
2018-05-18 22:30:45 +09:00
81e3ec4d61
Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji
...
[Glitch] Enable custom emojis in profiles
2018-05-18 07:55:00 -05:00
dafd7afc5e
Use randomized setTimeout when fallback-polling and re-add since_id ( #7522 )
2018-05-18 02:32:35 +02:00
1e02dc8715
Add preference to hide following/followers lists ( #7532 )
...
* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix #6901
* Add preference
* Add delegation
* Fix issue
* Fix issue
2018-05-18 02:26:51 +02:00
07baa1ddb5
[Glitch] Open video modal on public UI
...
Port d9b2f84c92
2018-05-17 18:37:00 +02:00
94db024e4c
[Glitch] Combine similar components into one on public UI
...
Port f9afd06221
2018-05-17 18:37:00 +02:00
dd1d98f9cf
[Glitch] Show card modal on public pages
...
Port 16fee0335f
2018-05-17 18:37:00 +02:00
52b2f18b15
[Glitch] Enable custom emojis in profiles
...
Port 61a9018607
2018-05-17 15:57:16 +02:00
ca49ad86c6
Remove service worker code that has never been used
2018-05-17 15:39:37 +02:00
78ac246b87
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Gemfile
Solved conflicts by using upstream's line for posix-spawn
2018-05-16 21:52:38 +02:00
80aad16e10
Merge pull request #405 from ThibG/glitch-soc/features/dm-from-menu
...
[Glitch] Feature: Direct message from menu
2018-05-16 20:17:08 +02:00
9712d59dda
Merge pull request #485 from ThibG/glitch-soc/fixes/light-theme-textarea-color
...
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 20:16:59 +02:00
784712791d
[Glitch] Reword the direct message warning
...
Port 53c2164e9c
2018-05-16 19:45:30 +02:00
97c69de416
[Glitch] Feature: Direct message from Statuses
...
Port 904a2479dd
2018-05-16 19:45:30 +02:00
fb6de5310d
[Glitch] Fix issues with sending direct messages from user profile
...
Port 4fd71accd4
2018-05-16 19:45:30 +02:00
a5fac975f3
[Glitch] Feature: Direct message from menu
...
Port d1f34151ae
2018-05-16 19:45:30 +02:00
eb9c9855ce
Fix mastodon-light background color of the composer textarea when posting
2018-05-16 19:37:44 +02:00
5e87c79d25
Russian language for 2.4.0 ( #7512 )
...
* Russian language for 2.4.0
* Russian language for 2.4.0
* bundle exec i18n-tasks normalize
* RU: Updated some strings after new commits appeared
2018-05-16 16:25:11 +02:00
Thibaut Girka
