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
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
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
6d1023b2e9
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
9c94c1e66f
moved save button ( #3792 )
...
* moved save button
* added save back to the bottom
* Update show.html.haml
7 years ago
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
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
87517e2dd8
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/views/layouts/mailer.html.haml
config/locales/ko.yml
7 years ago
6278ffdba3
Add direction tags to HTML e-mails for RTL languages ( #6373 )
7 years ago
3cd4a0804b
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
42457924eb
Display deleted users' role as “Suspended” ( #6339 )
...
Follow-up to 87ee458079
7 years ago
a87bb3f4f6
Resolve URL for local account in follow authorization success view ( #6324 )
7 years ago
a95ca95b7b
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
7 years ago
d9421e01df
Fix invalid value passed to full_asset_url in mailers ( #6312 )
7 years ago
d000f5dd80
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
c8d971a5c1
Change mailer avatar url ( #6309 )
...
* Change mailer avatar url
* Use full_asset_url method
7 years ago
03f157f6da
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/javascript/styles/mastodon/components.scss
7 years ago
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
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
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
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
8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ef20e5d3fd
Change mailer image url ( #6279 )
...
* Change image URL in mailer to full path
* Add application_mailer.view_profile localization.
7 years ago
000b0baac2
HTML e-mails for NotificationMailer ( #6263 )
...
* HTML e-mails for NotificationMailer (except digest)
* Add HTML template for digest
* Fix build
7 years ago
d60d5fbd26
Change image URL in mailer to full path ( #6264 )
7 years ago
be525dd4db
Fix mailer to use webpack core
7 years ago
de7283a318
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
7 years ago
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
e6049e6fd0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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
1a7f8eb723
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
db/schema.rb
7 years ago
6d9f2924ad
Fix #6204 : Use content warning for page title when present ( #6231 )
7 years ago
134e6590c6
Don't show skins selector when there's only one ( #256 )
7 years ago
1f469edac1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c8f0be1d6d
Revert #5772 ( #6221 )
7 years ago
8704a190c0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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
86007e913d
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
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
a7b8cb9493
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7a0479c830
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
b83fb8b107
i18n: Update Polish translation ( #6168 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
d50d61a90c
Add Japanese translations #5997 , #6003 , #6004 , #6071 , #6099 , #6125 and #6132 ( #6167 )
...
* yarn manage:translations
* Add Japanese translation for #5997
* Add Japanese translation for #6003
* Add Japanese translation for #6004
* Add Japanese translation for #6071
* Add Japanese translation for #6099
* Add Japanese translation for #6125
* Add Japanese translation for #6132
7 years ago
b42e6973a1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
3c20cfd734
Add confirmation step for email changes ( #6071 )
...
* Add confirmation step for email changes
This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.
Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.
Fixes #3871
* Add review fixes
7 years ago
1cd5812c6b
delete X-UA-Compatible ( #6068 )
...
* delete X-UA-Compatible
* undo
* restore
7 years ago
1c4142da5b
Adding Serbian latin translations ( #6146 )
...
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
7 years ago
ed572490c1
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
7 years ago
616b6867a0
Show mastodon on modal ( #6129 )
7 years ago
5975446002
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip
Renato "Lond" Cerqueira
Eugen Rochko
Charlotte Fields
Akihiko Odaki
Alexander
Jenkins
ThibG
Iijima Yasushi
mayaeh
Yamagishi Kazutoshi
kibi!
Jeong Arm
SerCom_KC
Quenty31
Marcin Mikołajczak
Patrick Figel
Otakan
Branko Kokanovic