]>
cat aescling's git repositories - mastodon.git/log
Brian Mock [Sun, 9 Apr 2017 12:45:26 +0000 (05:45 -0700)]
Fixes #1311 margin shouldn't stay fixed (#1312)
Matt Jankowski [Sun, 9 Apr 2017 12:45:01 +0000 (08:45 -0400)]
Search cleanup (#1333)
* Clean up SQL output in Tag and Account search methods
* Add basic coverage for Tag.search_for
* Add coverage for Account.search_for
* Add coverage for Account.advanced_search_for
Matt Jankowski [Sun, 9 Apr 2017 12:39:41 +0000 (08:39 -0400)]
Ignore implied formats for catch all route requests (#1340)
A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.
This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests.
Rachel H [Sun, 9 Apr 2017 09:35:23 +0000 (02:35 -0700)]
Fix nonworking clear notices button (#1316)
Eugen [Sun, 9 Apr 2017 03:46:32 +0000 (05:46 +0200)]
Add env variable to disable prepared statements (#1293)
Ash Furrow [Sat, 8 Apr 2017 23:42:13 +0000 (19:42 -0400)]
Allows setting log level in env variable (#1290)
* Allows setting log level in env variable.
* Made changes based on feedback in #1290.
Ash Furrow [Sat, 8 Apr 2017 23:09:46 +0000 (19:09 -0400)]
Adds user confirmation rake task (#1300)
* Adds task to confirm user by email.
* Adds documentation for manual confirmation.
Eugen [Sat, 8 Apr 2017 21:39:31 +0000 (23:39 +0200)]
Make public timelines API not require user context/app credentials (#1291)
* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API
* Apply pagination fix to more APIs
Eugen [Sat, 8 Apr 2017 20:20:08 +0000 (22:20 +0200)]
Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)
* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled
* Clean up
Pavel Djundik [Sat, 8 Apr 2017 16:31:50 +0000 (19:31 +0300)]
Improve responsiveness of registration form and closed banner (#1265)
Pavel Djundik [Sat, 8 Apr 2017 13:28:23 +0000 (16:28 +0300)]
Improve about page responsiveness (#1252)
Elizabeth Myers [Sat, 8 Apr 2017 11:48:16 +0000 (06:48 -0500)]
Add mst3k.interlinked.me to list of instances (#1235)
Eugen [Sat, 8 Apr 2017 11:26:03 +0000 (13:26 +0200)]
Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)
* Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags
* Improve code quality, remove line unrelated to fix
Thomas Citharel [Sat, 8 Apr 2017 11:11:16 +0000 (13:11 +0200)]
Update french translation (#1148)
Add french translation for emails sent
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Add non-breaking spaces
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
changes and fixes to the nbsps
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
French update
a few fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
fixes
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Markus Amalthea Magnuson [Sat, 8 Apr 2017 11:07:55 +0000 (13:07 +0200)]
Add titles to more icons, and change clear notifications icon. (#1101)
kadiix [Sat, 8 Apr 2017 11:05:49 +0000 (13:05 +0200)]
Update mastodon.brussels instance name on List of Instances
Correct mastodon.brussels.fr to mastodon.brussels
Nicolai von Neudeck [Sat, 8 Apr 2017 11:04:58 +0000 (13:04 +0200)]
Updated German translation (#1248)
Fixed various spelling and grammar mistakes.
Used more gender-neutral language.
Sebastian Hübner [Sat, 8 Apr 2017 11:03:11 +0000 (13:03 +0200)]
Fixed two translation errors (#1139)
Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx
Korbinian [Sat, 8 Apr 2017 11:02:07 +0000 (13:02 +0200)]
Update simple_form.de.yml (#971)
Thibaut (Eychics) [Sat, 8 Apr 2017 10:34:53 +0000 (12:34 +0200)]
Update mastodon.nuzgo.net (#1242)
Add ipv6 support
James Smith [Sat, 8 Apr 2017 10:31:33 +0000 (11:31 +0100)]
Add OTP_SECRET to Heroku app.json (#1246)
Eugen [Sat, 8 Apr 2017 10:25:23 +0000 (12:25 +0200)]
Revert "add persistance to Postresql container" (#1251)
Jantso Porali [Sat, 8 Apr 2017 10:17:34 +0000 (12:17 +0200)]
Updated about page in Finnish language (#1170)
* update faq with default language
* update translation for about page
* update Minio config
Thanks to @Gargon for helping me. I hope this will help others as well
* update import and export translation
* translate emails to finnish
* add finnish translation for emails
* add finnish translation for emails
* add finnish translation
* add missing dot
* update finnish language to emails
* add finnish translation for emails
* add dot and fix typo
* updated some minor typos
* remove language change due breaking emails
And by dev request
* updated minio config by dev request
* updated about page translation
Olivier Humbert [Sat, 8 Apr 2017 10:16:49 +0000 (12:16 +0200)]
French translation update (#1188)
* Update fr.yml
one typo fix
* Update simple_form.fr.yml
one translation consistency
Alda Marteau-Hardi [Sat, 8 Apr 2017 10:16:16 +0000 (12:16 +0200)]
Add some missing strings to prevent some React warning in the console (#1230)
Matt Jankowski [Sat, 8 Apr 2017 10:15:40 +0000 (06:15 -0400)]
Use Setting.site_title value for `og:site_name` occurrences (#1194)
* Add helper method to return Setting.site_title
* Use site_title helper in application layout
* Use site_title value for og:site_name
Eugen [Sat, 8 Apr 2017 09:40:43 +0000 (11:40 +0200)]
Merge pull request #1239 from ineffyble/patch-2
Fix my URL
Eugen [Sat, 8 Apr 2017 09:40:20 +0000 (11:40 +0200)]
Merge pull request #1238 from milmazz/hunter-client
Add reference to Elixir client for Mastodon API
Eugen [Sat, 8 Apr 2017 09:39:25 +0000 (11:39 +0200)]
Merge pull request #887 from valentin2105/master
add persistance to Postresql container
Eugen [Sat, 8 Apr 2017 09:38:54 +0000 (11:38 +0200)]
Merge pull request #1115 from vmincev/patch-1
Update Production-guide.md
Eugen [Sat, 8 Apr 2017 09:38:33 +0000 (11:38 +0200)]
Merge pull request #1198 from huertanix/patch-1
Update Heroku-guide.md
Eugen [Sat, 8 Apr 2017 09:37:51 +0000 (11:37 +0200)]
Merge pull request #1221 from rbaumert/patch-1
fixed a sentence in readme
Eugen [Sat, 8 Apr 2017 09:37:37 +0000 (11:37 +0200)]
Merge pull request #1224 from chrisheninger/patch-1
Add SVG version of logo to repo
Eugen [Sat, 8 Apr 2017 09:37:13 +0000 (11:37 +0200)]
Merge pull request #1218 from R0ckweb/patch-2
Fix #1141 on remote follow
Eugen [Sat, 8 Apr 2017 09:36:43 +0000 (11:36 +0200)]
Merge pull request #1216 from tootsuite/fix-default-locale-regression
Fix #1165 - Default locale no longer breaks form submissions
Eugen [Sat, 8 Apr 2017 09:36:35 +0000 (11:36 +0200)]
Merge pull request #1213 from tootsuite/fix-accounts-initial-case
Fix #801 - Respect webfinger's canonical response of username/domain
Eugen [Sat, 8 Apr 2017 09:35:40 +0000 (11:35 +0200)]
Merge pull request #1225 from tootsuite/yiskah-patch-1
Close instance list to additions
Milton Mazzarri [Sat, 8 Apr 2017 07:48:52 +0000 (02:48 -0500)]
Add reference to Elixir client for Mastodon API
Effy Elden [Sat, 8 Apr 2017 06:22:07 +0000 (16:22 +1000)]
Fix my URL
Update my URL since toot.zone was shut down.
rbaumert [Sat, 8 Apr 2017 04:39:24 +0000 (21:39 -0700)]
Merge branch 'master' into patch-1
Valentin Ouvrard [Sat, 8 Apr 2017 04:11:20 +0000 (15:11 +1100)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 03:51:30 +0000 (23:51 -0400)]
Close instance list to additions
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:50:21 +0000 (20:50 -0700)]
Merge branch 'master' into fix-default-locale-regression
Kurtis Rainbolt-Greene [Sat, 8 Apr 2017 03:48:27 +0000 (20:48 -0700)]
Merge branch 'master' into patch-2
Chris Heninger [Sat, 8 Apr 2017 03:40:18 +0000 (20:40 -0700)]
Add SVG version of logo to repo
Shel R [Sat, 8 Apr 2017 03:16:46 +0000 (23:16 -0400)]
Merge pull request #1137 from Noiwex/patch-1
Update List-of-Mastodon-instances.md
Shel R [Sat, 8 Apr 2017 03:15:17 +0000 (23:15 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 03:10:25 +0000 (23:10 -0400)]
Merge pull request #1197 from blakebarnett/add_indigo_zone_instance
Add indigo.zone to list of instances
Shel R [Sat, 8 Apr 2017 03:09:50 +0000 (23:09 -0400)]
Merge branch 'master' into add_indigo_zone_instance
Shel R [Sat, 8 Apr 2017 03:09:09 +0000 (23:09 -0400)]
Merge pull request #1196 from mouse-reeve/list-oulipo-social
Adds Oulipo.social to Mastodons list
Shel R [Sat, 8 Apr 2017 03:08:41 +0000 (23:08 -0400)]
Merge branch 'master' into list-oulipo-social
Shel R [Sat, 8 Apr 2017 03:07:50 +0000 (23:07 -0400)]
Merge pull request #1186 from Aguay-val/patch-2
Add mastodon.fun
Shel R [Sat, 8 Apr 2017 03:05:08 +0000 (23:05 -0400)]
Merge branch 'master' into patch-2
Shel R [Sat, 8 Apr 2017 03:03:07 +0000 (23:03 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:59:07 +0000 (22:59 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:54:44 +0000 (22:54 -0400)]
Merge pull request #1107 from YDrogen/patch-1
Added masto.razrnet.fr
Shel R [Sat, 8 Apr 2017 02:54:25 +0000 (22:54 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:54:14 +0000 (22:54 -0400)]
Merge pull request #1090 from gled-rs/master
Added mastodon.host in the list of instances
Shel R [Sat, 8 Apr 2017 02:53:42 +0000 (22:53 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:49:34 +0000 (22:49 -0400)]
Merge pull request #1085 from isati/patch-2
Add manx.social instance
Shel R [Sat, 8 Apr 2017 02:49:14 +0000 (22:49 -0400)]
Merge branch 'master' into patch-2
rbaumert [Sat, 8 Apr 2017 02:48:46 +0000 (19:48 -0700)]
fixed a sentence in readme
Shel R [Sat, 8 Apr 2017 02:48:02 +0000 (22:48 -0400)]
Merge pull request #1084 from genesixx/patch-4
Update List-of-Mastodon-instances.md
Shel R [Sat, 8 Apr 2017 02:47:42 +0000 (22:47 -0400)]
Merge branch 'master' into patch-4
Shel R [Sat, 8 Apr 2017 02:47:00 +0000 (22:47 -0400)]
Merge pull request #1074 from kadiix/patch-1
Add an instance.
Shel R [Sat, 8 Apr 2017 02:46:36 +0000 (22:46 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:45:15 +0000 (22:45 -0400)]
Merge pull request #1069 from Awea/master
Add an instance
Shel R [Sat, 8 Apr 2017 02:44:40 +0000 (22:44 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:43:46 +0000 (22:43 -0400)]
Merge pull request #1066 from jack-michaud/master
Add Northeastern University Mastodon
Shel R [Sat, 8 Apr 2017 02:43:13 +0000 (22:43 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:42:34 +0000 (22:42 -0400)]
Merge pull request #1051 from Tiwy57/patch-1
Add an instance
Shel R [Sat, 8 Apr 2017 02:42:14 +0000 (22:42 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:41:37 +0000 (22:41 -0400)]
Merge pull request #1050 from lfuelling/patch-1
add my instance
Shel R [Sat, 8 Apr 2017 02:41:07 +0000 (22:41 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:40:29 +0000 (22:40 -0400)]
Merge pull request #1046 from raymestalez/patch-2
Added an instance to the list
Shel R [Sat, 8 Apr 2017 02:39:59 +0000 (22:39 -0400)]
Merge branch 'master' into patch-2
Valentin Ouvrard [Sat, 8 Apr 2017 02:39:31 +0000 (13:39 +1100)]
Merge branch 'master' into master
Valentin Ouvrard [Sat, 8 Apr 2017 02:39:09 +0000 (13:39 +1100)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:39:05 +0000 (22:39 -0400)]
Merge pull request #1041 from R0ckweb/patch-1
Update List-of-Mastodon-instances.md
Shel R [Sat, 8 Apr 2017 02:38:37 +0000 (22:38 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:37:51 +0000 (22:37 -0400)]
Merge pull request #1036 from wirehack7/patch-1
Update List-of-Mastodon-instances.md
Shel R [Sat, 8 Apr 2017 02:35:45 +0000 (22:35 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:35:08 +0000 (22:35 -0400)]
Merge pull request #1035 from gfaivre/add-elao-com-instance
Add mastodon.elao.com instance
Shel R [Sat, 8 Apr 2017 02:34:45 +0000 (22:34 -0400)]
Merge branch 'master' into add-elao-com-instance
Shel R [Sat, 8 Apr 2017 02:34:10 +0000 (22:34 -0400)]
Merge pull request #1030 from derekcecillewis/add-infinimatix.net-instance
Add infinimatix.net to instance list
Shel R [Sat, 8 Apr 2017 02:33:40 +0000 (22:33 -0400)]
Merge branch 'master' into add-infinimatix.net-instance
Shel R [Sat, 8 Apr 2017 02:25:45 +0000 (22:25 -0400)]
Merge pull request #1009 from ngerakines/patch-1
Added off-the-clock.us to the list of instances
Shel R [Sat, 8 Apr 2017 02:23:50 +0000 (22:23 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:21:48 +0000 (22:21 -0400)]
Merge pull request #797 from AndreLewin/master
Added Esperanto translation (eo)
Shel R [Sat, 8 Apr 2017 02:21:21 +0000 (22:21 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:18:11 +0000 (22:18 -0400)]
Merge pull request #1006 from Ninetailed/master
Description in instance list for mastodon.ninetailed.uk
Shel R [Sat, 8 Apr 2017 02:17:53 +0000 (22:17 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:16:49 +0000 (22:16 -0400)]
Merge pull request #992 from Eychics/master
Add mastodon.nuzgo.net in instance list
Shel R [Sat, 8 Apr 2017 02:15:55 +0000 (22:15 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:15:12 +0000 (22:15 -0400)]
Merge pull request #991 from vladooku/patch-1
Update List-of-Mastodon-instances.md
Shel R [Sat, 8 Apr 2017 02:14:08 +0000 (22:14 -0400)]
Merge branch 'master' into patch-1
Shel R [Sat, 8 Apr 2017 02:13:34 +0000 (22:13 -0400)]
Merge pull request #989 from MTNDevelopment/master
Updates instance list
Shel R [Sat, 8 Apr 2017 02:13:06 +0000 (22:13 -0400)]
Merge branch 'master' into master
Shel R [Sat, 8 Apr 2017 02:11:55 +0000 (22:11 -0400)]
Merge pull request #986 from estuans/patch-2
Update List-of-Mastodon-instances.md
Shel R [Sat, 8 Apr 2017 02:11:24 +0000 (22:11 -0400)]
Merge branch 'master' into patch-2
cat aescling's git repositories / mastodon.git / log