glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	72c454e2b3	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.	6 years ago
ThibG	42531f89f8	Merge pull request #492 from ThibG/glitch-soc/fixes/port-scss Port SCSS changes from upstream	6 years ago
Yamagishi Kazutoshi	4a0207e3ea	Add exact attribute to WrappedRoute for community timeline (#7572 ) * Add extra attribute to WrappedRoute for community timeline * fix	6 years ago
Eugen Rochko	bbdce87b80	Bump version to 2.4.0rc5	6 years ago
Eugen Rochko	765a8dad9a	Use real container width in MediaGallery srcSet (#7571 ) Fix #7568	6 years ago
Eugen Rochko	f68736088b	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	6 years ago
Eugen Rochko	ed4949c676	Unescape HTML entities in rich web push notifications in web UI (#7569 )	6 years ago
Thibaut Girka	cabd24ffc4	Recover glitch-soc specific styles that were removed by accident	6 years ago
SerCom_KC	8a8a47892a	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	6 years ago
Sylvhem	eeb6fd44e1	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.	6 years ago
Yamagishi Kazutoshi	ccc240b59c	Add media timeline (#6631 )	6 years ago
Eugen Rochko	b634cb45dc	Remove small pagination limit from context API (#7564 ) Fix #7557	6 years ago
Eugen Rochko	fe6ee50c7f	Convert rich push notifications to plaintext in webapp (#7563 ) * Convert rich push notifications to plaintext in webapp * Fix code style issues	6 years ago
Quentí	1de642e921	[i18n] Update for Occitan (#7558 ) * Update oc.json * Update oc.yml * Update simple_form.oc.yml	6 years ago
Eugen Rochko	21270d01a6	Improve default background of public profile header (#7556 ) Looks better when no header image is set	6 years ago
Thibaut Girka	8a42e4c450	In footer, replace text "Mastodon" with logo Port SCSS changes from `95385ebe3e` to glitch-soc	6 years ago
Thibaut Girka	99fccdb4e4	Add preference to hide following/followers lists Port SCSS from `aeceb63275`	6 years ago
Thibaut Girka	6452d871ca	[Glitch] Improvements to toots display in admin view Port SCSS changes from `4072475241` (I'm sorry for the animated rainbows)	6 years ago
David Yip	58626cc8d7	Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailed Widen clickable area of toots	6 years ago
David Yip	a06321752b	Merge pull request #494 from ThibG/glitch-soc/merge-upstream Merge upstream changes	6 years ago
Evgeny Petrov	d3c01f86ba	[RU] Updated strings for 2.4.0 (#7555 )	6 years ago
Marcin Mikołajczak	b4458906ba	🌍: 🇵🇱⬆️ (#7554 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
Thibaut Girka	c384e0f3de	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	6 years ago
Yamagishi Kazutoshi	20550e2641	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	6 years ago
Eugen Rochko	7eaa12c83a	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	6 years ago
Peter	bc20c2cd3a	Add :few keys for sk lang plurals (#7551 ) * Add :few keys for sk lang plurals * i18n-tasks normalize	6 years ago
Ash Furrow	3646b280d9	Disables autocorrect/autocapitalize on remote username field. (#7549 )	6 years ago
Akihiko Odaki	9e5edeaf3a	Cache media only when storage can be freed (#7547 )	6 years ago
Eugen Rochko	604eae1677	Bump version to 2.4.0rc4	6 years ago
Eugen Rochko	ef4a35cb62	Improve direct message warning again (#7546 )	6 years ago
Eugen Rochko	95385ebe3e	In footer, replace text "Mastodon" with logo (#7545 )	6 years ago
takayamaki	1f83fdff89	checking http status code with range (#7544 )	6 years ago
Eugen Rochko	70e678da43	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.	6 years ago
Akihiko Odaki	6bee19117f	Do not override the default push notification settings (#6037 )	6 years ago
bsky	097339b58a	Remove outline (#7543 )	6 years ago
Eugen Rochko	f69cb76bf8	Skip pagination logic for pinned account timelines in reducer (#7540 ) Fix #7516	6 years ago
MIYAGI Hikaru	f291907ae5	Upgrade posix-spawn to master (#7542 )	6 years ago
Eugen Rochko	c3fbb857a0	Do not raise delivery failure on 4xx errors, increase stoplight threshold (#7541 ) * Do not raise delivery failure on 4xx errors, increase stoplight threshold Stoplight failure threshold from 3 to 10 Status code 429 will raise a failure/get retried * Oops	6 years ago
Thibaut Girka	72c5d3dd80	Prevent click on video from opening detailed toot	6 years ago
Thibaut Girka	b6133837ad	Widen clickable area of toots	6 years ago
ThibG	6a831cd957	Merge pull request #490 from glitch-soc/merge-upstream Merge with tootsuite @ `1de7400dfc`	6 years ago
David Yip	38117daaa3	ci: Hack around a Travis condition, I guess	6 years ago
Eugen Rochko	48d2312c1a	Fix double-encoding of display name in title and e-mails (#7534 )	6 years ago
David Yip	7ca6a2437c	ci: Bump .travis.yml to 2.5.1	6 years ago
David Yip	3c3e6d0e9b	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	6 years ago
David Yip	d6aa91f87d	Merge pull request #487 from ThibG/glitch-soc/cleanup Remove service worker code that has never been used	6 years ago
Akihiko Odaki	d8666dc595	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.	6 years ago
David Yip	7deaadb048	Merge pull request #488 from ThibG/glitch-soc/features/accounts-custom-emoji [Glitch] Enable custom emojis in profiles	6 years ago
David Yip	e6e5d6ca4d	Merge pull request #489 from ThibG/glitch-soc/features/port-public-ui-changes Port public UI changes from upstream	6 years ago
Eugen Rochko	1de7400dfc	Resolve unknown status from Add activity, skip Remove if unknown (#7526 ) Fix #7518	6 years ago

1 2 3 4 5 ...

6632 Commits (72c454e2b3db6732138e903e541b2f2f3180fa8f) All Branches Search

6632 Commits (72c454e2b3db6732138e903e541b2f2f3180fa8f)

All Branches