glitchier-soc

Commit Graph

Author	SHA1	Message	Date
imncls	c0aabbec0f	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	7 years ago
Eugen Rochko	51e1e65c84	Fix container regression (#6531 ) * Update public.html.haml * Update auth.html.haml * Update modal.html.haml	7 years ago
Eugen Rochko	ad1f541bd7	Redesign landing page (again) (#6486 ) * Redesign landing page (again) * Move login form in small version to the right column * Display closed registrations message * Add site setting for the hero image * Fix test * Increase spacing, maximum width, change call to action section	7 years ago
Eugen Rochko	f6884555d7	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	7 years ago
David Yip	596deb050b	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: Gemfile config/locales/simple_form.pl.yml	7 years ago
Eugen Rochko	9b7490cede	Save video metadata and improve video OpenGraph tags (#6481 ) * Save metadata from video attachments, put correct dimensions into OG tags * Add twitter:player for videos * Fix code style and test	7 years ago
Eugen Rochko	5a5920f1bd	Do not hide NSFW media/CW'd text in OpenGraph tags (#6479 ) Reasoning: HTML title tag affects everyone. But OpenGraph only affects when somebody is deliberately sharing the content, usually in an environment where such content is expected. Hiding the content in OpenGraph tags results in deceitful previews which inhibit the shareability of the post. Example: Somebody writes a clever post about politics but kindly puts a "uspol" content warning on it. Mastodon users are thankful, but sharing this post on another platform results in non-Mastodon users believing the entire contents of the post is "uspol" and not clicking through/reading and re-sharing.	7 years ago
Jenkins	3a1f58e9eb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	d12bff875e	Fix password recovery (#6459 ) * Fix password recovery * Use “resource” instead of “current_user”	7 years ago
David Yip	799b205766	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	7 years ago
Eugen Rochko	219b28e172	Add preference to always display sensitive media (#6448 )	7 years ago
David Yip	4f8122a98c	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	7 years ago
Renato "Lond" Cerqueira	6528c0c101	Add option to show only local toots in timeline preview (#6292 ) * Add option to show only local toots in timeline preview Right know, toots from all the known fediverse are shown in the main page of an instance. That however doesn't reflect the instance itself. With this option the admin may choose to display only local toots so that users checking the instance get a better idea of internal conversations. * Fix issues pointed by codeclimate and eslint * Add default message for community timeline * Update pl.yml	7 years ago
Eugen Rochko	5322013f25	CAS + SAML authentication feature (#6425 ) * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	7 years ago
David Yip	6d1023b2e9	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Charlotte Fields	9c94c1e66f	moved save button (#3792 ) * moved save button * added save back to the bottom * Update show.html.haml	7 years ago
Akihiko Odaki	f35fadcb9a	Unify links container implementation in about pages (#6382 ) They were redundant, and also had a inconsistency; the button for "other instances" had an icon for the external link in "more" page, but it didn't in the other pages. This unifies the implementation, and the external link icon is now shown in all the about pages.	7 years ago
Alexander	23ce0c86da	pam authentication (#5303 ) * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	7 years ago
David Yip	87517e2dd8	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	7 years ago
Eugen Rochko	6278ffdba3	Add direction tags to HTML e-mails for RTL languages (#6373 )	7 years ago
Jenkins	3cd4a0804b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
ThibG	42457924eb	Display deleted users' role as “Suspended” (#6339 ) Follow-up to `87ee458079` which missed a spot where the same error occurs.	7 years ago
Akihiko Odaki	a87bb3f4f6	Resolve URL for local account in follow authorization success view (#6324 )	7 years ago
David Yip	a95ca95b7b	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
Eugen Rochko	d9421e01df	Fix invalid value passed to full_asset_url in mailers (#6312 )	7 years ago
David Yip	d000f5dd80	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
Iijima Yasushi	c8d971a5c1	Change mailer avatar url (#6309 ) * Change mailer avatar url * Use full_asset_url method	7 years ago
David Yip	03f157f6da	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	896cadceed	Improve HTML e-mails based on Litmus tests (#6301 ) * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
Eugen Rochko	5f9c017c01	Make text e-mails consistent with HTML ones in UserMailer (#6291 ) * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs	7 years ago
David Yip	d45ebe26dc	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	b0f2bff481	Replace tutorial modal with welcome e-mail (#6273 ) * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	7 years ago
Jenkins	8c41fb4acc	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
mayaeh	ef20e5d3fd	Change mailer image url (#6279 ) * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	7 years ago
Eugen Rochko	000b0baac2	HTML e-mails for NotificationMailer (#6263 ) * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	7 years ago
Yamagishi Kazutoshi	d60d5fbd26	Change image URL in mailer to full path (#6264 )	7 years ago
kibi!	be525dd4db	Fix mailer to use webpack core	7 years ago
David Yip	de7283a318	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	7 years ago
Eugen Rochko	9613c3238c	HTML e-mails for UserMailer (#6256 ) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	7 years ago
Jenkins	e6049e6fd0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Jeong Arm	73b6f2ebe9	Handle sessions that can't be translated (#6245 ) * Handle sessions that can't be translated This commit fixes #6165. * Fix typo	7 years ago
David Yip	1a7f8eb723	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: db/schema.rb	7 years ago
Eugen Rochko	6d9f2924ad	Fix #6204 : Use content warning for page title when present (#6231 )	7 years ago
kibigo!	134e6590c6	Don't show skins selector when there's only one (#256 )	7 years ago
Jenkins	1f469edac1	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	c8f0be1d6d	Revert #5772 (#6221 )	7 years ago
Jenkins	8704a190c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
SerCom_KC	154bd8db56	Update Simplified Chinese translations (#6215 ) * i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations	7 years ago
Jenkins	86007e913d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Quenty31	cf9323449e	l10n Occitan language: mailer update (#6193 ) * Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb	7 years ago

1 2 3 4 5 ...

765 Commits (1e6443537410ea406f7a60adc09d9a725dcd3fcd)