9506d9cafc
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
conflicts caused by image URLs being different
- app/models/status.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
some strings were changed upstream
- spec/models/status_spec.rb
as_home_timeline removed, kept glitch-soc-only as_direct_timeline
5 years ago
976d6f671c
Fix not showing if emoji has a local counterpart in admin UI ( #12135 )
...
Fix #12132
5 years ago
f3ca2825e5
Remove `lang` attribute from individual statuses ( #12124 )
...
Fix #10930
5 years ago
001ce9a1a9
Add admin setting to auto-approve hashtags ( #12122 )
...
Change inaccurate labels on other admin settings
5 years ago
ca8172ee02
Remove fallback to long description on sidebar and meta description ( #12119 )
...
Fix #12114
5 years ago
07abea7ba8
Merge tag 'v3.0.0' into glitch-soc/merge-upstream
5 years ago
a57da77719
Remove invite comments from UI ( #12068 )
...
Due to UX confusion and insufficient time to fix it
5 years ago
c2d6ef1b64
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
Upstream raised max image size from 8MB to 10MB while our limit is
configurable. Raised the default to 10MB.
5 years ago
8811f37949
Fix long domain block descriptions breaking table layout ( #12029 )
5 years ago
da68736ca3
Fix hashtag link to directory in AdminUI ( #12005 )
...
* Fixed not to generate link if no user used hashtag in directory
* Added missing translation for AdminUI custom emojis
* run yarn manage:translations en
5 years ago
cc94c90bf1
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
5 years ago
f088e090e4
Add voters count support ( #11917 )
...
* Add voters count to polls
* Add ActivityPub serialization and parsing of voters count
* Add support for voters count in WebUI
* Move incrementation of voters count out of redis lock
* Reword “voters” to “people”
5 years ago
7b7c50f124
Fix public list of domain blocks being too verbose on about page ( #11967 )
5 years ago
f5c71a6cd2
Add (back) option to set redirect notice on account without moving followers ( #11994 )
...
Fix #11913
5 years ago
c41cd0d8f6
Fix hashtag batch actions not redirecting back with right filters ( #11962 )
...
Regression from #11829
5 years ago
c596206f8c
Show user what options they have voted ( #11195 )
...
* Add own_votes field to poll results in REST API
Fixes #10679
* Display user votes in WebUI
* Update styling
* Add vote checkmark to public pages
5 years ago
1f38dc65cd
Add full numeric notation to the dashboard title attribute ( #11911 )
5 years ago
84c3ceecb7
Fix "reason" prefix being shown with no reason for public blocks ( #11908 )
5 years ago
501b95fa4d
Fix hashtag batch actions being unavailable on pending review page ( #11897 )
...
Regression from #11829
5 years ago
53ceb703b3
Fix page body not being scrollable in admin layout ( #11893 )
...
Hide navigation behind hamburger icon on small screens in admin layout
5 years ago
a2d3728c36
Add account migration UI ( #11846 )
...
Fix #10736
- Change data export to be available for non-functional accounts
- Change non-functional accounts to include redirecting accounts
5 years ago
61442032a2
Add table of contents to about page ( #11885 )
...
Move public domain blocks information to about page
5 years ago
4837d6275a
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Minor conflict due to glitch-soc's theming code
5 years ago
1781358bd9
Add password challenge to 2FA settings, e-mail notifications ( #11878 )
...
Fix #3961
5 years ago
8904a4eb36
Fix TOTP codes not being filtered from logs during enabling/disabling ( #11877 )
...
Not a serious issue because they are meaningless past single use
5 years ago
16dbecf6e5
Fixed not being able to display review pending hashtags in the admin UI. ( #11875 )
5 years ago
566e85716f
Add search and sort functions to hashtag admin UI ( #11829 )
...
* Add search and sort functions to hashtag admin UI
* Move scope processing from tags_controller to tag_filter
* Fix based on method naming conventions
* Fixed not to get 500 errors for invalid requests
5 years ago
7bdf741377
Change dashboard to short number notation ( #11847 )
...
* Add short numeric notation to the dashboard
* Fix i18n
* Fix to embed units in code
* Remove settings and always use short notation
* Remove misplaced test lines
* Fit to other pages
5 years ago
8eb0d880cb
Fix 2FA challenge and password challenge for non-database users ( #11831 )
...
* Fix 2FA challenge not appearing for non-database users
Fix #11685
* Fix account deletion not working when using external login
Fix #11691
5 years ago
79927b1f55
Change the hashtag link from WebUI to public page ( #11845 )
5 years ago
129a2c1fc8
Fix upstream changes breaking because of glitch-soc's theming engine
5 years ago
2e38d889a3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile
- app/controllers/api/v1/search_controller.rb
Conflict because we changed the number of default results to be
configurable
- app/lib/settings/scoped_settings.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
- spec/controllers/application_controller_spec.rb
Addition of a new “noindex” site-wide setting,
conflict due to our change of the two other site-wide settings
(default flavour and skin instead of theme)
5 years ago
a74b17635b
Fix nil error in warning e-mail template ( #11812 )
5 years ago
0430cbec29
add admin setting for default search engine indexing ( fix #11750 ) ( #11804 )
5 years ago
4ba49f14dc
Change /admin/custom_emoji to honor the auto_play_gif setting ( #11801 )
...
Fixes #9535
5 years ago
3c1c9f8a8e
Fix duplicate HTML ids in /about ( #11803 )
...
Fixes #11329
5 years ago
25fb124ee6
Add batch actions and categories to admin UI for custom emojis ( #11793 )
5 years ago
39e904f9c1
Fix display of instance actor in reports UI ( #11798 )
5 years ago
fef7f3b6d5
Add account bio to account admin view ( #11473 )
...
* Add account bio to account admin view
* Change styling to make bio fields / content more readable
5 years ago
7799c7c75f
Add batch approve/reject for pending hashtags in admin UI ( #11791 )
5 years ago
eac7c66d2a
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
f743f7a7bf
Fix NotificationMailer failing when receiving mention with media from remote instance ( #11765 )
5 years ago
7ef93513f7
Change account deletion page to have better explanations ( #11753 )
...
Fix deletion of unconfirmed account not freeing up the username
Add prefill of logged-in user's email in the reconfirmation form
5 years ago
ecd444dc99
Fix admin interface showing superfluous reject media/reports on suspended blocks ( #11749 )
...
* Fix admin interface showing superfluous reject media/reports on suspended domains
* Fix reject media/reports checkboxes being visible when editing domain block of suspend severity
5 years ago
ae3c1fbf40
Fix error in admin UI for hashtag usage breakdown ( #11743 )
5 years ago
97beb5d3de
Fix error in user warning template ( #11741 )
5 years ago
2807f39900
Fix user preference to show trends not working on public pages ( #11740 )
...
Fix #11738
5 years ago
feeecba886
Change OpenGraph description on sign-up page to reflect invite ( #11744 )
5 years ago
80fe7fa415
Integrate translation strings for the Profile Directory. ( #11722 )
...
Run `yarn manage:translations en`
5 years ago
76bdc01aee
Fix wrong percentages in admin UI for hashtag usage breakdown ( #11714 )
5 years ago
Thibaut Girka
Eugen Rochko
mayaeh
Takeshi Umeda
Tao Bror Bojlén