about summary refs log tree commit diff
path: root/app/views/shared
AgeCommit message (Collapse)Author
2023-03-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.
2023-03-06Do not strip tags from `Setting.site_short_description` (#23975)Christian Schmidt
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-13Add image processing and generate blurhash for server thumbnail (#19348)Eugen Rochko
Remove separate server hero setting
2022-10-09Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)Eugen Rochko
Cherry-picked d2528b26b6da34f34b5d7a392e263428d3c09d69 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.
2022-10-06Change public statuses pages to mount the web UI (#19301)Eugen Rochko
2022-10-05Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)Eugen Rochko
2022-06-09Change brand color and logotypes (#18592)Eugen Rochko
- Add rake task for generating Apple/Android icons and favicons from SVG - Add rake task for generating PNG icons and logos for e-mails from SVG - Remove obsolete Microsoft icons and configuration - Remove PWA shortcut icons
2020-12-10Add honeypot fields and minimum fill-out time for sign-up form (#15276)ThibG
* Add honeypot fields to limit non-specialized spam Add two honeypot fields: a fake website input and a fake password confirmation one. The label/placeholder/aria-label tells not to fill them, and they are hidden in CSS, so legitimate users should not fall into these. This should cut down on some non-Mastodon-specific spambots. * Require a 3 seconds delay before submitting the registration form * Fix tests * Move registration form time check to model validation * Give people a chance to clear the honeypot fields * Refactor honeypot translation strings Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2019-10-08Remove fallback to long description on sidebar and meta description (#12119)Eugen Rochko
Fix #12114
2019-09-03Change OpenGraph description on sign-up page to reflect invite (#11744)Eugen Rochko
2019-03-15Bump webpacker from 3.5.5 to 4.0.2 (#10277)Yamagishi Kazutoshi
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
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-10Add description meta tag additionally to og:description (#8941)Eugen Rochko
Fix #8685
2018-07-31Add separate setting for sidebar text (site_short_description) (#8107)Eugen Rochko
* Add separate setting for sidebar text (site_short_description) * Fix tests
2018-07-28Redesign public profiles and toots (#8068)Eugen Rochko
2018-07-07Add follow button to detailed status, add gradient to mask bio cut-off (#7979)Eugen Rochko
* Add follow button to detailed status, add gradient to mask bio cut-off * In landing strip, show sign up link even if closed (different href) Point to joinmastodon.org
2018-05-06Enable custom emojis in profiles (notes, field values, display names) (#7374)Eugen Rochko
Follow-up to #6124
2017-10-11fix presented og:url is incorrect (#5320)takayamaki
2017-10-11sign_in and sign_up views present og meta infos (#5308)takayamaki
2017-08-16Redesign public profiles (#4608)Eugen Rochko
* Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues
2017-05-22Fix locale regression from #3055 (#3231)Eugen Rochko
2017-05-16chore(landing_strip): hide signup path unless the instance allows ↵Hiroaki Ninomiya
registration. (#3055)
2017-04-23Add link for domain in land strip (#2306)ymmtmdk
* Add link for domain in land strip * Use root_path * Avoid repeating code
2017-04-18Instance helper to replace site title helper (#2038)Matt Jankowski
* Move site title helper to instance helper (name change only) * Remove newline in <title> tag * Add site_hostname helper method to wrap up local_domain value * Use site_hostname helper in places that need local_domain value
2017-04-10Fix issue with missing emojify class in views (#1455)Matt Jankowski
* Add missing emojify class to landing strip * Add missing emojify class to simple_status partial
2017-03-20Add landing stripEugen Rochko
2016-11-15Adding some localizationsEugen Rochko
2016-10-18Improving all formsEugen Rochko
generated by cgit-pink (git 2.37.1) at 2024-11-23 01:43:20 +0000