15c9c2fd7e
Pinned toots; embeds
7 years ago
932571fa22
Merge tag 'v1.6.0' into sync/upstream
7 years ago
7d7844a47f
Default follows for new users ( #4871 )
...
When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)
7 years ago
67ad453373
Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
...
Conflicts:
app/javascript/mastodon/features/getting_started/index.js
app/javascript/packs/public.js
app/javascript/styles/components.scss
7 years ago
514fc908a3
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
b9f7bc149b
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
bc077018b8
i10n minors changes for 1.6 ( #4867 )
...
* wrong preposition + typo
* wrong preposition + typo
* Typo
* Typo
* minor changes
* minor changes
7 years ago
3c45d3963a
Scrollable tables in settings pages ( #4857 )
...
* Scrollable tables in settings pages
* Add space before curly brace
7 years ago
1caf11ddcc
Fix language filter codes ( #4841 )
...
* Fix language filter codes
CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)
* Fix zh name
7 years ago
b00cc4b9bd
i10n OC / FR update Pinned toots ( #4842 )
...
* Added column.pins
New strings
* Added column.pins
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
* Update password_change.oc.html.erb
* Update password_change.oc.text.erb
* Update reset_password_instructions.oc.html.erb
* Update reset_password_instructions.oc.text.erb
* Update confirmation_instructions.oc.html.erb
* Update confirmation_instructions.oc.text.erb
7 years ago
4c3dd0b254
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
09cffaaf04
Fix #4551 - Use correct syntax for content preloading ( #4798 )
7 years ago
cfe39fb58d
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
6fd2e8c3c5
Fix profile page when use system's font ( #4774 )
7 years ago
0b32338e3f
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
2305f7c391
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
e95bdec7c5
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
15093f9113
Shorten display of large numbers on public profiles ( #4711 )
7 years ago
3ac7b353f8
Fix missing at-sign (regression from #4688 ) ( #4705 )
7 years ago
00f9f16f94
Change timezone of the datetime to what browser specifies ( #4688 )
7 years ago
b88635202f
Add label for application scopes ( #4691 )
...
* Add label for application scopes
* hint
7 years ago
9caa90025f
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
7 years ago
80393a23d0
Use checkboxes for application scope setting ( #4671 )
7 years ago
c1b086a538
Fix up the applications area ( #4664 )
...
- Section it into "Development" area
- Improve UI of application form, index, and details
7 years ago
696c2c6f2f
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
871c0d251a
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
efec02f153
use existing inflections instead of custom helper ( #4624 )
...
* use existing inflections instead of custom helper
* use ActiveSupport versions
7 years ago
075d6a1e13
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
ca7ea1aba9
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
5b9ae7981e
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
3c6503038e
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
a2aeacbfee
Add alternate links to ActivityPub resources from HTML/HEAD variants ( #4586 )
7 years ago
dcbc1af38a
Fix short description in about/more page ( #4554 )
7 years ago
c9fd6f386c
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
7a1ca8b0df
Merge remote-tracking branch 'upstream/master'
7 years ago
a3e53bd442
Adjust tags and accounts page ( #4534 )
...
* Adjust tag and accounts page
* Remove units from 0px paddings
7 years ago
df605f0f8b
Add "signed in as" header to some pages ( #4523 )
7 years ago
8150689b48
Merge upstream ( #111 )
7 years ago
4b6cd1dfdb
i18n: update Persian translation ( #4470 )
...
* i18n: update Persian translation
* i18n: fix quotes
7 years ago
155ba8fd3a
Make salutation of email localizable ( #4454 )
7 years ago
b61e3daf98
Multiple frontend support ( #110 )
...
* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common
7 years ago
f91284d230
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
ea33cdc30b
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
57a794d8eb
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
8c0dd33ce4
Fix current session not being displayed in sessions list ( #4424 )
7 years ago
4115043dc7
Added external link icons to joinmastodon navbar buttons ( #4368 )
7 years ago
4c233b4f3a
Add .fa-external-link to instance list link
7 years ago
b7cf758fbe
Fix JS errors and add back commit hash
7 years ago
7e5691804d
Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
e5c0aa6493
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
kibigo!
David Yip
Eugen Rochko
Quent-in
Lynx Kotoura
Yamagishi Kazutoshi
m4sk1n
nullkal
Daigo 3 Dango
Colin Mitchell
nightpool
unarist
TheInventrix
Ondřej Hruška
Masoud Abkenar