]>
cat aescling's git repositories - mastodon.git/log
Angristan [Tue, 4 Apr 2017 15:23:56 +0000 (17:23 +0200)]
Fix crontab edit
Missing -u parameter to specify the mastodon user.
Eugen Rochko [Tue, 4 Apr 2017 13:26:57 +0000 (15:26 +0200)]
New admin setting: open/close registrations, with custom message, from the admin UI
Eugen [Tue, 4 Apr 2017 12:52:27 +0000 (14:52 +0200)]
Merge pull request #804 from fhalna/development
Accessibility Fix.
Eugen [Tue, 4 Apr 2017 12:51:47 +0000 (14:51 +0200)]
Merge pull request #803 from 0xa/patch-1
Add octodon.social
Eugen [Tue, 4 Apr 2017 12:51:42 +0000 (14:51 +0200)]
Merge branch 'master' into patch-1
Eugen [Tue, 4 Apr 2017 12:51:01 +0000 (14:51 +0200)]
Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
Eugen [Tue, 4 Apr 2017 12:50:35 +0000 (14:50 +0200)]
Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
Eugen [Tue, 4 Apr 2017 12:50:14 +0000 (14:50 +0200)]
Merge pull request #832 from ndarville/patch-1
Fix typo in ISSUE_TEMPLATE
Eugen [Tue, 4 Apr 2017 12:49:48 +0000 (14:49 +0200)]
Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
Niclas Darville [Tue, 4 Apr 2017 12:49:31 +0000 (14:49 +0200)]
Fix typo in ISSUE_TEMPLATE
Eugen [Tue, 4 Apr 2017 12:49:06 +0000 (14:49 +0200)]
Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
Eugen [Tue, 4 Apr 2017 12:48:51 +0000 (14:48 +0200)]
Merge pull request #816 from leowzukw/patch-1
More consistent typography
Eugen [Tue, 4 Apr 2017 12:48:22 +0000 (14:48 +0200)]
Merge pull request #831 from ndarville/patch-1
Create ISSUE_TEMPLATE.md to bring down duplicate issues
Niclas Darville [Tue, 4 Apr 2017 12:46:08 +0000 (14:46 +0200)]
Create ISSUE_TEMPLATE.md
Eugen Rochko [Tue, 4 Apr 2017 12:28:57 +0000 (14:28 +0200)]
Remove sidekiq-merger
Eugen Rochko [Tue, 4 Apr 2017 11:58:34 +0000 (13:58 +0200)]
Reduce number of items in feeds, optimize regeneration worker slightly,
make regeneration worker unique, (only schedule/execute once at a time)
Eugen Rochko [Tue, 4 Apr 2017 11:43:36 +0000 (13:43 +0200)]
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
Eugen Rochko [Tue, 4 Apr 2017 11:02:49 +0000 (13:02 +0200)]
Move OStatus processing back into default queue
Eugen Rochko [Tue, 4 Apr 2017 11:01:14 +0000 (13:01 +0200)]
Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
halna_Tanaguru [Tue, 4 Apr 2017 10:06:53 +0000 (12:06 +0200)]
Merge branch 'master' into development
Leo Wzukw [Tue, 4 Apr 2017 04:58:17 +0000 (06:58 +0200)]
More consistent typography
walfie [Tue, 4 Apr 2017 04:00:56 +0000 (00:00 -0400)]
Fix typo in Heroku guide
Eugen Rochko [Tue, 4 Apr 2017 00:03:16 +0000 (02:03 +0200)]
Fix #808 - smaller elephant friend PNG for frontpage
Eugen Rochko [Tue, 4 Apr 2017 00:00:10 +0000 (02:00 +0200)]
Only call regeneration worker after first login after a 14 day break
Eugen Rochko [Mon, 3 Apr 2017 23:33:34 +0000 (01:33 +0200)]
Fix ActionController::Parameters in API issue
Eugen Rochko [Mon, 3 Apr 2017 22:53:20 +0000 (00:53 +0200)]
Separate background jobs into different queues. ATTENTION: new queue "pull"
must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
Alice [Mon, 3 Apr 2017 21:05:03 +0000 (23:05 +0200)]
Add octodon.social
Eugen Rochko [Mon, 3 Apr 2017 20:54:46 +0000 (22:54 +0200)]
Add check for visibility.nil? even though it can't ever be, to check for race conditions
halna_Tanaguru [Mon, 3 Apr 2017 20:45:29 +0000 (22:45 +0200)]
accessibility fix
eanable focus on ClearColumnButton
Aesen [Mon, 3 Apr 2017 19:52:33 +0000 (15:52 -0400)]
Add fern.surgeplay.com to the instances list
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.
Wonderfall [Mon, 3 Apr 2017 19:36:28 +0000 (21:36 +0200)]
update social.targaryen.house info
Eugen Rochko [Mon, 3 Apr 2017 17:50:55 +0000 (19:50 +0200)]
Fix norwegian translation being malformed
Eugen Rochko [Mon, 3 Apr 2017 17:27:30 +0000 (19:27 +0200)]
Add basic logging of who resolved report
Eugen Rochko [Mon, 3 Apr 2017 17:17:56 +0000 (19:17 +0200)]
When taking action on a report (silence/suspend), it dismisses all other
reports for that user automatically
Eugen Rochko [Mon, 3 Apr 2017 16:55:06 +0000 (18:55 +0200)]
Make default admin UI page reports. Add admin UI for creating a domain block
shel [Mon, 3 Apr 2017 16:28:36 +0000 (12:28 -0400)]
Add instances from instances.mastodon.xyz
Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list
Eugen [Mon, 3 Apr 2017 16:06:37 +0000 (18:06 +0200)]
Merge pull request #777 from chriswk/master
Add Norwegian locale
Eugen [Mon, 3 Apr 2017 16:06:16 +0000 (18:06 +0200)]
Merge pull request #782 from wxcafe/patch-1
Adds social.wxcafe.net
Eugen [Mon, 3 Apr 2017 16:06:02 +0000 (18:06 +0200)]
Merge pull request #784 from singingwolfboy/github-capitalized
GitHub should be capitalized
David Baumgold [Mon, 3 Apr 2017 15:44:11 +0000 (11:44 -0400)]
GitHub should be capitalized
wxcafé [Mon, 3 Apr 2017 15:32:25 +0000 (17:32 +0200)]
Adds social.wxcafe.net
Christopher Kolstad [Mon, 3 Apr 2017 13:44:05 +0000 (15:44 +0200)]
Add Norwegian locale
Eugen [Mon, 3 Apr 2017 13:04:51 +0000 (15:04 +0200)]
Merge pull request #775 from JantsoP/master
Finnish Translation
JantsoP [Mon, 3 Apr 2017 12:56:13 +0000 (14:56 +0200)]
another typo. fuck me
JantsoP [Mon, 3 Apr 2017 12:54:53 +0000 (14:54 +0200)]
fixed an sneaky peaky tpy
JantsoP [Mon, 3 Apr 2017 12:43:07 +0000 (14:43 +0200)]
add finnish translation
add finnish translation
JantsoP [Mon, 3 Apr 2017 12:20:50 +0000 (14:20 +0200)]
add finnish translation
add finnish translation
JantsoP [Mon, 3 Apr 2017 12:16:03 +0000 (14:16 +0200)]
fixed typo
JantsoP [Mon, 3 Apr 2017 11:50:57 +0000 (13:50 +0200)]
Merge branch 'master' into master
JantsoP [Mon, 3 Apr 2017 11:35:12 +0000 (13:35 +0200)]
add finnish translation
add finnish translation
JantsoP [Mon, 3 Apr 2017 11:34:26 +0000 (13:34 +0200)]
add finnish translation
add finnish translation
JantsoP [Mon, 3 Apr 2017 11:33:43 +0000 (13:33 +0200)]
add finnish translation
add finnish translation
JantsoP [Mon, 3 Apr 2017 11:32:10 +0000 (13:32 +0200)]
add finnish language
add finnish language
JantsoP [Mon, 3 Apr 2017 11:25:46 +0000 (13:25 +0200)]
finnish translation
finnish translation
JantsoP [Mon, 3 Apr 2017 11:07:09 +0000 (13:07 +0200)]
updated final translation
updated final translation
Eugen [Mon, 3 Apr 2017 10:59:41 +0000 (12:59 +0200)]
Merge pull request #769 from Angristan/patch-1
Improve french translation
Eugen [Mon, 3 Apr 2017 10:59:16 +0000 (12:59 +0200)]
Merge pull request #764 from ticky/tweak-quick-start-area
Fix the position of the Mastodon mascot in the UI
Eugen [Mon, 3 Apr 2017 10:58:38 +0000 (12:58 +0200)]
Merge pull request #765 from marrus-sh/mastodon-API-update
Update API docs
Eugen [Mon, 3 Apr 2017 10:53:49 +0000 (12:53 +0200)]
Merge pull request #768 from marvinkopf/mutedropdown
add mute option in status dropdown
JantsoP [Mon, 3 Apr 2017 10:42:09 +0000 (12:42 +0200)]
Create new translation file
Still in progress. Should be done shortly
JantsoP [Mon, 3 Apr 2017 10:09:33 +0000 (12:09 +0200)]
Create Finnish translation for Mastodon
Create Finnish translation for Mastodon
Angristan [Mon, 3 Apr 2017 09:04:00 +0000 (11:04 +0200)]
Improve french translation
Marvin Kopf [Mon, 3 Apr 2017 07:56:01 +0000 (09:56 +0200)]
add mute option in status dropdown
Kibigo! [Mon, 3 Apr 2017 08:23:37 +0000 (01:23 -0700)]
"direct" in statuses#create
Kibigo! [Mon, 3 Apr 2017 05:46:10 +0000 (22:46 -0700)]
Forgot `direct` statuses :P
Kibigo! [Mon, 3 Apr 2017 04:17:07 +0000 (21:17 -0700)]
Typofixes
Kibigo! [Mon, 3 Apr 2017 04:13:15 +0000 (21:13 -0700)]
Code now code
Kibigo! [Mon, 3 Apr 2017 04:07:07 +0000 (21:07 -0700)]
Merging 'upstream' updates
Kibigo! [Mon, 3 Apr 2017 04:03:49 +0000 (21:03 -0700)]
Updated API docs
Jessica Stokes [Mon, 3 Apr 2017 03:16:14 +0000 (13:16 +1000)]
Fix the position of the Mastodon mascot in the UI
The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour!
It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.
Eugen [Mon, 3 Apr 2017 01:40:34 +0000 (03:40 +0200)]
Merge pull request #760 from ProgVal/patch-2
Improve French translation
Eugen [Mon, 3 Apr 2017 01:40:20 +0000 (03:40 +0200)]
Merge pull request #757 from yiskah/patch-4
Add social.imirhil.fr
Eugen [Mon, 3 Apr 2017 01:40:00 +0000 (03:40 +0200)]
Merge pull request #759 from Wonderfall/master
use alpine-based official images
Eugen [Mon, 3 Apr 2017 01:39:35 +0000 (03:39 +0200)]
Merge pull request #748 from ProgVal/patch-1
Fix install instructions.
Valentin Lorentz [Mon, 3 Apr 2017 01:16:37 +0000 (03:16 +0200)]
Improve French translation
Fix typos and typography. Make vocabulary and grammar more uniform.
Wonderfall [Mon, 3 Apr 2017 01:09:56 +0000 (03:09 +0200)]
use alpine-based official images
shel [Mon, 3 Apr 2017 00:11:28 +0000 (20:11 -0400)]
Add social.imirhil.fr
Eugen [Sun, 2 Apr 2017 23:10:36 +0000 (01:10 +0200)]
Merge pull request #743 from Kazhnuz/master
Update French Translation
Eugen [Sun, 2 Apr 2017 23:07:53 +0000 (01:07 +0200)]
Merge branch 'master' into master
Eugen [Sun, 2 Apr 2017 23:03:42 +0000 (01:03 +0200)]
Merge pull request #751 from Wonderfall/master
update Dockerfile
Wonderfall [Sun, 2 Apr 2017 22:56:05 +0000 (00:56 +0200)]
Update Dockerfile
Wonderfall [Sun, 2 Apr 2017 22:46:44 +0000 (00:46 +0200)]
update Dockerfile
Eugen [Sun, 2 Apr 2017 22:26:24 +0000 (00:26 +0200)]
Merge pull request #744 from fpiesche/master
Add in-depth user guide
Eugen [Sun, 2 Apr 2017 22:25:56 +0000 (00:25 +0200)]
Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
Eugen [Sun, 2 Apr 2017 22:25:37 +0000 (00:25 +0200)]
Merge pull request #747 from Themimitoof/patch-1
add link to another mastodon instance.
Valentin Lorentz [Sun, 2 Apr 2017 22:10:51 +0000 (00:10 +0200)]
Also fix the start command.
Valentin Lorentz [Sun, 2 Apr 2017 22:08:40 +0000 (00:08 +0200)]
Fix install instructions.
Closes GH-745.
Michael Vieira [Sun, 2 Apr 2017 22:04:54 +0000 (00:04 +0200)]
add link to another mastodon instance.
Kazhnuz [Sun, 2 Apr 2017 21:39:41 +0000 (23:39 +0200)]
Add forgotten comma
Florian Piesche [Sun, 2 Apr 2017 21:31:43 +0000 (22:31 +0100)]
Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
Damien Erambert [Sun, 2 Apr 2017 21:23:40 +0000 (14:23 -0700)]
Add more lcoales in fr.jsx
Kazhnuz [Sun, 2 Apr 2017 21:18:01 +0000 (23:18 +0200)]
Update French Translation
Florian Piesche [Sun, 2 Apr 2017 21:07:23 +0000 (22:07 +0100)]
Add info on CW tags not automatically hiding images.
Florian Piesche [Sun, 2 Apr 2017 21:05:21 +0000 (22:05 +0100)]
Add user guide to README toc
Damien Erambert [Sun, 2 Apr 2017 21:04:06 +0000 (14:04 -0700)]
Fix typo in simple_form.fr.yml
Damien Erambert [Sun, 2 Apr 2017 21:03:57 +0000 (14:03 -0700)]
Improve translation of data import in fr.yml
Damien Erambert [Sun, 2 Apr 2017 21:03:41 +0000 (14:03 -0700)]
Better translation for revoked token in doorkeeper.fr.yml
Damien Erambert [Sun, 2 Apr 2017 21:03:31 +0000 (14:03 -0700)]
Fix date format in doorkeeper.fr.yml
Florian Piesche [Sun, 2 Apr 2017 21:03:00 +0000 (22:03 +0100)]
Update to catch up with new features and add missing images.
Florian Piesche [Sun, 2 Apr 2017 20:45:51 +0000 (21:45 +0100)]
Write up reporting.