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,408 Commits 20 Branches 113 Tags 222 MiB
ad32896a93
Commit Graph

8408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
2b657c175f Bump pry-rails from 0.3.7 to 0.3.8 (#9418) 
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8.
- [Release notes](https://github.com/rweng/pry-rails/releases)
- [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-12-04 09:26:40 +09:00
Eugen Rochko
58a29db99d
Add database statement timeout of 60s (#9382) 2018-12-03 01:32:27 +01:00
Eugen Rochko
6ddf0432e7
Improve account suspension speed and completeness (#9290) 
- Some associations were missing from the clean-up
- Some attributes were not reset on suspension
- Skip federation and streaming deletes when purging a dead domain
- Move account association definitions to concern
 2018-12-03 01:32:08 +01:00
David Yip
fe9340d95e
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries 
Display a double reply arrow on public pages for toots that are replies
 2018-12-02 16:30:52 -06:00
ThibG
80462e1b8d
Merge pull request #842 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-02 20:42:10 +01:00
Thibaut Girka
d32d33f408 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-02 20:29:14 +01:00
Eugen Rochko
2df5ef18ae
Bump version to 2.6.5 (#9413) 2018-12-02 17:41:38 +01:00
ThibG
84e5ed43e7 Preload common JSON-LD contexts (#9412) 
Fixes #9411
 2018-12-02 16:46:13 +01:00
ThibG
44e6c2dd74
Merge pull request #840 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-12-02 11:35:26 +01:00
Thibaut Girka
a07e37cc17 Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
Thibaut Girka
4b85bf12ab Fix since_id 2018-12-01 18:59:24 +01:00
ThibG
5648b30d6c Fix last_status parameter for notifications and conversations (#9407) 2018-12-01 18:36:41 +01:00
Quentí
6a285f0a15 [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
b9ec34de57 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
3cbe0c26bb
Merge pull request #837 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-30 22:37:58 +01:00
Thibaut Girka
76320bf6d8 Scroll to selected toot even if the ancestors happen to be loaded 2018-11-30 22:37:38 +01:00
Thibaut Girka
a10fee3c09 Scroll to detailed status when new ancestors get inserted 2018-11-30 22:37:38 +01:00
Thibaut Girka
31599ad91c [Glitch] Fix bug in order of conversations in web UI 
Port e18390cfe6 to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka
837ea32c88 [Glitch] Replace recursion in status mapStateToProps 
Port dfbadd6837 to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka
a28f5695f3 [Glitch] Fix context building in the reducer 
Port 7706ed038f to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka
1624a95b2b [Glitch] Introduce flat layout to contexts reducer 
Port 023fe5181b to glitch-soc
 2018-11-30 22:37:38 +01:00
Thibaut Girka
1a5de04789 Display a double reply arrow on public pages for toots that are replies 2018-11-30 22:09:52 +01:00
Eugen Rochko
c480da375b
Bump version to 2.6.4 (#9402) 2018-11-30 21:38:09 +01:00
Thibaut Girka
bc8411ec87 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-30 20:16:26 +01:00
mayaeh
bfec030a4e Fix that translation is not applied to "joining hashtags" (#9397) 2018-11-30 19:36:09 +01:00
Eugen Rochko
3948b6fa52
Remove npm-run-all dependency (#9401) 
Fix #9359
 2018-11-30 19:16:32 +01:00
dependabot[bot]
d0453e77dc 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]
5866e0b909 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
d037e88277
Bump version to 2.6.3 (#9391) 2018-11-30 14:20:15 +01:00
ThibG
b65daa25fa
Merge pull request #835 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-29 21:47:18 +01:00
Thibaut Girka
ad7a3974cc Merge branch 'master' into glitch-soc/merge-upstream 2018-11-29 19:22:52 +01:00
Thibaut Girka
6a264c9379 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
fa9f28f52d Swap avatar and header input fields in profile page (#9271) 
Fixes #9211
 2018-11-29 02:56:09 +01:00
Thibaut Girka
7e63fb26e0 Do not hardcode preferences link, pleroma doesn't have it 2018-11-28 22:36:01 +01:00
Thibaut Girka
922d05864f Add error boundary component to catch Web UI crashes 2018-11-28 22:36:01 +01:00
Thibaut Girka
39c8a71df8 Do not crash the whole UI when loading an invalid column 2018-11-28 22:36:01 +01:00
Thibaut Girka
c18bb5d245 Switch “cycling” reply policy link to set of radio inputs 
Fixes #832
 2018-11-28 22:35:42 +01:00
dependabot[bot]
6fac300ea4 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
6b22845039 Add specs for list replies policy 2018-11-28 14:46:07 +01:00
Thibaut Girka
f17a61a916 Add basic UI to set list replies setting in glitch-soc 2018-11-28 14:46:07 +01:00
Thibaut Girka
06c7fb8015 Add backend support to read and update list-specific show_replies settings 2018-11-28 14:46:07 +01:00
Thibaut Girka
53d0293d25 Add database support for list show-reply preferences 2018-11-28 14:46:07 +01:00
dependabot[bot]
7f68452a15 [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
74a281475a
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
c39d7e7b2b
Fix TLS handshake timeout not being enforced (#9381) 
Follow-up to #9329
 2018-11-27 19:46:05 +01:00
Eugen Rochko
11955600ad
Skip deliveries to inboxes that have already been marked as unavailable (#9358) 2018-11-27 19:15:08 +01:00
Eugen Rochko
81f96c973a
Don't count suspended users in user count (#9380) 
Fix #7637
 2018-11-27 18:49:37 +01:00
Eugen Rochko
43c311b3a1
Fix nil error when no DNS addresses are found for host (#9379) 2018-11-27 18:13:36 +01:00
Marcin Mikołajczak
cb583ff355 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
6bdc9866b7 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