67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
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
5a27eaae7c
Adjust status embeds ( #4808 )
...
* Adjust status embeds
Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.
* Remove trailing whitespace
* Using width from the variable
7 years ago
ce3a71690b
Fix #4551 - Use correct syntax for content preloading ( #4798 )
7 years ago
f13b1b67f5
Adjust settings pages ( #4765 )
...
* views: Adjust heading positions
* Adjust settings pages
Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.
* Remove trailing whitespace
7 years ago
690e59b1f0
Fix profile page when use system's font ( #4774 )
7 years ago
186416830e
Add link to 'noscript' message ( #4561 )
...
* Add link to 'noscript' message
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* remove indent
7 years ago
8d4e705cb0
Use system's default font on non web UI pages ( #4553 )
...
* Use system's default font on non web UI pages
* Remove import for Redirect
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
007d26852d
Shorten display of large numbers on public profiles ( #4711 )
7 years ago
dc19078b59
Fix missing at-sign (regression from #4688 ) ( #4705 )
7 years ago
5e3c6f63be
Change timezone of the datetime to what browser specifies ( #4688 )
7 years ago
5482e0d10e
Add label for application scopes ( #4691 )
...
* Add label for application scopes
* hint
7 years ago
3e20cb7025
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
7 years ago
da85aff49c
Use checkboxes for application scope setting ( #4671 )
7 years ago
b13501268f
Fix up the applications area ( #4664 )
...
- Section it into "Development" area
- Improve UI of application form, index, and details
7 years ago
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
63b98318c5
Application prefs section ( #2758 )
...
* Add code for creating/managing apps to settings section
* Add specs for app changes
* Fix controller spec
* Fix view file I pasted over by mistake
* Add locale strings. Add 'my apps' to nav
* Add Client ID/Secret to App page. Add some visual separation
* Fix rubocop warnings
* Fix embarrassing typo
I lost an `end` statement while fixing a merge conflict.
* Add code for creating/managing apps to settings section
- Add specs for app changes
- Add locale strings. Add 'my apps' to nav
- Add Client ID/Secret to App page. Add some visual separation
- Fix some bugs/warnings
* Update to match code standards
* Trigger notification
* Add warning about not sharing API secrets
* Tweak spec a bit
* Cleanup fixture creation by using let!
* Remove unused key
* Add foreign key for application<->user
7 years ago
6cce0bb080
use existing inflections instead of custom helper ( #4624 )
...
* use existing inflections instead of custom helper
* use ActiveSupport versions
7 years ago
a90b5796a1
Show what protocol is used for accounts in admin/accounts#index ( #4622 )
...
* Show what protocol used for in admin/accounts#index
* Add frozen_string_literal
7 years ago
2dba0368f8
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
40ec0f45fb
Update /admin/accounts/:id view for ActivityPub ( #4600 )
...
* Add protocol field
* Switch protocol specific information according to active protocol
* Hide PuSH subscription related buttons if ActivityPub is active
7 years ago
0e5c8372e7
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
7 years ago
34962d9f9d
Add alternate links to ActivityPub resources from HTML/HEAD variants ( #4586 )
7 years ago
cbcac23679
Fix short description in about/more page ( #4554 )
7 years ago
f4017cce3f
unify short description styling ( #4548 )
...
apply same style class to the About description on both the landing page
and the about/more page
7 years ago
913dd13575
Merge remote-tracking branch 'upstream/master'
7 years ago
bac2a77deb
Adjust tags and accounts page ( #4534 )
...
* Adjust tag and accounts page
* Remove units from 0px paddings
7 years ago
fd69694749
Add "signed in as" header to some pages ( #4523 )
7 years ago
2cdee6ae8a
Merge upstream ( #111 )
7 years ago
755a7f2646
i18n: update Persian translation ( #4470 )
...
* i18n: update Persian translation
* i18n: fix quotes
7 years ago
15a8d9b0ca
Make salutation of email localizable ( #4454 )
7 years ago
58446d39d8
Multiple frontend support ( #110 )
...
* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common
7 years ago
5d364da590
Do not create empty a element when there is no e-mail ( #4455 )
...
Empty a element is created when there is no business e-mail input.
7 years ago
71bea1cd76
Set contact address in about/more as mailto link ( #4450 )
...
* Set contact address as mailto link
To be able to copy long email address
* Set style for mailto link
7 years ago
b7482e4a9f
Fix autocomplete option in haml files ( #4438 )
...
* Fix autocomplete in two_factor.html.haml
* Fix autocomplete in registrations edit.html.haml
* Fix autocomplete in passwords edit.html.haml
* Fix autocomplete in _registration.html.haml
* Fix autocomplete in new.html.haml
* Fix autocomplete in show.html.haml
* Add autocomplete option to sessions new.html.haml
* Add autocomplete option to 2FA new.html.haml
* Add autocomplete option to 2FA show.html.haml
7 years ago
043dfdb474
Fix current session not being displayed in sessions list ( #4424 )
7 years ago
74e54cd45b
Added external link icons to joinmastodon navbar buttons ( #4368 )
7 years ago
affd86c1dc
Add .fa-external-link to instance list link
7 years ago
2129485669
Fix JS errors and add back commit hash
7 years ago
7072288bcf
Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
9510179cc1
Send short account URL to remote instance (regression from #3844 ) ( #4355 )
...
* Send short account URL to remote instance (regression from #3844 )
Resolve #4347
* remove format: 'json'
7 years ago
0d0b225136
Fix oddities with public profile CSS ( #4341 )
...
* Fix oddities with public profile CSS
* Remove trailing whitespace
7 years ago
fae1d9052b
Redesign /terms page ( #4338 )
...
* Redesign /terms page
* Fix tests
* Remove unused keys
7 years ago
e43e0e959c
Redesign extended information page ( #4322 )
...
* Redesign extended information page
* Remove unused keys
* Add $ui-base-lighter-color variable to SCSS
7 years ago
961f103c35
Allow domain blocks that only reject media without silencing or suspending ( #4325 )
...
* Allow domain blocks to reject media without silencing or suspending
* Fix typo
* Hide 'Reject media' button when superfluous, instead of disabling it
* Properly hide 'reject media' checkbox on page load if needed
This may happen when resubmitting the domain block form after an error.
* Don't ask whether undoing a media-only block should be retroactive
* Rename :media_only block to :noop
* Display :noop block as None in frontend, allow blocks that do nothing
* Remove 'coding' line auto-added by emacs
7 years ago
99dfbbf623
Fix manifest description (regression from #4122 ) ( #4324 )
7 years ago
cdaf19daeb
Improve noscript message and style ( #4315 )
7 years ago
2e766841f3
Change logo.png to logo.svg for web UI ( #4307 )
7 years ago
78c7c9fb0f
New logo ( #4306 )
...
* Add new logo
* Remove unused images
7 years ago
David Yip
Lynx Kotoura
Eugen Rochko
Yamagishi Kazutoshi
m4sk1n
nullkal
Daigo 3 Dango
Colin Mitchell
nightpool
unarist
TheInventrix
Ondřej Hruška
kibigo!
Masoud Abkenar
sdukhovni