about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2019-12-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - package.json Not really a conflict, caused by an additional dependency in glitch-soc. - yarn.lock Not really a conflict, caused by an additional dependency in glitch-soc.
2019-12-02Fix notifications label (#12517)mayaeh
* Fix translations not being displayed * ran `yarn manage:translations en`
2019-12-01Link to reports targetting instance in admin view (#12513)ThibG
2019-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-12-01Split relationships page strings (#12502)Sasha Sorokin
Before this moment relationships managing page was using strings from other context - from counters, but in order for translators to be able to translate it relatively to the page, it must use separate strings. I've split the strings for "Following" and "Followers" and put them to "relationships" keyset in localization file. This should solve this issue. Fixes #10863
2019-11-30Add ability to filter reports by target account domain (#12154)ThibG
* Add ability to filter reports by target account domain * Reword by_target_domain label
2019-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-29Improve notifications page (#12497)Sasha Sorokin
Currently notifications page seems a bit cluttered with no clear separation between e-mail and filtering settings. This commit tries to address them by adding clear separation with headers, hints and removing continuously reused texts for events checkboxes.
2019-11-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-11-22Fix blur behind closed registration message (#12442)ThibG
* Fix closed registration message blur * Adjust overlay margins to account for blur Fixes #12425
2019-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - `package.json`
2019-10-27Change message of public timeline for local only (#12224)Yamagishi Kazutoshi
2019-10-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb
2019-10-24Add setting for whether to crop images in unexpanded toots (#12126)Faye Duxovni
2019-10-24Add link to search for users connected from the same IP address (#12157)ThibG
* Add link to search for users connected from the same IP address Fixes #11949 * Fix missing cell in admin account view table
2019-10-24Fix batch actions being hidden from mobile view (#12183)ThibG
On mobile, batch actions are hidden from the settings/admin interface, but there are several places those actions can only be performed through batch actions. This may not look great, but at least it makes the actions available again.
2019-10-24Add noopener and/or noreferrer (#12202)BSKY
2019-10-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-10-10Fix not showing if emoji has a local counterpart in admin UI (#12135)Eugen Rochko
Fix #12132
2019-10-09Remove `lang` attribute from individual statuses (#12124)Eugen Rochko
Fix #10930
2019-10-09Add admin setting to auto-approve hashtags (#12122)Eugen Rochko
Change inaccurate labels on other admin settings
2019-10-08Remove fallback to long description on sidebar and meta description (#12119)Eugen Rochko
Fix #12114
2019-10-04Merge tag 'v3.0.0' into glitch-soc/merge-upstreamThibaut Girka
2019-10-03Remove invite comments from UI (#12068)Eugen Rochko
Due to UX confusion and insufficient time to fix it
2019-10-03Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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.
2019-10-01Fix long domain block descriptions breaking table layout (#12029)Eugen Rochko
2019-10-01Fix hashtag link to directory in AdminUI (#12005)mayaeh
* Fixed not to generate link if no user used hashtag in directory * Added missing translation for AdminUI custom emojis * run yarn manage:translations en
2019-09-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb
2019-09-29Add voters count support (#11917)ThibG
* 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”
2019-09-29Fix public list of domain blocks being too verbose on about page (#11967)Eugen Rochko
2019-09-29Add (back) option to set redirect notice on account without moving followers ↵Eugen Rochko
(#11994) Fix #11913
2019-09-27Fix hashtag batch actions not redirecting back with right filters (#11962)Eugen Rochko
Regression from #11829
2019-09-22Show user what options they have voted (#11195)ThibG
* 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
2019-09-22Add full numeric notation to the dashboard title attribute (#11911)Takeshi Umeda
2019-09-21Fix "reason" prefix being shown with no reason for public blocks (#11908)Eugen Rochko
2019-09-20Fix hashtag batch actions being unavailable on pending review page (#11897)Eugen Rochko
Regression from #11829
2019-09-20Fix page body not being scrollable in admin layout (#11893)Eugen Rochko
Hide navigation behind hamburger icon on small screens in admin layout
2019-09-19Add account migration UI (#11846)Eugen Rochko
Fix #10736 - Change data export to be available for non-functional accounts - Change non-functional accounts to include redirecting accounts
2019-09-19Add table of contents to about page (#11885)Eugen Rochko
Move public domain blocks information to about page
2019-09-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/auth/sessions_controller.rb Minor conflict due to glitch-soc's theming code
2019-09-18Add password challenge to 2FA settings, e-mail notifications (#11878)Eugen Rochko
Fix #3961
2019-09-18Fix TOTP codes not being filtered from logs during enabling/disabling (#11877)Eugen Rochko
Not a serious issue because they are meaningless past single use
2019-09-17Fixed not being able to display review pending hashtags in the admin UI. ↵mayaeh
(#11875)
2019-09-16Add search and sort functions to hashtag admin UI (#11829)mayaeh
* 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
2019-09-16Change dashboard to short number notation (#11847)Takeshi Umeda
* 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
2019-09-15Fix 2FA challenge and password challenge for non-database users (#11831)Eugen Rochko
* Fix 2FA challenge not appearing for non-database users Fix #11685 * Fix account deletion not working when using external login Fix #11691
2019-09-15Change the hashtag link from WebUI to public page (#11845)mayaeh
2019-09-13Fix upstream changes breaking because of glitch-soc's theming engineThibaut Girka
2019-09-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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)
2019-09-12Fix nil error in warning e-mail template (#11812)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-26 19:10:42 +0000