105 Commits (75279377583c6e2aa04cc8d7380c593979630b38)

Author	SHA1	Message	Date
Claire	0e74d4da59	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.	3 years ago
Eugen Rochko	fe2d6fe105	Fix wrong aspect ratio of logo in icons (#18639)	3 years ago
Claire	15929a3d59	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.	3 years ago
Eugen Rochko	45aa5781ce	Change brand color and logotypes (#18592) ... - Add rake task for generating Apple/Android icons and favicons from SVG - Add rake task for generating PNG icons and logos for e-mails from SVG - Remove obsolete Microsoft icons and configuration - Remove PWA shortcut icons	3 years ago
Claire	c85c3fb708	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated `jest`, moving its config in a separate file. This config was modified in glitch-soc, so the corresponding changes have been ported to `jest.config.js`	3 years ago
rinsuki	6e736f2452	fix: embed.js doesn't expands iframes height (#18301) ... also including some refactoring: - add `// @ts-check` - use Map to completely avoid prototype pollution - assign random id to each iframe for reduce chance to brute-force attack, and leak of iframe counts - check iframe.contentWindow and MessageEvent.source to validate message is coming from correct iframe (it works on latest Chrome/Firefox/Safari but I'm not sure this is allowed by spec) follow-up of #17420 fix #18299	3 years ago
Claire	392ca0472a	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.	3 years ago
Gaelan Steele	74e20f22cd	Fix light-mode emoji borders. (#18131)	3 years ago
Claire	098f2bc1e1	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Rohan Sharma	4d6d4b43c6	Fixed prototype pollution bug and only allow trusted origin (#17420)	3 years ago
Claire	0157caacef	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
Eugen Rochko	abd7b4636a	Add assets from Twemoji 13.1.0 (#16345) ... * Add assets from Twemoji 13.1.0 * Update emoji-mart	4 years ago
Claire	e2a2bc9021	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.	4 years ago
Claire	e78d06eecf	Add border to 🚲 emoji (#16035)	4 years ago
Claire	d8fdbb054e	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.	4 years ago
Claire	a8139ab016	Add borders to 📱 and 📲 emojis (#15794)	4 years ago
Claire	e4f8679eae	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.	4 years ago
Marcin Mikołajczak	9342705e6b	Add app shortcuts (#15234) ... * Add app shortcuts Signed-off-by: mkljczk <me@mkljczk.pl> * Fix codeclimate issues Signed-off-by: mkljczk <me@mkljczk.pl> * Change shortcuts Signed-off-by: mkljczk <me@mkljczk.pl> * More consistent new-status icon Signed-off-by: mkljczk <me@mkljczk.pl>	4 years ago
Thibaut Girka	a7aedebc31	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.	5 years ago
ThibG	91eecd1b3c	Add border around 🕺 emoji (#14769) ... Fixes #14768	5 years ago
Thibaut Girka	3fefb7909b	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/webpack/shared.js`: Upstream has changed how Tesseract.js gets included and dropped a dependency. The conflict is caused by glitch-soc having different code due to its theming system. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream refactor/code style change in a place we replaced upstream's repo URL with ours. Ported upstram changes, keeping our repo URL. - `yarn.lock`: Upstream dropped dependencies, one of which was textually too close to a glitch-soc-specific dependency. Not a real conflict.	5 years ago
ThibG	f0b6ddd979	Add border around 🐞 emoji (#14712)	5 years ago
Thibaut Girka	12c8ac9e14	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict due to glitch-soc having to take care of local-only pinned toots in that controller. Took upstream's changes and restored the local-only special handling. - `app/controllers/auth/sessions_controller.rb`: Minor conflicts due to the theming system, applied upstream changes, adapted the following two files for glitch-soc's theming system: - `app/controllers/concerns/sign_in_token_authentication_concern.rb` - `app/controllers/concerns/two_factor_authentication_concern.rb` - `app/services/backup_service.rb`: Minor conflict due to glitch-soc having to handle local-only toots specially. Applied upstream changes and restored the local-only special handling. - `app/views/admin/custom_emojis/index.html.haml`: Minor conflict due to the theming system. - `package.json`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file. - `yarn.lock`: Upstream dependency updated, too close to a glitch-soc-only dependency in the file.	5 years ago
leo60228	e0f55f374c	Add emojis:generate_borders Rake task (#13773) ... * Add emojis:generate_borders Rake task * Address review * Border all dark emoji * Combine stroke with filter to reduce artifacting * Cleanup Camera with Flash * Add stroke-linejoin="round" The previous filter and tweaks were effectively a poor imitation of it. There are no artifacts for any dark emoji now! * Set stroke-width using property This fixes old versions of Firefox. * Store emoji in string instead of array * Use separate arguments for each path segment * Remove "background: black;"	5 years ago
Thibaut Girka	4a70792b4a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.	5 years ago
ThibG	e1629a7758	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679) ... * Make sure wicg-inert doesn't rely on inline CSS * Remove unsafe-inline from style-src	5 years ago
Thibaut Girka	63dc7cfa90	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
D Anzorge	29f5353f8b	Update Twemoji to 12.1.5 (#13021) ... * Update Twemoji to 12.1.5 SVGs from Twemoji repo https://github.com/twitter/twemoji * Update emoji_map.json to Unicode 12	5 years ago
Thibaut Girka	ff67385cfb	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code	5 years ago
koyu	823dcc4dc6	Updated Twemoji to 12.1.3 (#12342)	5 years ago
Thibaut Girka	1488be7d96	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	6 years ago
Eugen Rochko	28636f43e4	Add OCR tool to media editing modal (#11566)	6 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb	6 years ago
ThibG	c4f2433300	Disallow robots from indexing /interact/ (#10666) ... This does not provide any new information and may just triple the number of crawled pages	6 years ago
Eugen Rochko	80388a3ffe	Change error graphic to hover-to-play (#10055) ... Fix #6060	6 years ago
Thibaut Girka	06cc04fd23	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
nightpool	a5992e5883	Change robots.txt to exclude only media proxy URLs (#10038) ... * Revert "Change robots.txt to exclude some URLs (#10037)" This reverts commit 80161f4351. * Let's block media_proxy /media_proxy/ is a dynamic route used for requesting uncached media, so it's probably bad to let crawlers use it * misleading comment	6 years ago
Eugen Rochko	80161f4351	Change robots.txt to exclude some URLs (#10037) ... - Exclude static assets - Exclude uploaded files - Exclude alternate versions of the profile page - Exclude media proxy URLs	6 years ago
Thibaut Girka	0c2d48b60a	Replace animated oops.gif by a non-animated image ... Fixes #6060	6 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	7 years ago
Dryusdan	17b928502a	update twemojie to v2 (#7911)	7 years ago
Maciek Baron	ca2cc556f1	Crush PNGs to reduce overall size (#7954)	7 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Renato "Lond" Cerqueira	268d90e810	Rename emoji sheet to avoid caching issue (#7777)	7 years ago
Renato "Lond" Cerqueira	0c3ce41031	Update to emojimart 2.6.1 (#7746) ... * Update to emojimart 2.6.1 WIP using local updated version. Sheet comes from emoji-data@4.0.4, file sheet_twitter_32_indexed_256.png. * Update to 2.6.1 and uncompress data if needed * Remove changes that were not needed * Fix yarn lock file * Match emojiToShowFilter behavior to new version of emoji-mart * Fix codeclimate issue * Match custom emoji behavior to new version of emoji-mart * Replace emoji without shortcode in tests * Fix code climate issues	7 years ago
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Una	e057c0e525	Optimize public/headers/missing.png (#7084)	7 years ago
Thibaut Girka	cf754e6a91	Fix error 500 page	7 years ago
David Yip	f8e934f955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: README.md	7 years ago
Konrad Pozniak	cd252b794e	add new avatar placeholder missing.png (#6728)	7 years ago