e4c82e33e4
Merge pull request #512 from ThibG/glitch-soc/fixes/fix-ckbox-color
...
Change notification cleaning checkbox color (fixes #511 )
7 years ago
0553496b76
Change notification cleaning checkbox color ( fixes #511 )
7 years ago
2289250f69
Merge pull request #503 from glitch-soc/merge-upstream
...
Merge upstream
7 years ago
6dd676e006
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
config/locales/pl.yml
The conflict in config/locales/pl.yml concerns the themes key, which is
not used in glitchsoc. Resolution: remove the themes key-related
changes, i.e. accept-ours.
7 years ago
810f92e697
🌍 : 🇵🇱 ⬆️ ( #7580 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
f93806ea55
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
cc230e5d57
Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixes
...
Port various WebUI fixes from upstream
7 years ago
d0b2f71501
Fix width only being set for standalone media
7 years ago
3ad3cee44c
[Glitch] Use real container width in MediaGallery srcSet
...
Port 22e067bf5c
7 years ago
463078dcc4
[Glitch] Do not override the default push notification settings
...
Port 1951ff41b3
7 years ago
162f1863a7
Merge pull request #499 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
5ea643b279
Save onlyMedia prop when pinning column ( #7575 )
7 years ago
40ef46dbef
Display only domain of report account if remote under comment ( #7574 )
7 years ago
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.
7 years ago
98ecadbf99
Merge pull request #492 from ThibG/glitch-soc/fixes/port-scss
...
Port SCSS changes from upstream
7 years ago
46061dc041
Add exact attribute to WrappedRoute for community timeline ( #7572 )
...
* Add extra attribute to WrappedRoute for community timeline
* fix
7 years ago
292c987522
Bump version to 2.4.0rc5
7 years ago
22e067bf5c
Use real container width in MediaGallery srcSet ( #7571 )
...
Fix #7568
7 years ago
32d4372381
Use #any? instead of #exists? when checking media attachments ( #7570 )
...
If media_attachments are not loaded, SQL query is the same, but
the #exists? method performs SQL query even if preloaded
7 years ago
e583f110c3
Unescape HTML entities in rich web push notifications in web UI ( #7569 )
7 years ago
c53aacdfa0
Recover glitch-soc specific styles that were removed by accident
7 years ago
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
7 years ago
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.
7 years ago
7403e5d306
Add media timeline ( #6631 )
7 years ago
05f8c375a2
Remove small pagination limit from context API ( #7564 )
...
Fix #7557
7 years ago
9ada532809
Convert rich push notifications to plaintext in webapp ( #7563 )
...
* Convert rich push notifications to plaintext in webapp
* Fix code style issues
7 years ago
6eb2bc4348
[i18n] Update for Occitan ( #7558 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
7 years ago
779eb07d75
Improve default background of public profile header ( #7556 )
...
Looks better when no header image is set
7 years ago
d250e072a2
In footer, replace text "Mastodon" with logo
...
Port SCSS changes from 93c66f0c03
7 years ago
9ed8051961
Add preference to hide following/followers lists
...
Port SCSS from 1e02dc8715
7 years ago
50540446f5
[Glitch] Improvements to toots display in admin view
...
Port SCSS changes from 0f2fbf7d05
7 years ago
2f9bd86f6e
Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed
...
Widen clickable area of toots
7 years ago
56a3d2b64b
Merge pull request #494 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
7 years ago
0bdda362c9
[RU] Updated strings for 2.4.0 ( #7555 )
7 years ago
07672e0609
🌍 : 🇵🇱 ⬆️ ( #7554 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
7 years ago
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
7 years ago
8378b72eba
Ensure push subscription is immediately removed when application is revoked ( #7548 )
...
* Ensure push subscription is immediately removed when application is revoked
* When token is revoked from app, unsubscribe too
7 years ago
5910eb9b61
Add :few keys for sk lang plurals ( #7551 )
...
* Add :few keys for sk lang plurals
* i18n-tasks normalize
7 years ago
50db106252
Disables autocorrect/autocapitalize on remote username field. ( #7549 )
7 years ago
4e1400cecb
Cache media only when storage can be freed ( #7547 )
7 years ago
bcbb6aa46f
Bump version to 2.4.0rc4
7 years ago
1bbe12254d
Improve direct message warning again ( #7546 )
7 years ago
93c66f0c03
In footer, replace text "Mastodon" with logo ( #7545 )
7 years ago
587da93152
checking http status code with range ( #7544 )
7 years ago
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.
7 years ago
1951ff41b3
Do not override the default push notification settings ( #6037 )
7 years ago
138512d204
Remove outline ( #7543 )
7 years ago
7871d29aff
Skip pagination logic for pinned account timelines in reducer ( #7540 )
...
Fix #7516
7 years ago
0b1f88cfd5
Upgrade posix-spawn to master ( #7542 )
7 years ago
ThibG
