tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
8,918 Commits 20 Branches 113 Tags 222 MiB
648cf8bfd5
Commit Graph

8918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen Rochko
648cf8bfd5 [Glitch] Add custom closed registrations message to landing page when set 
Port SCSS changes from 55a9658ad8 to glitch-soc
 2019-03-26 16:01:59 +01:00
Thibaut Girka
fcce135d27 Merge branch 'master' into glitch-soc/merge-upstream 
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-26 16:01:59 +01:00
Jeong Arm
9ec98893f4 Change settings description (#10312) 
- site_description is no longer visible on front page
- short_description is not fallback to site_description
 2019-03-23 16:11:58 +01:00
Eugen Rochko
08c3ce51aa
Do not show identity proofs menu item unless there are identity proofs (#10350) 2019-03-23 14:07:46 +01:00
Eugen Rochko
9d0573f574
Fix vote-after-expiration not showing error, count vote as interaction (#10352) 2019-03-23 14:07:17 +01:00
Eugen Rochko
555c4e11ba
Add validations to admin settings (#10348) 
* 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-23 14:07:04 +01:00
Eugen Rochko
55a9658ad8
Add custom closed registrations message to landing page when set (#10347) 2019-03-23 02:24:01 +01:00
Eugen Rochko
00d988955f
If registrations have been re-opened when user confirms account, approve (#10349) 2019-03-23 02:23:48 +01:00
ThibG
9f56511860
Merge pull request #965 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-22 20:22:18 +01:00
dependabot[bot]
013a9e0bed Bump memory_profiler from 0.9.12 to 0.9.13 (#10341) 
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-22 22:43:22 +09:00
dependabot[bot]
d23ff0c5c9 Bump aws-sdk-s3 from 1.33.0 to 1.34.0 (#10342) 
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-22 22:42:59 +09:00
Thibaut Girka
edd5441112 Merge branch 'master' into glitch-soc/merge-upstream 2019-03-22 13:05:17 +01:00
Eugen Rochko
3411fbef19
Improve config serializer for Keybase (#10338) 
- Regex must no longer be surrounded by `/`
- Description must be short and cannot contain HTML tags
 2019-03-21 23:33:28 +01:00
ThibG
2361917944 Mark the 410 gone response for suspended accounts as cachable (#10339) 
This will help a great deal with #9377 when a caching reverse proxy is
configured.
 2019-03-21 23:33:18 +01:00
ThibG
62dd0b7f9c Fix processing poll Updates (#10333) 
ActivityPub::ProcessPollService was checking the JSON-LD context although
it was passed only the `Question` object embedded in the `Update` activity.
 2019-03-21 14:24:09 +01:00
dependabot[bot]
d66bbdd353 Bump puma from 3.12.0 to 3.12.1 (#10331) 
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-21 19:03:02 +09:00
dependabot[bot]
4f91c8510f Bump oj from 3.7.10 to 3.7.11 (#10332) 
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-21 19:02:48 +09:00
dependabot[bot]
88be18125e Bump capybara from 3.14.0 to 3.15.0 (#10330) 
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-21 19:02:21 +09:00
Eric
7169928f96 cas_options :validate_url should be :service_validate_url (#10328) 
Otherwise, no matter what is given for CAS_VALIDATE_URL the default /serviceValidate path would be used.
 2019-03-21 04:06:41 +01:00
ThibG
bde9196b70
Merge pull request #964 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-20 20:13:22 +01:00
ThibG
8b5b686f08 [Glitch] Add support for custom emojis in poll options 
Fixes #956

Port 80f0910e21 to glitch-soc
 2019-03-20 17:34:32 +01:00
Thibaut Girka
cbf1d711ba Merge branch 'master' into glitch-soc/merge-upstream 2019-03-20 17:32:39 +01:00
ThibG
80f0910e21 Add support for custom emojis in poll options (#10322) 
* 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-20 17:29:12 +01:00
ThibG
66d9452092 Do not try fetching keys of unknown accounts on a Delete from them (#10326) 2019-03-20 17:20:16 +01:00
ThibG
803c350ef5 [Glitch] Reduce padding around logo on landing page 
Port 158c31b9df to glitch-soc
 2019-03-20 14:54:52 +01:00
Eugen Rochko
4d01d9c46f [Glitch] Add Keybase integration 
Port SCSS changes from 9c4cbdbafb to glitch-soc
 2019-03-20 14:54:19 +01:00
Eugen Rochko
2a93c88015 [Glitch] Disable real-time updates on public pages to improve readability 
Port 42c581c458 to glitch-soc
 2019-03-20 14:51:25 +01:00
Thibaut Girka
1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
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-20 13:54:00 +01:00
ThibG
158c31b9df Reduce padding around logo on landing page (#10291) 2019-03-19 23:47:10 +01:00
dependabot[bot]
941b0adcae Bump aws-sdk-s3 from 1.32.0 to 1.33.0 (#10319) 
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-19 16:34:21 +01:00
dependabot[bot]
c95e3a2e34 Bump rubocop from 0.65.0 to 0.66.0 (#10318) 
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-19 16:34:04 +01:00
ThibG
1217185cfa Do not distribute Delete when rejecting unapproved accounts (#10321) 2019-03-19 16:33:30 +01:00
ThibG
d041b7a1e7 Do not show timeline preview or directory widgets if they are disabled (#10284) 2019-03-19 05:48:17 +01:00
Eugen Rochko
9d9b6e3543
Add missing locales (bn, ga, hi) (#10295) 2019-03-18 21:55:21 +01:00
Eugen Rochko
9c4cbdbafb
Add Keybase integration (#10297) 
* 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-18 21:00:55 +01:00
ThibG
b9a998f201
Merge pull request #963 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-03-18 19:54:23 +01:00
Eugen Rochko
42c581c458
Disable real-time updates on public pages to improve readability (#10260) 2019-03-18 18:34:56 +01:00
Eugen Rochko
841b920af5 [Glitch] Fix relationship manager on narrow screens 
Port 7130d6e512 to glitch-soc
 2019-03-18 18:07:03 +01:00
ThibG
200cd3b5a7 [Glitch] Save quick filter settings when selecting a different filter 
Port 7477db7268 to glitch-soc
 2019-03-18 18:06:26 +01:00
Thibaut Girka
291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
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-18 18:03:27 +01:00
dependabot[bot]
f85b66eb8c Bump brakeman from 4.4.0 to 4.5.0 (#10309) 
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-18 14:41:44 +01:00
dependabot[bot]
2bdb6dac28 Bump httplog from 1.2.1 to 1.2.2 (#10311) 
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-18 19:32:28 +09:00
dependabot[bot]
14c6cbbf6b Bump pkg-config from 1.3.6 to 1.3.7 (#10310) 
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-18 19:32:10 +09:00
Eugen Rochko
b8e4c85e69
Add dormant filter to relationship manager, rename other filters (#10308) 
Rename "abandoned" to "moved", and "active" to "primary"
 2019-03-18 03:53:17 +01:00
Eugen Rochko
7130d6e512
Fix relationship manager on narrow screens (#10293) 
At the cost of functionality
 2019-03-17 22:36:54 +01:00
Ben Lubar
c3d1594576 Reduce server load caused by anonymous viewing. (#9059) 
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-17 15:39:25 +01:00
ThibG
a20354a20b Set and store report URIs (#10303) 
Fixes #10271
 2019-03-17 15:34:56 +01:00
ThibG
5e38ef87a7 Fix reblogs privacy (#10302) 
* Fix reblogs privacy

* Fix Announce processing specs
 2019-03-17 14:54:09 +01:00
Aditoo17
c92a1cf5c1 I18n: Fix Czech pluralization (#10301) 2019-03-17 16:39:30 +09:00
ThibG
7477db7268 Save quick filter settings when selecting a different filter (#10296) 
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.
 2019-03-17 03:13:29 +01:00