Sam Schlinkert
7e81bca500
Bumps copyright year in README.md to 2019 ( #9939 )
...
This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.
2019-01-28 22:57:42 +01:00
ThibG
d524244d3a
Merge pull request #901 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-28 21:40:38 +01:00
ThibG
48d00ac0d9
Merge pull request #901 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-28 21:40:38 +01:00
Thibaut Girka
3be4189998
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
Thibaut Girka
42713b9710
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- README.md: kept our version
2019-01-28 21:14:47 +01:00
Eugen Rochko
0848f9b66c
Bump version to 2.7.1 ( #9932 )
2019-01-28 04:24:12 +01:00
Eugen Rochko
28866d329b
Bump version to 2.7.1 ( #9932 )
2019-01-28 04:24:12 +01:00
Eugen Rochko
49aaaa77a6
Fix slow fallback of CopyAccountStats migration setting stats to 0 ( #9930 )
2019-01-28 04:18:35 +01:00
Eugen Rochko
5d312ef9c7
Fix slow fallback of CopyAccountStats migration setting stats to 0 ( #9930 )
2019-01-28 04:18:35 +01:00
Eugen Rochko
3b5b6d19f5
Add note that contributors may request reimbursement through OpenCollective ( #9933 )
2019-01-28 04:17:11 +01:00
Eugen Rochko
d4300c3b98
Add note that contributors may request reimbursement through OpenCollective ( #9933 )
2019-01-28 04:17:11 +01:00
Stanislas
92801eba9e
Fix SUPERUSER postgres command ( #9877 )
2019-01-27 23:56:07 +01:00
Stanislas
01bc2f84a9
Fix SUPERUSER postgres command ( #9877 )
2019-01-27 23:56:07 +01:00
ThibG
be886031f3
Merge pull request #900 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-27 22:24:29 +01:00
ThibG
e488faaa4a
Merge pull request #900 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-27 22:24:29 +01:00
Thibaut Girka
00fc362103
[Glitch] Fix initial value of volume slider in video player and handle volume changes
...
Port b5feaa4d54
to glitch-soc
2019-01-27 22:02:59 +01:00
Thibaut Girka
f35d790480
[Glitch] Fix initial value of volume slider in video player and handle volume changes
...
Port a53dcaa298
to glitch-soc
2019-01-27 22:02:59 +01:00
Thibaut Girka
333d3a2990
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 21:57:55 +01:00
Thibaut Girka
72bab194ad
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 21:57:55 +01:00
ThibG
b5feaa4d54
Fix initial value of volume slider in video player and handle volume changes ( #9929 )
...
* Fix initial value of volume slider in video player and handle volume changes
* Clean up dead/incorrect code
2019-01-27 21:18:15 +01:00
ThibG
a53dcaa298
Fix initial value of volume slider in video player and handle volume changes ( #9929 )
...
* Fix initial value of volume slider in video player and handle volume changes
* Clean up dead/incorrect code
2019-01-27 21:18:15 +01:00
ThibG
09f7773e26
Implement missing hotkeys for notifications ( #9927 )
2019-01-27 17:54:54 +01:00
ThibG
ec5bd8b8bb
Implement missing hotkeys for notifications ( #9927 )
2019-01-27 17:54:54 +01:00
ThibG
d6293b156a
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-27 14:23:24 +01:00
ThibG
f1adce7f6d
Merge pull request #899 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-27 14:23:24 +01:00
Thibaut Girka
0ccf92ad09
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 13:57:25 +01:00
Thibaut Girka
7251bc3853
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 13:57:25 +01:00
Thibaut Girka
9bd95f11e5
Revert to storing application info, and display it to the author via API
2019-01-27 13:56:41 +01:00
Thibaut Girka
f938800ef4
Revert to storing application info, and display it to the author via API
2019-01-27 13:56:41 +01:00
Thibaut Girka
bb035bb0ab
Make storing and displaying application used to toot opt-in
2019-01-27 13:56:41 +01:00
Thibaut Girka
05415fa5d3
Make storing and displaying application used to toot opt-in
2019-01-27 13:56:41 +01:00
ThibG
b1c76ef610
Prevent posting toots with media attachments from someone else ( #9921 )
2019-01-26 23:59:39 +01:00
ThibG
e2a5be6e9a
Prevent posting toots with media attachments from someone else ( #9921 )
2019-01-26 23:59:39 +01:00
ThibG
c7f31d81fa
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-26 18:47:48 +01:00
ThibG
64cb9b6913
Merge pull request #897 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-26 18:47:48 +01:00
Thibaut Girka
edb28be20b
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-26 18:32:49 +01:00
Thibaut Girka
80d954ec10
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-26 18:32:49 +01:00
ThibG
314adc2447
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-25 22:42:21 +01:00
ThibG
270bf7778d
Merge pull request #896 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-01-25 22:42:21 +01:00
Eugen Rochko
e259f244c6
Fix SSO authentication not working due to missing agreement boolean ( #9915 )
...
Fix #9906
2019-01-25 12:36:54 +01:00
Eugen Rochko
9519d55332
Fix SSO authentication not working due to missing agreement boolean ( #9915 )
...
Fix #9906
2019-01-25 12:36:54 +01:00
trwnh
36b6fee96d
Fix Firefox scrollbar color regression in #9210 ( #9908 )
...
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210 .
2019-01-25 11:48:27 +01:00
trwnh
8ef0498f1c
Fix Firefox scrollbar color regression in #9210 ( #9908 )
...
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210 .
2019-01-25 11:48:27 +01:00
Jeong Arm
fdf6c4a63f
Apply style for .landing-page strong ( #9892 )
2019-01-25 11:48:02 +01:00
Jeong Arm
77394156dd
Apply style for .landing-page strong ( #9892 )
2019-01-25 11:48:02 +01:00
Thibaut Girka
a9c3e77e81
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-25 11:37:49 +01:00
Thibaut Girka
04e2c67389
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-25 11:37:49 +01:00
Renato "Lond" Cerqueira
cde2fe25b9
Rescue SSL error in verify link service ( #9914 )
...
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
2019-01-24 15:38:18 +01:00
Renato "Lond" Cerqueira
e1ec3a9f09
Rescue SSL error in verify link service ( #9914 )
...
If the first link to be verified contains a rel=me link with a SSL
error, the VerifyAccountLinksWorker will fail and not try the following
links. This rescues the SSL error when fetching the link, avoiding this
issue.
2019-01-24 15:38:18 +01:00
trwnh
26fc37a2ea
Fix Firefox scrollbar color regression in #9210 ( #9908 )
...
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210 .
2019-01-24 13:32:23 +01:00