654fd69903
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes.rb`:
Upstream disabled E2EE routes, which we did earlier, but slightly
differently. Took upstream's version.
4 years ago
848622f347
add ssl option in smtp setting ( #14309 )
4 years ago
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
3cd3cb6a41
Add SMTP reply_to option ( #11718 )
...
* Add SMTP_REPLY_TO in .env.production.sample
* Set reply_to in SMTP options
5 years ago
c060523dc2
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
5 years ago
dc20e1af71
Add HTTP signature keyId to request log ( #11591 )
5 years ago
46259a36d0
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
Took our version.
- CONTRIBUTING.md
Updated the embedded copy of upstream's version.
- README.md
Took our version.
- app/policies/status_policy.rb
Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
Added upstream's changes (dns-prefetch) and fixed
`%body.embed`
- app/views/settings/preferences/show.html.haml
Reverted some of upstream changes, as we have a
page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
Kept our version of the CSP.
- config/initializers/doorkeeper.rb
Not a real conflict, took code from both.
6 years ago
3ede0e8b95
Fix missing protocol in dns-prefetch, improve code style ( #8963 )
...
Regression from #8942
6 years ago
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
c9b5168ebd
Add conversations API ( #8832 )
...
* Add conversations API
* Add web UI for conversations
* Add test for conversations API
* Add tests for ConversationAccount
* Improve web UI
* Rename ConversationAccount to AccountConversation
* Remove conversations on block and mute
* Change last_status_id to be a denormalization of status_ids
* Add optimistic locking
6 years ago
f627ea99e4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
db/migrate/20170716191202_add_hide_notifications_to_mute.rb
spec/controllers/application_controller_spec.rb
Took our version, upstream changes were only minor style linting.
6 years ago
c883b1ffc9
lint pass 2 ( #8878 )
...
* Code quality pass
* Typofix
* Update applications_controller_spec.rb
* Update applications_controller_spec.rb
6 years ago
ae5c237607
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Vagrantfile
app/javascript/packs/public.js
app/views/admin/settings/edit.html.haml
app/views/settings/preferences/show.html.haml
app/views/settings/profiles/show.html.haml
config/locales/es.yml
config/locales/simple_form.en.yml
config/webpack/configuration.js
config/webpack/loaders/babel.js
package.json
yarn.lock
Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
6 years ago
1bce70d3c7
Misc. typos ( #8694 )
...
Found via `codespell -q 3 --skip="./app/javascript/mastodon/locales,./config/locales"`
6 years ago
563a09d81a
Move CSP headers to the appropriate Rails configuration
...
Also drop dev-static.glitch.social reference.
6 years ago
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
6 years ago
0370c0f4d6
Add support for separate Redis for cache ( #7272 )
...
* Add support for separate Redis for cache
CACHE_REDIS_URL to allow using a different Redis server for cache
purposes, with cache-specific configuration such as key eviction
* Fix code style issues
6 years ago
fd98bfd108
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
Gemfile.lock
config/application.rb
7 years ago
9761b940ac
Upgrade Rails to version 5.2.0 ( #5898 )
7 years ago
ac1ac20ee9
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
7 years ago
8a9da4c414
update gem, test pam authentication ( #7028 )
...
* update gem, test pam authentication
* add description for test parameters
* fix inclusion of optional group
7 years ago
b1453c0dbf
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
a4d7afa3d9
Fix i18n fallback configuration conflicts with environment configurations ( #6843 )
7 years ago
54608d0486
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
649565e005
Provide default OTP_SECRET value for development environment ( #6617 )
7 years ago
008bc9f47d
Set the default locale in config ( #6580 )
...
Previously the default locale was set by Localized concern for controllers,
but it was not enforced for mailers.
config is enforced throughout the application and an appropriate place to
set the default locale.
7 years ago
c08c971dd3
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
caa0e2e2f8
remove Uglifier call from production.rb ( #6568 )
7 years ago
a5a434a8f6
Raise Mastodon::HostValidationError when host for HTTP request is private ( #6410 )
7 years ago
e768ef35b1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ca6c8b92d9
Isolate each specs for cache store ( #6450 )
...
The cache store is explicitly used by some specs, but they were not
isolated and therefore not reliable. This fixes the issue by clearing
the cache after each specs.
7 years ago
d3e325e047
change referrer policy to same-origin
7 years ago
6a5b778bb8
tighten csp
7 years ago
0daa95befb
add memorial to production.rb
...
in memory of Natalie Nguyen
let her name ring through the ether
7 years ago
02827345ae
Merge upstream 2.0ish #165
7 years ago
6033b8eac1
Replace self-rolled statsd instrumention with localshred/nsa ( #5118 )
7 years ago
f90abccf33
Merge tag 'v1.6.0' into sync/upstream
7 years ago
4c0a563c0c
Set fallback address when empty notification address ( #4868 )
7 years ago
da3f22ee7d
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
651c659fd6
Update status embeds ( #4742 )
...
- Use statuses controller for embeds instead of stream entries controller
- Prefer /@:username/:id/embed URL for embeds
- Use /@:username as author_url in OEmbed
- Add follow link to embeds which opens web intent in new window
- Use redis cache in development
- Cache entire embed
7 years ago
713938f266
Updated from tootsuite
7 years ago
49ef5145ea
Add SMTP_TLS variable for configuring TLS when server uses non-standard port ( #4227 )
7 years ago
f48f42598f
Merge upstream ( #81 )
7 years ago
ecab38fd66
Web Push Notifications ( #3243 )
...
* feat: Register push subscription
* feat: Notify when mentioned
* feat: Boost, favourite, reply, follow, follow request
* feat: Notification interaction
* feat: Handle change of public key
* feat: Unsubscribe if things go wrong
* feat: Do not send normal notifications if push is enabled
* feat: Focus client if open
* refactor: Move push logic to WebPushSubscription
* feat: Better title and body
* feat: Localize messages
* chore: Fix lint errors
* feat: Settings
* refactor: Lazy load
* fix: Check if push settings exist
* feat: Device-based preferences
* refactor: Simplify logic
* refactor: Pull request feedback
* refactor: Pull request feedback
* refactor: Create /api/web/push_subscriptions endpoint
* feat: Spec PushSubscriptionController
* refactor: WebPushSubscription => Web::PushSubscription
* feat: Spec Web::PushSubscription
* feat: Display first media attachment
* feat: Support direction
* fix: Stuff broken while rebasing
* refactor: Integration with session activations
* refactor: Cleanup
* refactor: Simplify implementation
* feat: Set VAPID keys via environment
* chore: Comments
* fix: Crash when no alerts
* fix: Set VAPID keys in testing environment
* fix: Follow link
* feat: Notification actions
* fix: Delete previous subscription
* chore: Temporary logs
* refactor: Move migration to a later date
* fix: Fetch the correct session activation and misc bugs
* refactor: Move migration to a later date
* fix: Remove follow request (no notifications)
* feat: Send administrator contact to push service
* feat: Set time-to-live
* fix: Do not show sensitive images
* fix: Reducer crash in error handling
* feat: Add badge
* chore: Fix lint error
* fix: Checkbox label overlap
* fix: Check for payload support
* fix: Rename action "type" (crash in latest Chrome)
* feat: Action to expand notification
* fix: Lint errors
* fix: Unescape notification body
* fix: Do not allow boosting if the status is hidden
* feat: Add VAPID keys to the production sample environment
* fix: Strip HTML tags from status
* refactor: Better error messages
* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)
* fix: Error when target_status is nil
* fix: Handle lack of image
* fix: Delete reference to invalid subscriptions
* feat: Better error handling
* fix: Unescape HTML characters after tags are striped
* refactor: Simpify code
* fix: Modify to work with #4091
* Sort strings alphabetically
* i18n: Updated Polish translation
it annoys me that it's not fully localized :P
* refactor: Use current_session in PushSubscriptionController
* fix: Rebase mistake
* fix: Set cacheName to mastodon
* refactor: Pull request feedback
* refactor: Remove logging statements
* chore(yarn): Fix conflicts with master
* chore(yarn): Copy latest from master
* chore(yarn): Readd offline-plugin
* refactor: Use save! and update!
* refactor: Send notifications async
* fix: Allow retry when push fails
* fix: Save track for failed pushes
* fix: Minify sw.js
* fix: Remove account_id from fabricator
7 years ago
bcc30c8697
Merge upstream!! #64 <3 <3
7 years ago
9669f065af
Set default From address in config ( #3756 )
...
The old implementation sets default From address in mailers. It sets
the address from SMTP_FROM_ADDRESS, or notifications@localhost. The
behavior is occasionally undesired results.
In production environment, notifications@localhost is likely to be
incorrect.
In testing environment, the email address should not be varied by a
environment variable.
After appling this change,
In production environment, it will throw an exception when launching
Mastodon.
In testing environment, the address will be fixed with
notifications@localhost.
7 years ago
4f54d53a84
update local modifications for cors and cp
7 years ago
9335e15763
Support multiple trusted proxy ip addresses ( #3639 )
...
* Support multiple trusted proxy ip addresses
* correct coding style
7 years ago
eea027c5c2
Update Rails to version 5.1.1 ( #3121 )
...
* Update rails to version 5.1.1
* Run `rails app:update`
* Remove the override of polymorphic activity relationship
* Silence warning about otp_secret attribute being unknown to rails
* We will only introduce form_with where we want to use remote data
7 years ago
2214d1ecd7
Set config.cache_store in environments file. ( #3219 )
...
* Set config.cache_store in application.rb
* Set config.cache_store in environments.
* fix code format.
7 years ago
Thibaut Girka
Tdxdxoz
Hugo Gameiro
Eugen Rochko
aus-social
luzpaz
David Yip
Yamagishi Kazutoshi
Alexander
Jenkins
Akihiko Odaki
beatrix
kibigo!
Ondřej Hruška
Sorin Davidoi
nullkal
Matt Jankowski
Clworld