about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
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
2019-09-11add admin setting for default search engine indexing (fix #11750) (#11804)Tao Bror Bojlén
2019-09-10Change /admin/custom_emoji to honor the auto_play_gif setting (#11801)ThibG
Fixes #9535
2019-09-10Fix duplicate HTML ids in /about (#11803)ThibG
Fixes #11329
2019-09-09Add batch actions and categories to admin UI for custom emojis (#11793)Eugen Rochko
2019-09-09Fix display of instance actor in reports UI (#11798)Eugen Rochko
2019-09-09Add account bio to account admin view (#11473)ThibG
* Add account bio to account admin view * Change styling to make bio fields / content more readable
2019-09-09Add batch approve/reject for pending hashtags in admin UI (#11791)Eugen Rochko
2019-09-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-09-05Fix NotificationMailer failing when receiving mention with media from remote ↵mayaeh
instance (#11765)
2019-09-04Change account deletion page to have better explanations (#11753)Eugen Rochko
Fix deletion of unconfirmed account not freeing up the username Add prefill of logged-in user's email in the reconfirmation form
2019-09-03Fix admin interface showing superfluous reject media/reports on suspended ↵ThibG
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
2019-09-03Fix error in admin UI for hashtag usage breakdown (#11743)Eugen Rochko
2019-09-03Fix error in user warning template (#11741)Eugen Rochko
2019-09-03Fix user preference to show trends not working on public pages (#11740)Eugen Rochko
Fix #11738
2019-09-03Change OpenGraph description on sign-up page to reflect invite (#11744)Eugen Rochko
2019-09-02Integrate translation strings for the Profile Directory. (#11722)mayaeh
Run `yarn manage:translations en`
2019-09-01Fix wrong percentages in admin UI for hashtag usage breakdown (#11714)Eugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-12-30 21:37:48 +0000