about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2018-12-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-09Add setting to not aggregate reblogs (#9248)ThibG
* Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label
2018-12-08Cache hashtag sample accounts, and exclude ineligible ones (#9465)Eugen Rochko
2018-12-07Escape HTML in profile name preview in profile settings (#9446)Paweł Ngei
* fix non-escaped html in the profile settings * provide a default profile text in case if there's no custom one * update haml syntax * simplify default profile name to username * sanitize user-input html but display emojified icons
2018-12-07Fix various things in the directory (#9449)Eugen Rochko
* Fix missing variable in directory page title * Order hashtags by number of people instead of alphabetically * Add icon to OpenGraph preview of directory page * Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-06Add profile directory (#9427)Eugen Rochko
Fix #5578
2018-11-30Display a double reply arrow on public pages for toots that are repliesThibaut Girka
2018-11-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-29Swap avatar and header input fields in profile page (#9271)ThibG
Fixes #9211
2018-11-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).
2018-11-26Redesign admin accounts index (#9340)Eugen Rochko
* Improve overview of accounts in admin UI - Display suspended status, role, last activity and IP prominently - Default to showing local accounts - Default to not showing suspended accounts * Remove unused strings * Fix tests * Allow filtering accounts by IP mask
2018-11-20WebSub: ATOM before RSS (#9302)Alexandre Alapetite
Hello, The ATOM feed contains the hub declaration for WebSub, but the RSS version does not. RSS/ATOM readers will typically pick whichever version comes first, and will thus not see the WebSub feature. I therefore suggest putting the ATOM version first, as it is more feature-rich than its RSS counterpart is. Clients not compatible with ATOM would not pick it anyway due to the different type attribute. A more complicated alternative would be to declare the WebSub feature in the RSS version as well, using something like the following code, and ensuring that clients subscribed to the RSS version would receive PuSH updates just like those subscribed to the ATOM version. ````xml <rss version="2.0" xmlns:webfeeds="http://webfeeds.org/rss/1.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> <atom:link rel="self" type="application/rss+xml" href="https://diaspodon.fr/users/test.rss"/> <atom:link rel="hub" href="https://diaspodon.fr/api/push"/> </channel> </rss> ```
2018-11-16Change the password form order (#9267)mayaeh
* Change order of password. * Update Japanese translation for "Show thread". * Separate the translation PR.
2018-11-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-08Fix form validation flash message color and input borders (#9235)Eugen Rochko
* Fix form validation flash message color and input borders * Fix typo
2018-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
2018-10-30Fix td instead of th in sessions table header (#9162)Eugen Rochko
Fix #9130
2018-10-29move some constants to rails environmentash lea
2018-10-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
2018-10-26Remove character counter from edit profile (#9100)Eugen Rochko
* Remove display name and bio counter hint, simply limit input * Remove now redundant translations * Fix code style issue
2018-10-25Set @body_classes to admin layout (#9081)Yamagishi Kazutoshi
2018-10-24Fix RTL layout of status display names (#9075)Eugen Rochko
Fix #2350
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-21Fix og:url on toots' public view (#9047)ThibG
Fixes #9045
2018-10-20Add option to block reports from domain (#8830)Eugen Rochko
2018-10-20Add "disable" button to report screen (#9024)Eugen Rochko
* Add "disable" button to report screen * i18n-tasks remove-unused
2018-10-17Do not show "limited" visibility in default visibility preference (#8999)Eugen Rochko
* Do not show "limited" visibility in default visibility preference Fix regression from #8950 * Fix code style issue
2018-10-17Improve support for aspects/circles (#8950)Eugen Rochko
* Add silent column to mentions * Save silent mentions in ActivityPub Create handler and optimize it Move networking calls out of the database transaction * Add "limited" visibility level masked as "private" in the API Unlike DMs, limited statuses are pushed into home feeds. The access control rules between direct and limited statuses is almost the same, except for counter and conversation logic * Ensure silent column is non-null, add spec * Ensure filters don't check silent mentions for blocks/mutes As those are "this person is also allowed to see" rather than "this person is involved", therefore does not warrant filtering * Clean up code * Use Status#active_mentions to limit returned mentions * Fix code style issues * Use Status#active_mentions in Notification And remove stream_entry eager-loading from Notification
2018-10-16Improve form for selecting media display preference (#8965)Eugen Rochko
Regression from #8569
2018-10-12Allow selecting both default flavour and themeThibaut Girka
Fixes #672
2018-10-12Display customized mascot in web UI and fix admin form for it (#8964)Eugen Rochko
Follow-up to #8766
2018-10-12Fix missing protocol in dns-prefetch, improve code style (#8963)Eugen Rochko
Regression from #8942
2018-10-12Fix microformats on statuses according to updated spec (#8958)Eugen Rochko
2018-10-11Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into ↵Thibaut Girka
glitch-soc/merge-upstream
2018-10-10Add description meta tag additionally to og:description (#8941)Eugen Rochko
Fix #8685
2018-10-10Add dns-prefetch if using different host for assets or uploads (#8942)Eugen Rochko
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08Replace SVG asset with Custom mascot (#8766)ashleyhull-versent
2018-10-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-06Change documentation URL (#8898)Eugen Rochko
* Change documentation URL * Fix hardcoded documentation URL in locales
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: db/migrate/20170716191202_add_hide_notifications_to_mute.rb spec/controllers/application_controller_spec.rb Took our version, upstream changes were only minor style linting.
2018-10-04Change admin accounts default sort to most recent (#8813)Eugen Rochko
2018-10-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb
2018-09-28Revert Font Awesome 5 upgrade (#8810)Eugen Rochko
* Revert "Fix some icon names changed by the Font Awesome 5. (#8796)" This reverts commit 3f9ec3de82c1a3879a2b092672f51c1caca76f5c. * Revert "Migrate to font-awesome 5.0. (#8799)" This reverts commit 8bae14591bfb4fc9dd9d89d8082ac0123b03edaa. * Revert "Fix some icons names, unavailable in fontawesome5 (free license). (#8792)" This reverts commit b9c727a945fea5afffb3e3a53279164adfc6e88f. * Revert "Update the icon name changed by the Font Awesome 5. (#8776)" This reverts commit 17af4d27da484fc35ecd4b4dce2443d24aa35d23. * Revert "Add bot icon to bot avatars and migrate to newer version of Font Awesome (#8484)" This reverts commit 4b794e134d427dbc716606324adb9a885a74abec.
2018-09-27Migrate to font-awesome 5.0. (#8799)Naoki Kosaka
2018-09-26Fix broken report detail (regression from #8569) (#8795)Yamagishi Kazutoshi
2018-09-25Update the icon name changed by the Font Awesome 5. (#8776)mayaeh
2018-09-25Add a new preference to always hide all media (#8569)ふぁぼ原
2018-09-24Add user preference to always expand toots marked with content warnings (#8762)Matt Sweetman
2018-09-23Refactor active_nav_class for use with multiple paths (#8757)ThibG