mastodon

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	36e47a31e3	Enforce order on authorized applications page (#7587 ) Fix #7586	8 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	8 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	8 years ago
Jenkins	2636a23092	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	7293b9fc61	Ensure unfilled fields are shown when errors are shown (#7523 ) Fix #7486	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 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	8 years ago
Eugen Rochko	cb5b5cb5f7	Slightly reduce RAM usage (#7301 ) * No need to re-require sidekiq plugins, they are required via Gemfile * Add derailed_benchmarks tool, no need to require TTY gems in Gemfile * Replace ruby-oembed with FetchOEmbedService Reduce startup by 45382 allocated objects * Remove preloaded JSON-LD in favour of caching HTTP responses Reduce boot RAM by about 6 MiB * Fix tests * Fix test suite by stubbing out JSON-LD contexts	8 years ago
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: db/schema.rb	8 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	8 years ago
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	8 years ago
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898 )	8 years ago
Thibaut Girka	167a2ecde0	Fix migration page style	8 years ago
imncls	3afc6174f5	Fix data export page error	8 years ago
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	8 years ago
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	8 years ago
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	8 years ago
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448 )	8 years ago
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	8 years ago
Aboobacker MK	112b1fa265	Redirect to 2FA creation page when otp_secret is not available (#6314 )	8 years ago
David Yip	395e64e858	Thank you, Officer Murphy	8 years ago
David Yip	514db316f7	The flavour parameter is unused, so omit it (#317 )	8 years ago
David Yip	6fcb870d96	Allow for user object to be empty. Fixes #317 . If a flavour has only one skin, the skin selector will be omitted. This omits the user[setting_skin] field, and because that's the only user[...] field on the page, the entire user object will not be present in the request handler's params object. This commit accounts for that scenario by avoiding params.require(:user) and instead picking out what we need from the params hash.	8 years ago
David Yip	bf1eb0912c	Set packs on 2FA-related pages. Fixes #271 . Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor	8 years ago
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	a3b2ea599d	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026 )	8 years ago
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	8 years ago
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	8 years ago
David Yip	017fc81caf	Prepend check_enabled_deletion to Settings::DeletesController (#229 ) The specs for Settings::DeletesController include an example that sets Settings.open_deletion to false and expects the "if deletion is not available, redirect to root" logic to run. However, this spec does not set up a user, which means that the spec (intentionally or otherwise) expects this redirection to work with unauthenticated access. We should preserve that behavior. To do so, we prepend the deletion check to the action chain set up by Settings::BaseController, so that said check occurs before the authenticate_user! check.	8 years ago
kibigo!	5bed0f10ed	Various fixes	8 years ago
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	8 years ago
kibigo!	541fe9b110	Skins support	8 years ago
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
nullkal	1b57d4dd3a	Fix account migration feature (#5837 ) * Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting	8 years ago
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	8 years ago
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832 )	8 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at `3023725936`	8 years ago
Eugen Rochko	fbef909c2a	Add option to block direct messages from people you don't follow (#5669 ) * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	8 years ago
David Yip	d9485e6497	Assume Glitch::KeywordMute#destroy! works and error out if it doesn't. There's nothing useful we can display if the destroy action messes up, so might as well assert it does and complain loudly if it doesn't.	8 years ago
David Yip	d5c8ebe205	Use edit template for displaying errors in update.	8 years ago
David Yip	4c84513e04	Use current_account from ApplicationController. This avoids copy-pasting definitions of set_account.	8 years ago
David Yip	670e6a33f8	Move KeywordMute into Glitch namespace. There are two motivations for this: 1. It looks like we're going to add other features that require server-side storage (e.g. user notes). 2. Namespacing glitchsoc modifications is a good idea anyway: even if we do not end up doing (1), if upstream introduces a keyword-mute feature that also uses a "KeywordMute" model, we can avoid some merge conflicts this way and work on the more interesting task of choosing which implementation to use.	8 years ago
David Yip	cd04e3df58	Fill in create, edit, update, and destroy for keyword mutes interface. Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	8 years ago
David Yip	2e03a10059	Spike out index and new views for keyword mutes controller.	8 years ago
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164 . This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	8 years ago
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393 ) * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	8 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447 ) * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	9 years ago
Akihiko Odaki	cdacac8c6c	Fix order of paginated accounts in FollowerDomainsController and spec (#3357 ) * Fix order of paginated accounts in FollowerDomainsController Unordered pagination could result in unexpected behavior. * Cover Settings::FollowerDomainsController more	9 years ago

1 2 3

108 Commits (893f2aff2052b0809c70afac8a27b3e164635b44)