1159490f00
Merge branch 'master' into glitch-soc/merge-upstream
...
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
f53755aaad
Fix size/dimension values in avatar/header hint localizations ( #8088 )
2018-07-29 09:57:13 +09:00
13df3889f0
Redesign public profiles and toots ( #8068 )
2018-07-28 19:25:33 +02:00
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
2018-05-10 00:03:28 +02:00
7ff3c849d1
Bot nameplates ( #7391 )
...
* Store actor type in database
* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365
* Fix code style issues
2018-05-07 09:31:07 +02:00
9697c6d9f0
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
db/schema.rb
2018-04-14 09:12:50 -05:00
466442b764
Add bio fields ( #6645 )
...
* Add bio fields
- Fix #3211
- Fix #232
- Fix #121
* Display bio fields in web UI
* Fix output of links and missing fields
* Federate bio fields over ActivityPub as PropertyValue
* Improve how the fields are stored, add to Edit profile form
* Add rel=me to links in fields
Fix #121
2018-04-14 12:41:08 +02:00
bc10a0dced
Merge remote-tracking branch 'tootsuite/master'
2017-11-27 22:33:26 -06:00
55d9abcceb
Add UI for setting up account migration ( #5832 )
2017-11-27 22:47:06 +01:00
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
b25c112d31
Reset preview image if avatar/header image selection was cancelled ( #4893 )
2017-09-11 16:19:54 +02:00
8deb2072ef
Merge that good fresh upstream shit
2017-07-22 01:16:53 +00:00
c35ea3636c
Fix #3220 - Show avatar/header on edit profile page ( #4288 )
2017-07-21 05:28:51 +02:00
ecfb516588
update bio length to 500
2017-06-26 02:18:52 +00:00
ae6984de48
Fix character counter not updating for bio ( #3101 )
2017-05-18 00:38:18 +02:00
095c99fb53
feat(count): Just yml count syntax to provide different rule for 1 ( #2685 )
...
Update all translation forms that use this "counter" element.
2017-05-13 17:13:17 +02:00
cd27deb5e3
Prevent selection of unacceptable Content-Type files ( #2910 )
...
* Prevent selection of unacceptable Content-Type files
* replace hard code
* media_attachments accept content-types in initial state
2017-05-08 16:49:53 +02:00
cf1f65bf58
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
2017-05-08 03:35:25 +02:00
6a85e79583
Display remaining characters when editing display name and bio ( #2219 )
2017-04-21 18:17:21 +02:00
557de8e24c
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
238233440f
Follow call on locked account creates follow request instead
...
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
2016-12-22 23:03:57 +01:00
09a477c782
Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
2016-12-22 21:34:19 +01:00
8d4ef0b6c3
Per-status control for unlisted mode, also federation for unlisted mode
...
Fix #233 , fix #268
2016-11-30 21:34:59 +01:00
74df3ba1d7
Local accounts can control "silenced" attribute which removes them from public timeline
2016-11-21 23:06:41 +01:00
0e956910c3
Adding some localizations
2016-11-15 23:02:57 +01:00
be98addccc
Improving all forms
2016-10-18 16:37:15 +02:00
588cb77e9f
E-mail preferences page
2016-10-14 02:28:49 +02:00
Thibaut Girka