Eugen Rochko
a235678802
Re-add git and nodejs-npm to Dockerfile ( #6810 )
...
Fix #6809
I don't know why, either
2018-03-17 15:28:09 +01:00
Eugen Rochko
844616e950
Re-add git and nodejs-npm to Dockerfile ( #6810 )
...
Fix #6809
I don't know why, either
2018-03-17 15:28:09 +01:00
Eugen Rochko
d35272245e
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit 64d5c8a512
.
* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806 )"
This reverts commit 36734278ba
.
* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782 )"
This reverts commit 8f374100ed
.
* Revert "Correct the reference to user's password in mastodon:add_user task (#6800 )"
This reverts commit 7b247b15f2
.
* Revert "Upgrade Paperclip to version 6.0.0 (#6754 )"
This reverts commit cd6dee83a1
.
2018-03-17 14:20:35 +01:00
Eugen Rochko
40871caa4b
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit cdf8b92fea
.
* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806 )"
This reverts commit 0074cad44f
.
* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782 )"
This reverts commit 4a0a19fe54
.
* Revert "Correct the reference to user's password in mastodon:add_user task (#6800 )"
This reverts commit 338bff8b93
.
* Revert "Upgrade Paperclip to version 6.0.0 (#6754 )"
This reverts commit b88fcd53f7
.
2018-03-17 14:20:35 +01:00
Eugen Rochko
64d5c8a512
Bump version to 2.3.2rc1
2018-03-17 14:07:00 +01:00
Eugen Rochko
cdf8b92fea
Bump version to 2.3.2rc1
2018-03-17 14:07:00 +01:00
Eugen Rochko
36734278ba
Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 ( #6806 )
...
Fix 6734
2018-03-17 14:06:25 +01:00
Eugen Rochko
0074cad44f
Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 ( #6806 )
...
Fix 6734
2018-03-17 14:06:25 +01:00
Daniel Hunsaker
8f374100ed
Handle Mastodon::HostValidationError when pulling remoteable assets ( #6782 )
...
This will prevent, for example, `rake mastodon:redownload_avatars` from crashing when an instance is no longer responding to connection attempts, instead silently continuing as expected.
2018-03-17 13:27:50 +01:00
Daniel Hunsaker
4a0a19fe54
Handle Mastodon::HostValidationError when pulling remoteable assets ( #6782 )
...
This will prevent, for example, `rake mastodon:redownload_avatars` from crashing when an instance is no longer responding to connection attempts, instead silently continuing as expected.
2018-03-17 13:27:50 +01:00
Akihiko Odaki
7b247b15f2
Correct the reference to user's password in mastodon:add_user task ( #6800 )
2018-03-17 13:27:19 +01:00
Akihiko Odaki
338bff8b93
Correct the reference to user's password in mastodon:add_user task ( #6800 )
2018-03-17 13:27:19 +01:00
Yamagishi Kazutoshi
cd6dee83a1
Upgrade Paperclip to version 6.0.0 ( #6754 )
2018-03-17 12:37:58 +01:00
Yamagishi Kazutoshi
b88fcd53f7
Upgrade Paperclip to version 6.0.0 ( #6754 )
2018-03-17 12:37:58 +01:00
trwnh
e3984f76a4
Properly center .nothing-here ( #6787 ) ( #6788 )
...
Apply "margin: 0 auto;" at line 443 to fix issue #6787
2018-03-17 12:35:35 +01:00
trwnh
ca7e6a6d2e
Properly center .nothing-here ( #6787 ) ( #6788 )
...
Apply "margin: 0 auto;" at line 443 to fix issue #6787
2018-03-17 12:35:35 +01:00
Akihiko Odaki
8b645b5bca
Cache HTML page with Service Worker ( #6802 )
...
This is the first step to make Mastodon work offline. It is also required
by Chromium to trigger Web Manifest automated install prompt.
2018-03-17 12:35:13 +01:00
Akihiko Odaki
f0cd957c7a
Cache HTML page with Service Worker ( #6802 )
...
This is the first step to make Mastodon work offline. It is also required
by Chromium to trigger Web Manifest automated install prompt.
2018-03-17 12:35:13 +01:00
Daniel Hunsaker
354d34a053
[Nanobox] Stream backups to the warehouse ( #6799 )
...
The `curl` docs are terrible. Use `-X POST -T` instead of `--data-binary`, to avoid loading entire backups into memory _before_ transferring to the warehouse, and just stream the data across as it comes in.
2018-03-17 08:39:14 +01:00
Daniel Hunsaker
64fc8d2b07
[Nanobox] Stream backups to the warehouse ( #6799 )
...
The `curl` docs are terrible. Use `-X POST -T` instead of `--data-binary`, to avoid loading entire backups into memory _before_ transferring to the warehouse, and just stream the data across as it comes in.
2018-03-17 08:39:14 +01:00
David Yip
1500cac87d
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
2018-03-16 18:15:59 -05:00
David Yip
fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
2018-03-16 18:15:59 -05:00
Ash Levy
9972506493
fix non-notification boosts
2018-03-16 18:36:35 -04:00
Ash Levy
33d5fe889a
fix non-notification boosts
2018-03-16 18:36:35 -04:00
Thibaut Girka
b05bebce6d
[Glitch] Federate pinned statuses over ActivityPub
...
Port b1f8dfd3cf
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
6f0e50f9a0
[Glitch] Federate pinned statuses over ActivityPub
...
Port 9110db41c5
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
b1691c9811
[Glitch] Improve style of web UI account tabs
...
Port of 5ce4b21455
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
cd73af3bd0
[Glitch] Improve style of web UI account tabs
...
Port of 38b9af76a2
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
ce24c3186b
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port ca9d8402c3
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
f00af46d70
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port 5131012505
to glitch
2018-03-16 23:16:20 +01:00
David Yip
16fa0e15a9
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
...
Port reports ui changes to glitch-soc flavour
2018-03-16 17:13:09 -05:00
David Yip
50f56ba375
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
...
Port reports ui changes to glitch-soc flavour
2018-03-16 17:13:09 -05:00
David Yip
b020d451a9
Merge pull request #389 from ThibG/glitch-soc/error-500
...
Fix error 500 page
2018-03-16 16:51:19 -05:00
David Yip
8383f777fb
Merge pull request #389 from ThibG/glitch-soc/error-500
...
Fix error 500 page
2018-03-16 16:51:19 -05:00
David Yip
3c05ed5ce6
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
David Yip
a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
Thibaut Girka
5c8ae1c7f8
Fix error 500 page
2018-03-16 22:31:20 +01:00
Thibaut Girka
cf754e6a91
Fix error 500 page
2018-03-16 22:31:20 +01:00
Thibaut Girka
f31d4ef2d3
Fix toot text color in the report modal
2018-03-16 15:27:13 +01:00
Thibaut Girka
9c40a5f3c8
Fix toot text color in the report modal
2018-03-16 15:27:13 +01:00
Thibaut Girka
5ac00cbf1f
Show media on report UI
...
Ports deba74063f
to glitch-soc
2018-03-16 15:27:13 +01:00
Thibaut Girka
19f7bd1582
Show media on report UI
...
Ports 219aac7800
to glitch-soc
2018-03-16 15:27:13 +01:00
Thibaut Girka
8e7394c876
Add close modal icon to report dialog ( #6591 )
...
Port 9769285278
to glitch-soc flavour
2018-03-16 15:27:13 +01:00
Thibaut Girka
22870985da
Add close modal icon to report dialog ( #6591 )
...
Port 379cdfaac5
to glitch-soc flavour
2018-03-16 15:27:13 +01:00
Thibaut Girka
15563f8421
Port federated reports UI to glitchsoc
...
Port 0ebd2a1718
to glitch-soc
2018-03-16 15:27:13 +01:00
Thibaut Girka
9cf574d0d2
Port federated reports UI to glitchsoc
...
Port 41a01bec23
to glitch-soc
2018-03-16 15:27:13 +01:00
Jenkins
dd0dafed03
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-13 18:17:20 +00:00
Jenkins
d75a6054a0
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-13 18:17:20 +00:00
Ash Levy
1d27649098
compress boost/fave notifications more
2018-03-13 13:54:57 -04:00
Ash Levy
9317f6853e
compress boost/fave notifications more
2018-03-13 13:54:57 -04:00