about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-03-26[Glitch] Add custom closed registrations message to landing page when setEugen Rochko
Port SCSS changes from 55a9658ad8552804c7c585df12d46c391b84dd94 to glitch-soc
2019-03-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/settings_controller.rb - app/models/form/admin_settings.rb Conflicts caused by upstream refactoring, while we have flavours and skins, with the flavour_and_skin pseudo-setting.
2019-03-23Change settings description (#10312)Jeong Arm
- site_description is no longer visible on front page - short_description is not fallback to site_description
2019-03-23Do not show identity proofs menu item unless there are identity proofs (#10350)Eugen Rochko
2019-03-23Fix vote-after-expiration not showing error, count vote as interaction (#10352)Eugen Rochko
2019-03-23Add validations to admin settings (#10348)Eugen Rochko
* Add validations to admin settings - Validate correct HTML markup - Validate presence of contact username & e-mail - Validate that all usernames are valid - Validate that enums have expected values * Fix code style issue * Fix tests
2019-03-23Add custom closed registrations message to landing page when set (#10347)Eugen Rochko
2019-03-23If registrations have been re-opened when user confirms account, approve ↵Eugen Rochko
(#10349)
2019-03-22Merge pull request #965 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-22Bump memory_profiler from 0.9.12 to 0.9.13 (#10341)dependabot[bot]
Bumps [memory_profiler](https://github.com/SamSaffron/memory_profiler) from 0.9.12 to 0.9.13. - [Release notes](https://github.com/SamSaffron/memory_profiler/releases) - [Changelog](https://github.com/SamSaffron/memory_profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/SamSaffron/memory_profiler/compare/v0.9.12...v0.9.13) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-22Bump aws-sdk-s3 from 1.33.0 to 1.34.0 (#10342)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.33.0 to 1.34.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.33.0...v1.34.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-21Improve config serializer for Keybase (#10338)Eugen Rochko
- Regex must no longer be surrounded by `/` - Description must be short and cannot contain HTML tags
2019-03-21Mark the 410 gone response for suspended accounts as cachable (#10339)ThibG
This will help a great deal with #9377 when a caching reverse proxy is configured.
2019-03-21Fix processing poll Updates (#10333)ThibG
ActivityPub::ProcessPollService was checking the JSON-LD context although it was passed only the `Question` object embedded in the `Update` activity.
2019-03-21Bump puma from 3.12.0 to 3.12.1 (#10331)dependabot[bot]
Bumps [puma](https://github.com/puma/puma) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v3.12.0...v3.12.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-21Bump oj from 3.7.10 to 3.7.11 (#10332)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.7.10 to 3.7.11. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.10...v3.7.11) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-21Bump capybara from 3.14.0 to 3.15.0 (#10330)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.14.0...3.15.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-21cas_options :validate_url should be :service_validate_url (#10328)Eric
Otherwise, no matter what is given for CAS_VALIDATE_URL the default /serviceValidate path would be used.
2019-03-20Merge pull request #964 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-20[Glitch] Add support for custom emojis in poll optionsThibG
Fixes #956 Port 80f0910e2141b24082b9143266a9a6cf1ef6a516 to glitch-soc
2019-03-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-20Add support for custom emojis in poll options (#10322)ThibG
* Backend changes for custom emoji support in poll options * Serialize poll emojis in REST API * Render custom emojis in poll options * Render custom emoji in poll options on public pages
2019-03-20Do not try fetching keys of unknown accounts on a Delete from them (#10326)ThibG
2019-03-20[Glitch] Reduce padding around logo on landing pageThibG
Port 158c31b9df538691666e5b91f48a0afecd2985fe to glitch-soc
2019-03-20[Glitch] Add Keybase integrationEugen Rochko
Port SCSS changes from 9c4cbdbafb0324ae259e10865b90ed1ed0255bdd to glitch-soc
2019-03-20[Glitch] Disable real-time updates on public pages to improve readabilityEugen Rochko
Port 42c581c45853cf08f2c9c521d59a2194ef2d9c61 to glitch-soc
2019-03-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/en.yml Conflict caused by the glitch-soc-specific “flavour” string being too close to the newly introduced “identity_proofs” string. Just included both.
2019-03-19Reduce padding around logo on landing page (#10291)ThibG
2019-03-19Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.32.0 to 1.33.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.32.0...v1.33.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-19Bump rubocop from 0.65.0 to 0.66.0 (#10318)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.65.0 to 0.66.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.65.0...v0.66.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-19Do not distribute Delete when rejecting unapproved accounts (#10321)ThibG
2019-03-19Do not show timeline preview or directory widgets if they are disabled (#10284)ThibG
2019-03-18Add missing locales (bn, ga, hi) (#10295)Eugen Rochko
2019-03-18Add Keybase integration (#10297)Eugen Rochko
* create account_identity_proofs table * add endpoint for keybase to check local proofs * add async task to update validity and liveness of proofs from keybase * first pass keybase proof CRUD * second pass keybase proof creation * clean up proof list and add badges * add avatar url to keybase api * Always highlight the “Identity Proofs” navigation item when interacting with proofs. * Update translations. * Add profile URL. * Reorder proofs. * Add proofs to bio. * Update settings/identity_proofs front-end. * Use `link_to`. * Only encode query params if they exist. URLs without params had a trailing `?`. * Only show live proofs. * change valid to active in proof list and update liveness before displaying * minor fixes * add keybase config at well-known path * extremely naive feature flagging off the identity proof UI * fixes for rubocop * make identity proofs page resilient to potential keybase issues * normalize i18n * tweaks for brakeman * remove two unused translations * cleanup and add more localizations * make keybase_contacts an admin setting * fix ExternalProofService my_domain * use Addressable::URI in identity proofs * use active model serializer for keybase proof config * more cleanup of keybase proof config * rename proof is_valid and is_live to proof_valid and proof_live * cleanup * assorted tweaks for more robust communication with keybase * Clean up * Small fixes * Display verified identity identically to verified links * Clean up unused CSS * Add caching for Keybase avatar URLs * Remove keybase_contacts setting
2019-03-18Merge pull request #963 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-03-18Disable real-time updates on public pages to improve readability (#10260)Eugen Rochko
2019-03-18[Glitch] Fix relationship manager on narrow screensEugen Rochko
Port 7130d6e51291b08df59f9580c7d6e1c1d97e7dad to glitch-soc
2019-03-18[Glitch] Save quick filter settings when selecting a different filterThibG
Port 7477db7268f2a4c158e5f7683493a728d632f7e2 to glitch-soc
2019-03-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
2019-03-18Bump brakeman from 4.4.0 to 4.5.0 (#10309)dependabot[bot]
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.4.0 to 4.5.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.4.0...v4.5.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18Bump httplog from 1.2.1 to 1.2.2 (#10311)dependabot[bot]
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18Bump pkg-config from 1.3.6 to 1.3.7 (#10310)dependabot[bot]
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.6 to 1.3.7. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.6...1.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-03-18Add dormant filter to relationship manager, rename other filters (#10308)Eugen Rochko
Rename "abandoned" to "moved", and "active" to "primary"
2019-03-17Fix relationship manager on narrow screens (#10293)Eugen Rochko
At the cost of functionality
2019-03-17Reduce server load caused by anonymous viewing. (#9059)Ben Lubar
Do not start a session if the current user is not logged in for public-facing pages. Mark pages that don't care about sessions as publicly cacheable. Keep the max age as 0 so proxies and browsers will still try to retrieve an updated version but can still fall back to the stale version if the site is down or too slow. Fixes #9035.
2019-03-17Set and store report URIs (#10303)ThibG
Fixes #10271
2019-03-17Fix reblogs privacy (#10302)ThibG
* Fix reblogs privacy * Fix Announce processing specs
2019-03-17I18n: Fix Czech pluralization (#10301)Aditoo17
2019-03-17Save quick filter settings when selecting a different filter (#10296)ThibG
The active filter is stored in the web app's settings, but no save is explicitly triggered, meaning that it is only saved when a different setting is changed.
generated by cgit-pink (git 2.37.1) at 2024-12-23 05:16:30 +0000