David Yip
e931cf656d
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
2018-06-12 16:39:30 -05:00
David Yip
f9eb4ea80a
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
...
Hardcode default skin/theme in error layout (fixes #373 )
2018-06-09 10:39:55 -05:00
David Yip
8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
5bf5003384
.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -05:00
Yamagishi Kazutoshi
c0fc4e9935
Remove unnecessary underline on accounts table ( #7728 )
2018-06-04 13:09:36 +02:00
David Yip
97d2df77aa
Add apply-to-mentions option to keyword mute UI. #454 .
2018-06-04 02:51:28 -05:00
Thibaut Girka
e8a9627f66
Hardcode default skin/theme in error layout ( fixes #373 )
...
This is a bit hackish. The best way would simply to somehow
use Mastodon's ApplicationController with `use_pack 'error'` from
the Rake task, but I'm not sure how to do that.
2018-05-31 14:38:48 +02:00
Jenkins
f93806ea55
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-05-21 18:17:23 +00:00
Eugen Rochko
40ef46dbef
Display only domain of report account if remote under comment ( #7574 )
2018-05-21 17:33:20 +02:00
Thibaut Girka
b481e4fac1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
Ash Furrow
50db106252
Disables autocorrect/autocapitalize on remote username field. ( #7549 )
2018-05-19 19:36:23 +02:00
Eugen Rochko
93c66f0c03
In footer, replace text "Mastodon" with logo ( #7545 )
2018-05-19 16:10:55 +02:00
David Yip
e0eebba461
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
2018-05-18 08:47:10 -05:00
Eugen Rochko
1e02dc8715
Add preference to hide following/followers lists ( #7532 )
...
* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix #6901
* Add preference
* Add delegation
* Fix issue
* Fix issue
2018-05-18 02:26:51 +02:00
Thibaut Girka
ba7ee67498
Merge branch 'master' into glitch-soc/merge
2018-05-14 20:51:50 +02:00
ThibG
685cf5599f
Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape
...
Fix glitch-style bio fields incorrect HTML escaping in public profiles
2018-05-12 17:53:01 +02:00
Thibaut Girka
cc8d81519e
Fix glitch-style bio fields incorrect HTML escaping in public profiles
2018-05-12 17:45:30 +02:00
ThibG
0f2fbf7d05
Improvements to toots display in admin view ( #7452 )
...
* Distinguish boosts from original statuses in the admin panel (fixes #7449 )
* Show the “show more” button in admin view to make CWs clearer (fixes #7451 )
* Make content warnings swag
2018-05-12 17:44:15 +02:00
Thibaut Girka
45fce0e496
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
2018-05-11 18:12:42 +02:00
Yamagishi Kazutoshi
bd5f57cbc3
Strip tags from og:description on public tag page ( #7437 )
2018-05-10 14:38:40 +02:00
Yamagishi Kazutoshi
0a7e8320b2
Add alternate for RSS ( #7436 )
2018-05-10 14:38:19 +02:00
Thibaut Girka
1c9c0167b7
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
Yamagishi Kazutoshi
e0b1e17bd0
Show media modal on public timeline ( #7413 )
2018-05-08 13:33:09 +02:00
Eugen Rochko
42cd363542
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
beatrix
35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
...
Support upstream bio items / custom account fields
2018-05-06 11:32:05 -04:00
Eugen Rochko
61a9018607
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
2018-05-06 11:48:51 +02:00
Shuhei Kitagawa
bd10a7e480
Add resend confirmation for admin ( #7378 )
...
* Add confirmations_controller#resend
* Add tests for confirmations_controller#resend
* Add translations
2018-05-06 10:59:03 +02:00
Eugen Rochko
39efc6d533
Add hint about 7 day cooldown for archive takeout ( #7375 )
2018-05-06 10:53:10 +02:00
Eugen Rochko
b611dbac79
Add contact e-mail hint to 2FA login form ( #7376 )
2018-05-06 10:52:36 +02:00
Eugen Rochko
c7d1a2e400
Improve admin UI for accounts ( #7360 )
...
* Improve design of account statuses admin UI (consistent with reports)
* Make account moderation notes look consistent with report notes
* i18n-tasks remove-unused
* Fix code style issues
* Fix tests
2018-05-05 23:06:29 +02:00
Eugen Rochko
2ef9d65052
Improve rendering of bio fields ( #7353 )
...
Fix #7335
2018-05-05 00:55:09 +02:00
David Yip
77a92d3260
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
2018-05-04 09:42:31 -05:00
Eugen Rochko
251bbf9728
Show remote reports in admin UI as coming from domain rather than user ( #7347 )
...
Fix #6994
2018-05-04 13:26:25 +02:00
David Yip
c816701550
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
2018-05-03 17:23:44 -05:00
Eugen Rochko
28bd4b9800
Serialize webfinger XML with Ox instead of Nokogiri ( #7319 )
...
25ms -> 0.5ms
2018-05-02 22:28:46 +02:00
Eugen Rochko
da61352fab
Fix "Show more" URL on paginated threads for remote statuses ( #7285 )
...
* Fix URL of "Show more" link in paginated threads (ancestors side)
Increase item limits in threads
Fix #7268
* Fix "Show more" link in paginated threads (descendants side)
2018-04-30 01:59:42 +02:00
Thibaut Girka
356d0214c9
Implement tootsuite-style account fields
...
glitch-soc-style still in backup, both sharing the same SCSS style
2018-04-29 18:48:45 +02:00
Akihiko Odaki
1258efa882
Paginate descendant statuses in public page ( #7148 )
2018-04-23 19:27:35 +02:00
Eugen Rochko
a9c440637c
Improve report layout ( #7188 )
...
* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue
2018-04-20 02:28:48 +02:00
Yamagishi Kazutoshi
1663368724
Replace preload link tag to Rails helper ( #7192 )
2018-04-20 02:06:53 +02:00
Jenkins
ed17e173d6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-04-19 22:17:23 +00:00
Emelia Smith
b9c35785e2
Reports: Merge contents and comment columns ( #7189 )
2018-04-19 15:39:54 +02:00
David Yip
16d5217502
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/home_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
2018-04-18 18:48:12 -05:00
Emelia Smith
204d72fbe4
Feature: add count of account notes to reports ( #7130 )
...
* Reports: Colocate account details with reports
* Reports: Add count of account moderation notes
Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
2018-04-17 14:58:11 +02:00
Jennifer Kruse
ef12a2b74c
Able to deactivate invites if they aren't expired ( #7163 )
2018-04-17 13:52:08 +02:00
Eugen Rochko
07a7d5959c
Fix missing "Administered by" when timeline preview disabled ( #7161 )
2018-04-17 13:51:14 +02:00
ThibG
1c379b7ef4
Remove extra spaces from search API queries and public account headers ( fixes #7129 ) ( #7152 )
2018-04-16 17:19:04 +02:00
David Yip
813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
db/schema.rb
2018-04-14 09:12:50 -05:00
Eugen Rochko
78ed4ab75f
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
David Yip
a817f084ea
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
2018-04-12 03:30:57 -05:00
Akihiko Odaki
519119f657
Paginate ancestor statuses in public page ( #7102 )
...
This also limits the statuses returned by API, but pagination is not
implemented in Web API yet. I still expect it brings user experience
better than making a user wait to fetch all ancestor statuses and flooding
the column with them.
2018-04-11 12:35:09 +02:00