treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
8,053 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

8053 Commits (5aaf52b46c9fa60745dc380686720361700495c0)

Author SHA1 Message Date
ThibG 5aaf52b46c Merge pull request #842 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-02 20:42:10 +01:00
Thibaut Girka e5aadde0d5 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-02 20:29:14 +01:00
Eugen Rochko 9b85750348 Bump version to 2.6.5 (#9413) 2018-12-02 17:41:38 +01:00
ThibG 4813053e97 Preload common JSON-LD contexts (#9412) 
Fixes #9411
 2018-12-02 16:46:13 +01:00
ThibG f523852b87 Merge pull request #840 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-02 11:35:26 +01:00
Thibaut Girka d67776ac83 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
Thibaut Girka 606f0df712 Fix since_id 2018-12-01 18:59:24 +01:00
ThibG a3f01ec6f8 Fix last_status parameter for notifications and conversations (#9407) 2018-12-01 18:36:41 +01:00
Quentí d69ee38a7b [i18n] update and corrections for Occitan locale (#9404) 
* Update + correction

Colomna and not columna
Pòt, verb missing

* Correction

D’aquí is followed by a time period, and dins by a season.
Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details.

* Correction admin zone

* Correction

Reïnicializacion, with the funny ï
 2018-12-01 17:39:13 +01:00
Paweł Ngei 49fe8fa425 Add a tooltip explaining what a locked account is (#9403) 
* create a title tooltip explaining what a locked account is

* improve phrasing

* minor phrasing fix to unify default and english
 2018-12-01 14:25:15 +01:00
ThibG c430672460 Merge pull request #837 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-30 22:37:58 +01:00
Thibaut Girka a281d3ebd3 Scroll to selected toot even if the ancestors happen to be loaded 2018-11-30 22:37:38 +01:00
Thibaut Girka 8117ba2cb1 Scroll to detailed status when new ancestors get inserted 2018-11-30 22:37:38 +01:00
Thibaut Girka 5a03b30f13 [Glitch] Fix bug in order of conversations in web UI 
Port 2af43c3dce to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka ff50412846 [Glitch] Replace recursion in status mapStateToProps 
Port 20a23c7d08 to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka 45ba4e83e0 [Glitch] Fix context building in the reducer 
Port a5c740ba41 to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka 05d7c498ba [Glitch] Introduce flat layout to contexts reducer 
Port 4e718bbb25 to glitch-soc
 2018-11-30 22:37:38 +01:00
Eugen Rochko ecc22893f6 Bump version to 2.6.4 (#9402) 2018-11-30 21:38:09 +01:00
Thibaut Girka fda8506a9c Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01:00
mayaeh 88e40d03d9 Fix that translation is not applied to "joining hashtags" (#9397) 2018-11-30 19:36:09 +01:00
Eugen Rochko 272c58904f Remove npm-run-all dependency (#9401) 
Fix #9359
 2018-11-30 19:16:32 +01:00
dependabot[bot] 3a75150a93 Bump oj from 3.7.1 to 3.7.4 (#9393) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.1 to 3.7.4.
- [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.1...v3.7.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-30 19:09:31 +01:00
dependabot[bot] 1b7a2516e8 Bump fastimage from 2.1.4 to 2.1.5 (#9395) 
Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.1.4 to 2.1.5.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.1.4...v2.1.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-30 19:08:31 +01:00
Eugen Rochko ab3f2aba04 Bump version to 2.6.3 (#9391) 2018-11-30 14:20:15 +01:00
ThibG 546ce24295 Merge pull request #835 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-29 21:47:18 +01:00
Thibaut Girka 77b9249250 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
Thibaut Girka fc707adcde Improve detailed status component lifecycle 
- Move componentWillMount and componentWillReceiveProps logic to
  getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
 2018-11-29 18:32:42 +01:00
ThibG a6b5451df5 Swap avatar and header input fields in profile page (#9271) 
Fixes #9211
 2018-11-29 02:56:09 +01:00
Thibaut Girka c37a81a5d7 Do not hardcode preferences link, pleroma doesn't have it 2018-11-28 22:36:01 +01:00
Thibaut Girka cb2822b68a Add error boundary component to catch Web UI crashes 2018-11-28 22:36:01 +01:00
Thibaut Girka c0675a272e Do not crash the whole UI when loading an invalid column 2018-11-28 22:36:01 +01:00
Thibaut Girka 76603a189a Switch “cycling” reply policy link to set of radio inputs 
Fixes #832
 2018-11-28 22:35:42 +01:00
dependabot[bot] 45cdfe00c5 Bump aws-sdk-s3 from 1.25.0 to 1.27.0 (#9385) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.25.0 to 1.27.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/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-28 16:34:53 +01:00
Thibaut Girka 6be659a5ba Add specs for list replies policy 2018-11-28 14:46:07 +01:00
Thibaut Girka f21f359653 Add basic UI to set list replies setting in glitch-soc 2018-11-28 14:46:07 +01:00
Thibaut Girka 5b84011025 Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
Thibaut Girka b2e9a23ac9 Add database support for list show-reply preferences 2018-11-28 14:46:07 +01:00
dependabot[bot] 33fbb0f65a [Security] Bump rails from 5.2.1 to 5.2.1.1 (#9383) 
Bumps [rails](https://github.com/rails/rails) from 5.2.1 to 5.2.1.1. **This update includes security fixes.**
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.1...v5.2.1.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-27 23:34:39 +01:00
David Yip 50b7d2f002 Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders 
[Glitch] Volume sliders for videos
 2018-11-27 15:27:21 -06:00
Eugen Rochko 030ce53623 Fix TLS handshake timeout not being enforced (#9381) 
Follow-up to #9329
 2018-11-27 19:46:05 +01:00
Eugen Rochko 12ee020187 Skip deliveries to inboxes that have already been marked as unavailable (#9358) 2018-11-27 19:15:08 +01:00
Eugen Rochko 81536e07ab Don't count suspended users in user count (#9380) 
Fix #7637
 2018-11-27 18:49:37 +01:00
Eugen Rochko 8c7ba82dc1 Fix nil error when no DNS addresses are found for host (#9379) 2018-11-27 18:13:36 +01:00
Marcin Mikołajczak cb7ecf5df8 Do not leak existence of e-mail addresses during login attempt, part 2 (#9376) 
* Do not leak existence of e-mail addresses during login attempt, part 2

* Update devise.uk.yml
 2018-11-27 17:39:41 +01:00
Marcin Mikołajczak 72ee0afe5f security/l10n [fr] do not leak registered e-mail addresses (#9375) 
Do not leak existence of e-mail addresses during login attempt in French translation
 2018-11-27 16:40:39 +01:00
ThibG d47ccbf5ba Merge pull request #828 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-27 16:26:18 +01:00
Thibaut Girka c81ad5a2cb [Glitch] Volume sliders for videos 
Port b7229bef1a to glitch-soc
 2018-11-27 15:21:57 +01:00
Thibaut Girka 35b6fb4e62 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-27 15:10:58 +01:00
Eugen Rochko 163c5e6893 Bump version to 2.6.2 (#9370) 2018-11-27 13:56:47 +01:00
Eugen Rochko 9606e4dabf Change identities id column to a bigint (#9371) 
* fix: change Identity's id column to a bigint

This appears to be the last model created using a 5.0 migration,
where column types defaulted to `integer` rather than `bigint`.

This migration changes the column type to match that of all of the
other ID columns.

* Change user_id column in identities to bigint and fix down-migration
 2018-11-27 13:56:25 +01:00