glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	9b9e96eae5	Add "Edit profile" link to public profile page, increase bottom padding (#7754 )	7 years ago
David Yip	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	7 years ago
Eugen Rochko	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	7 years ago
ThibG	685cf5599f	Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape Fix glitch-style bio fields incorrect HTML escaping in public profiles	7 years ago
Thibaut Girka	cc8d81519e	Fix glitch-style bio fields incorrect HTML escaping in public profiles	7 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	7 years ago
Yamagishi Kazutoshi	0a7e8320b2	Add alternate for RSS (#7436 )	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Eugen Rochko	42cd363542	Bot nameplates (#7391 ) * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	7 years ago
Eugen Rochko	61a9018607	Enable custom emojis in profiles (notes, field values, display names) (#7374 ) Follow-up to #6124	7 years ago
Eugen Rochko	2ef9d65052	Improve rendering of bio fields (#7353 ) Fix #7335	7 years ago
Thibaut Girka	356d0214c9	Implement tootsuite-style account fields glitch-soc-style still in backup, both sharing the same SCSS style	7 years ago
David Yip	16d5217502	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json	7 years ago
ThibG	1c379b7ef4	Remove extra spaces from search API queries and public account headers (fixes #7129 ) (#7152 )	7 years ago
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: db/schema.rb	7 years ago
Eugen Rochko	78ed4ab75f	Add bio fields (#6645 ) * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	7 years ago
David Yip	67e77f230e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	7 years ago
ThibG	1364e9e4ae	Fix follow/unfollow buttons on public profile (fixes #7036 ) (#7040 ) * Fix follow/unfollow buttons on public profile - Present non-logged users with web+mastodon:// URLs for remote accounts - Present logged-in users with appropriate links (authorize_follows and remote_unfollows) for remote accounts * Do not cache rendered cards if user is logged in	7 years ago
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	7 years ago
David Underwood	123a343d11	[WIP] Enable custom emoji on account pages and in the sidebar (#6124 ) Federate custom emojis with accounts	7 years ago
David Yip	ab04be2f84	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: config/i18n-tasks.yml	7 years ago
Eugen Rochko	a568e3ca8e	Revert #6479 , hide sensitive text/images from OpenGraph previews (#6818 ) Display summary of attachments in description, and mark up content warning if present, e.g.: Attached: 3 images · Content warning: Dota 2 When text is not supposed to be hidden, it looks more like: Attached: 3 images Here is the text of the toot With #6817, multilinguagility should be assured...	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ff44b2e92d	Add missing meta description to profiles, some other SEO stuff (#6706 ) - Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles	7 years ago
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	7 years ago
Eugen Rochko	18513a978a	Improve public account cards (#6559 ) - Add follow/unfollow/remote follow buttons - Format the bio properly - Always show username@domain, even for local accounts	7 years ago
Ian McCowan	c33931b613	Fix prev/next links on public profile page (#6497 ) * Fix prev/next links on public profile page * Don't make pagination urls if no available statuses * Fix empty check method * Put left chevron before prev page link * Add scope for pagination "starting at" a given id * Status pagination try 2: s/prev/older and s/next/newer "older" on left, "newer" on right Use new scope for "newer" link Extract magic 20 page size to constant Remove max_id from feed pagination as it's not respected * Reinstate max_id for accounts atom stream * normalize	7 years ago
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	dbda87c31f	Revert #5772 (#6221 )	7 years ago
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772 ) * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	7 years ago
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	7 years ago
Yamagishi Kazutoshi	bfdcf76a64	Add “staff” badge to admin user pages (#5735 ) * Allow staff badge to change from setting to hidden * i18n: Update Polish translation	7 years ago
Eugen Rochko	58cede4808	Profile redirect notes (#5746 ) * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	7 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728 )	7 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	7 years ago
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615 ) Fix #5597	7 years ago
kibigo!	6610d57f91	Basic static metadata styling	7 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	7 years ago
Yamagishi Kazutoshi	9e0985d9e4	Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993 )	7 years ago
Eugen Rochko	8f8e677630	Clean up and improve generated OpenGraph tags (#4901 ) - Return all images as og:image - Return videos as og:image (preview) and og:video - Return profile:username on profiles	7 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb	7 years ago
Eugen Rochko	15093f9113	Shorten display of large numbers on public profiles (#4711 )	7 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675 ) * Pinned statuses * yarn manage:translations	7 years ago
Eugen Rochko	ca7ea1aba9	Redesign public profiles (#4608 ) * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	7 years ago
Eugen Rochko	a2aeacbfee	Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586 )	7 years ago
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	7 years ago
Eugen Rochko	1306d637a2	Fix oddities with public profile CSS (#4341 ) * Fix oddities with public profile CSS * Remove trailing whitespace	7 years ago

1 2 3

123 Commits (a8911616b6abdd95d00b1b17dd231a683726c006)