]>
cat aescling's git repositories - mastodon.git/log
Jonathan Hurter [Wed, 5 Apr 2017 13:26:36 +0000 (15:26 +0200)]
Add Scalingo one click on readme
Jonathan Hurter [Wed, 5 Apr 2017 12:13:34 +0000 (14:13 +0200)]
Add node_modules and .cache to slugignore
Jonathan Hurter [Wed, 5 Apr 2017 11:53:30 +0000 (13:53 +0200)]
Install nodejs before ruby
Jonathan Hurter [Wed, 5 Apr 2017 11:45:03 +0000 (13:45 +0200)]
Add scalingo support
Eugen [Wed, 5 Apr 2017 10:33:02 +0000 (12:33 +0200)]
Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
Eugen [Wed, 5 Apr 2017 10:26:17 +0000 (12:26 +0200)]
Merge pull request #925 from Angristan/patch-6
Add mstdn.io
Eugen [Wed, 5 Apr 2017 10:26:02 +0000 (12:26 +0200)]
Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
Eugen [Wed, 5 Apr 2017 10:18:57 +0000 (12:18 +0200)]
Merge pull request #922 from Angristan/patch-5
ECDH only
Cédric Levieux [Wed, 5 Apr 2017 09:24:21 +0000 (11:24 +0200)]
Add mastodon.partipirate.org
Angristan [Wed, 5 Apr 2017 09:16:56 +0000 (11:16 +0200)]
Add mstdn.io
Jordan Guerder [Wed, 5 Apr 2017 08:52:56 +0000 (10:52 +0200)]
Added mastodon.cx
Angristan [Wed, 5 Apr 2017 08:44:08 +0000 (10:44 +0200)]
ECDH only
Disable DHE ciphers. We don't loose any compatibility as we already use TLS 1.2, and ECDH is faster and safer.
Also, it's better so specify the curve.
This is the conf I use here : https://tls.imirhil.fr/https/mstdn.io
Eugen [Wed, 5 Apr 2017 08:29:58 +0000 (10:29 +0200)]
Merge pull request #909 from scriptjunkie/master
Add https://securitymastod.one/
Eugen [Wed, 5 Apr 2017 08:29:52 +0000 (10:29 +0200)]
Merge branch 'master' into master
Eugen [Wed, 5 Apr 2017 08:29:14 +0000 (10:29 +0200)]
Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
Eugen [Wed, 5 Apr 2017 08:28:58 +0000 (10:28 +0200)]
Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
Eugen [Wed, 5 Apr 2017 08:27:12 +0000 (10:27 +0200)]
Merge pull request #919 from JantsoP/master
More updates to Finnish language
Eugen [Wed, 5 Apr 2017 08:26:32 +0000 (10:26 +0200)]
Merge pull request #902 from asm/ssl_best_practices
SSL best practices for nginx
Eugen [Wed, 5 Apr 2017 08:25:05 +0000 (10:25 +0200)]
Fix API method URL typo
Eugen [Wed, 5 Apr 2017 08:24:25 +0000 (10:24 +0200)]
Merge pull request #903 from yiskah/patch-6
Corrected misinformation regarding Direct Posts
Eugen [Wed, 5 Apr 2017 08:23:52 +0000 (10:23 +0200)]
Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
ApplicationWorker for shared worker behavior
Eugen [Wed, 5 Apr 2017 08:23:32 +0000 (10:23 +0200)]
Merge pull request #910 from krainboltgreene/master
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
Eugen [Wed, 5 Apr 2017 08:23:10 +0000 (10:23 +0200)]
Merge pull request #914 from bradurani/bu/query_cleanup
Eliminate unnecessary queries and query clauses with none and all
JantsoP [Wed, 5 Apr 2017 08:07:17 +0000 (10:07 +0200)]
Merge branch 'master' into master
JantsoP [Wed, 5 Apr 2017 07:57:25 +0000 (09:57 +0200)]
updated reblog to boost translation
Since it is that :D
JantsoP [Wed, 5 Apr 2017 07:56:10 +0000 (09:56 +0200)]
updated translation
Updated some translations after seeing them in service. Should be better now
JantsoP [Wed, 5 Apr 2017 07:52:31 +0000 (09:52 +0200)]
udpdated display_name translation
JantsoP [Wed, 5 Apr 2017 07:51:35 +0000 (09:51 +0200)]
updated reblog translation
Brad Urani [Wed, 5 Apr 2017 06:02:58 +0000 (06:02 +0000)]
Eliminate unnecessary queries and query clauses with none and all
Ian McDowell [Wed, 5 Apr 2017 04:43:57 +0000 (23:43 -0500)]
Update List-of-Mastodon-instances.md
Added mastodon.network.
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 04:31:02 +0000 (21:31 -0700)]
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
scriptjunkie [Wed, 5 Apr 2017 04:21:00 +0000 (23:21 -0500)]
Add https://securitymastod.one/
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 04:14:37 +0000 (21:14 -0700)]
We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)
shel [Wed, 5 Apr 2017 01:47:13 +0000 (21:47 -0400)]
Corrected misinformation regarding Direct Posts
Unless something changed recently I have no clue why this said that direct posts do not federate because they do.
Jason Snell [Wed, 5 Apr 2017 01:43:21 +0000 (18:43 -0700)]
SSL best practices for nginx
Ash Furrow [Wed, 5 Apr 2017 01:35:45 +0000 (21:35 -0400)]
Adds mastodon.technology
Eugen Rochko [Wed, 5 Apr 2017 01:31:45 +0000 (03:31 +0200)]
Merge branch 'fakenine-add_more_tests_to_models'
Eugen Rochko [Wed, 5 Apr 2017 01:31:26 +0000 (03:31 +0200)]
Fix spec
Eugen [Wed, 5 Apr 2017 01:27:38 +0000 (03:27 +0200)]
Merge branch 'master' into add_more_tests_to_models
Eugen [Wed, 5 Apr 2017 01:24:08 +0000 (03:24 +0200)]
Merge pull request #885 from optikfluffel/patch-1
Update Production-guide.md
Eugen [Wed, 5 Apr 2017 01:23:16 +0000 (03:23 +0200)]
Merge pull request #839 from SirCmpwn/profile-readability
Improve readability of text on profiles
Eugen [Wed, 5 Apr 2017 01:20:51 +0000 (03:20 +0200)]
Merge pull request #860 from pierreozoux/patch-1
Update the list of instances
Eugen [Wed, 5 Apr 2017 01:20:37 +0000 (03:20 +0200)]
Merge branch 'master' into patch-1
Eugen [Wed, 5 Apr 2017 01:20:01 +0000 (03:20 +0200)]
Merge pull request #859 from dereckson/patch-1
Add social.nasqueron.org instance
Eugen [Wed, 5 Apr 2017 01:19:14 +0000 (03:19 +0200)]
Merge branch 'master' into patch-1
Eugen [Wed, 5 Apr 2017 01:18:48 +0000 (03:18 +0200)]
Merge pull request #843 from fmauNeko/patch-1
Update List-of-Mastodon-instances.md
Eugen [Wed, 5 Apr 2017 01:18:42 +0000 (03:18 +0200)]
Merge branch 'master' into patch-1
Drew DeVault [Tue, 4 Apr 2017 13:26:21 +0000 (09:26 -0400)]
Improve readability of text on profiles
Eugen [Wed, 5 Apr 2017 01:11:13 +0000 (03:11 +0200)]
Merge pull request #863 from Eychics/master
Add closed_registrations message on French language
Eugen [Wed, 5 Apr 2017 01:09:20 +0000 (03:09 +0200)]
Merge pull request #818 from JantsoP/master
Updated Finnish Translation
Eugen [Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)]
Merge pull request #846 from TrollDecker/master
Update social.diskseven.com's IPv6 status
Eugen [Wed, 5 Apr 2017 01:08:24 +0000 (03:08 +0200)]
Merge pull request #842 from Angristan/patch-2
Missing quotes
Eugen [Wed, 5 Apr 2017 01:07:59 +0000 (03:07 +0200)]
Merge pull request #845 from thurloat/patch-1
Add mastodon.club to running instances list
Eugen [Wed, 5 Apr 2017 01:07:46 +0000 (03:07 +0200)]
Merge pull request #848 from ProgVal/patch-3
Add oc.todon.fr to the list of instances.
Eugen [Wed, 5 Apr 2017 01:07:28 +0000 (03:07 +0200)]
Merge pull request #854 from Angristan/patch-3
Fix crontab edit
Eugen [Wed, 5 Apr 2017 01:06:41 +0000 (03:06 +0200)]
Merge pull request #866 from kklleemm/patch-1
Fix typos on french translations
Eugen [Wed, 5 Apr 2017 01:05:50 +0000 (03:05 +0200)]
Merge pull request #792 from chapeaumeinfreund/master
Updated and fixed german orthography
Eugen [Wed, 5 Apr 2017 01:05:31 +0000 (03:05 +0200)]
Merge pull request #790 from chapeaumeinfreund/patch-1
Updated and fixed german orthography
Eugen [Wed, 5 Apr 2017 01:04:58 +0000 (03:04 +0200)]
Merge pull request #852 from peterkeen/email-whitelist-817
[#817] Add email whitelist
Eugen [Wed, 5 Apr 2017 01:01:43 +0000 (03:01 +0200)]
Merge pull request #891 from ashfurrow/patch-1
Adds instructions for adding admin users for Heroku installs
Eugen [Wed, 5 Apr 2017 01:00:57 +0000 (03:00 +0200)]
Merge pull request #805 from nevillepark/master
Changed "reblogs" to "boosts"
Eugen [Wed, 5 Apr 2017 00:56:54 +0000 (02:56 +0200)]
Merge pull request #894 from asm/mastodon_cc
Adding https://mastodon.cc
Eugen [Wed, 5 Apr 2017 00:54:03 +0000 (02:54 +0200)]
Merge pull request #898 from SirCmpwn/remote-follow-improvements
Remote follow improvements
Eugen [Wed, 5 Apr 2017 00:53:39 +0000 (02:53 +0200)]
Merge pull request #858 from krainboltgreene/patch-6
Use active record shorthand
Ash Furrow [Wed, 5 Apr 2017 00:53:31 +0000 (20:53 -0400)]
Updates instructions.
Eugen [Wed, 5 Apr 2017 00:53:09 +0000 (02:53 +0200)]
Merge pull request #872 from kwaio/patch-1
typo in admin doc
Drew DeVault [Wed, 5 Apr 2017 00:16:14 +0000 (20:16 -0400)]
Remote follow improvements
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
Eugen [Wed, 5 Apr 2017 00:52:00 +0000 (02:52 +0200)]
Merge pull request #868 from Angristan/patch-4
Add file package
Eugen Rochko [Wed, 5 Apr 2017 00:32:18 +0000 (02:32 +0200)]
Remove PuSH subscriptions when delivery is answered with a 4xx error
Jason Snell [Tue, 4 Apr 2017 23:35:57 +0000 (16:35 -0700)]
Adding https://mastodon.cc
Samy KACIMI [Tue, 4 Apr 2017 22:52:55 +0000 (00:52 +0200)]
alphebatically order test gem group as required by rubocop
Samy KACIMI [Tue, 4 Apr 2017 22:47:17 +0000 (00:47 +0200)]
fix rubocop issues
Ash Furrow [Tue, 4 Apr 2017 22:45:24 +0000 (18:45 -0400)]
Adds instructions for adding admin users.
Samy KACIMI [Tue, 4 Apr 2017 22:43:10 +0000 (00:43 +0200)]
Merge branch 'master' into add_more_tests_to_models
Samy KACIMI [Tue, 4 Apr 2017 22:37:23 +0000 (00:37 +0200)]
update account_spec
Samy KACIMI [Tue, 4 Apr 2017 22:31:31 +0000 (00:31 +0200)]
rollback database.yml update
Samy KACIMI [Tue, 4 Apr 2017 22:29:56 +0000 (00:29 +0200)]
add more tests to models
Udo Kramer [Tue, 4 Apr 2017 21:45:29 +0000 (23:45 +0200)]
Update Production-guide.md
Eugen [Tue, 4 Apr 2017 21:11:34 +0000 (23:11 +0200)]
Merge pull request #876 from krainboltgreene/patch-7
Quick attempt to get pull requests passing
Kurtis Rainbolt-Greene [Tue, 4 Apr 2017 19:14:44 +0000 (12:14 -0700)]
Quick attempt to get pull requests passing
Nope Nope [Tue, 4 Apr 2017 18:45:32 +0000 (20:45 +0200)]
typo in admin doc
s/rails/rake/
Angristan [Tue, 4 Apr 2017 17:23:53 +0000 (19:23 +0200)]
Add file package
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
Eugen Rochko [Tue, 4 Apr 2017 17:21:37 +0000 (19:21 +0200)]
Spawn FeedInsertWorker to deliver status into personal feed
Clément D [Tue, 4 Apr 2017 17:09:54 +0000 (19:09 +0200)]
Fix typos on french translations
Thibaut (Eychics) [Tue, 4 Apr 2017 16:58:19 +0000 (18:58 +0200)]
Add closed_registrations message on French language
Pierre Ozoux [Tue, 4 Apr 2017 16:28:29 +0000 (17:28 +0100)]
Update the list of instances
Valentin Lorentz [Tue, 4 Apr 2017 16:11:41 +0000 (18:11 +0200)]
Add oc.todon.fr to the list of instances.
[SKIP CI]
Sébastien Santoro [Tue, 4 Apr 2017 16:11:14 +0000 (18:11 +0200)]
Add social.nasqueron.org instance
Kurtis Rainbolt-Greene [Tue, 4 Apr 2017 16:04:07 +0000 (09:04 -0700)]
Use active record shorthand
Angristan [Tue, 4 Apr 2017 15:23:56 +0000 (17:23 +0200)]
Fix crontab edit
Missing -u parameter to specify the mastodon user.
Pete Keen [Tue, 4 Apr 2017 15:04:44 +0000 (11:04 -0400)]
[#817] Add email whitelist
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.
Fixes #817
Jo Decker [Tue, 4 Apr 2017 14:29:07 +0000 (15:29 +0100)]
Update social.diskseven.com's IPv6 status
As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before.
Adam Thurlow [Tue, 4 Apr 2017 14:14:51 +0000 (11:14 -0300)]
Add mastodon.club to running instances list
Florian Maunier [Tue, 4 Apr 2017 14:03:05 +0000 (16:03 +0200)]
Update List-of-Mastodon-instances.md
Add my own instance
Angristan [Tue, 4 Apr 2017 13:57:37 +0000 (15:57 +0200)]
Missing quotes
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
JantsoP [Tue, 4 Apr 2017 13:07:15 +0000 (15:07 +0200)]
updated line 28 about GitHub
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
cat aescling's git repositories / mastodon.git / log