]> cat aescling's git repositories - mastodon.git/log
mastodon.git
9 years agoUpdate .env.test
Eugen [Tue, 29 Nov 2016 16:51:16 +0000 (17:51 +0100)]
Update .env.test

9 years agoAdd .env.test
Alyssa Ross [Thu, 24 Nov 2016 17:48:25 +0000 (17:48 +0000)]
Add .env.test

It took me ages to get Mastodon set up with the tests passing because
the environment variables I needed to define weren't documented and I
had to work them out one at a time.

This change adds a .env.test file, and makes it so it isn't ignored by
git. I think it makes sense for the .env.test file to be in git, since
there's nothing secret in it, but other approaches would be to have a
.env.test.sample (like the corresponding one for production), or to set
these values in a test helper, or to adapt the tests to work with
environments other than this one. I'd be happy to make these changes if
that would be preferred.

Being able to get set up and run the tests is a pretty important part of
being able to contribute to Mastodon (or your test coverage with
suffer!), so having some sort of solution like this one is vital.

9 years agoAdd some OpenGraph tags to public statuses
Eugen Rochko [Thu, 24 Nov 2016 17:28:10 +0000 (18:28 +0100)]
Add some OpenGraph tags to public statuses

9 years agoOnly distribute statuses to followers who signed in in the last 2 weeks, add rake...
Eugen Rochko [Thu, 24 Nov 2016 17:17:58 +0000 (18:17 +0100)]
Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users

9 years agoMerge pull request #242 from TazeTSchnitzel/media_uri_obfuscation
Eugen [Thu, 24 Nov 2016 15:27:32 +0000 (16:27 +0100)]
Merge pull request #242 from TazeTSchnitzel/media_uri_obfuscation

Rename media to avoid exposing filename (fixes #207)

9 years agoExtract filename obfuscation into module
Alyssa Ross [Wed, 23 Nov 2016 23:31:38 +0000 (23:31 +0000)]
Extract filename obfuscation into module

9 years agoFollow/unfollow button outside of dropdown, also make favs/reblogs update indicator...
Eugen Rochko [Wed, 23 Nov 2016 22:34:12 +0000 (23:34 +0100)]
Follow/unfollow button outside of dropdown, also make favs/reblogs update indicator instantly and
then adjust to failure later if the request fails

9 years agoFix unfollows not clearing reblogs, fix blocks not clearing reblogs and notifications,
Eugen Rochko [Wed, 23 Nov 2016 21:57:57 +0000 (22:57 +0100)]
Fix unfollows not clearing reblogs, fix blocks not clearing reblogs and notifications,
skip ActionCable for follow/unfollow/block events, instead clear UI from
blocked account's posts instantly if block request succeeds. Add forgotten
i18n for sensitive content

9 years agoRename media to avoid exposing filename (fixes #207)
Andrea Faulds [Wed, 23 Nov 2016 21:00:00 +0000 (21:00 +0000)]
Rename media to avoid exposing filename (fixes #207)

9 years agoMerge branch 'development'
Eugen Rochko [Wed, 23 Nov 2016 18:01:12 +0000 (19:01 +0100)]
Merge branch 'development'

9 years agoCache accounts/:id/statuses and single statuses too
Eugen Rochko [Wed, 23 Nov 2016 17:56:30 +0000 (18:56 +0100)]
Cache accounts/:id/statuses and single statuses too

9 years agoAdding content sensitivity toggle, spoilers for media
Eugen Rochko [Wed, 23 Nov 2016 17:53:23 +0000 (18:53 +0100)]
Adding content sensitivity toggle, spoilers for media

9 years agoMerge pull request #227 from nclm/french-translation
Eugen [Wed, 23 Nov 2016 16:18:27 +0000 (17:18 +0100)]
Merge pull request #227 from nclm/french-translation

Missing lines in the French translation

9 years agoRename ‘Publier’ to ‘Pouet’ in French locale.
nicolas [Wed, 23 Nov 2016 14:53:49 +0000 (15:53 +0100)]
Rename ‘Publier’ to ‘Pouet’ in French locale.

🎺 https://mastodon.social/users/Pierrec/updates/100589

9 years agoMerge branch 'master' into french-translation
nicolas [Wed, 23 Nov 2016 14:43:27 +0000 (15:43 +0100)]
Merge branch 'master' into french-translation

9 years agoUpdate doorkeeper.fr.yml
nicolas [Wed, 23 Nov 2016 13:47:41 +0000 (14:47 +0100)]
Update doorkeeper.fr.yml

e

9 years agoUpdate doorkeeper.fr.yml
nicolas [Wed, 23 Nov 2016 13:45:31 +0000 (14:45 +0100)]
Update doorkeeper.fr.yml

9 years agoAdd content spoilers for media in sensitive-content statuses
Eugen Rochko [Wed, 23 Nov 2016 10:23:32 +0000 (11:23 +0100)]
Add content spoilers for media in sensitive-content statuses

9 years agoAdding sensitive marker to statuses in API
Eugen Rochko [Wed, 23 Nov 2016 09:46:48 +0000 (10:46 +0100)]
Adding sensitive marker to statuses in API

9 years agoExplain application secrets (#217)
Andrea Faulds [Wed, 23 Nov 2016 08:30:53 +0000 (08:30 +0000)]
Explain application secrets (#217)

9 years agoRename "publish" to "toot" in english locale, fix lightbox showing old image
Eugen Rochko [Wed, 23 Nov 2016 08:20:34 +0000 (09:20 +0100)]
Rename "publish" to "toot" in english locale, fix lightbox showing old image
before loading new one, cache notifications API, fix missing follow button
on public profiles

9 years agoFix #168 - Turn off e-mail notifications by default
Eugen Rochko [Wed, 23 Nov 2016 07:39:04 +0000 (08:39 +0100)]
Fix #168 - Turn off e-mail notifications by default

9 years agoImplement includes caching for timelines APIs
Eugen Rochko [Wed, 23 Nov 2016 07:34:35 +0000 (08:34 +0100)]
Implement includes caching for timelines APIs

9 years agoMore query optimizations
Eugen Rochko [Tue, 22 Nov 2016 22:18:54 +0000 (23:18 +0100)]
More query optimizations

9 years agoMoving some counter queries out of subqueries in the API
Eugen Rochko [Tue, 22 Nov 2016 21:59:54 +0000 (22:59 +0100)]
Moving some counter queries out of subqueries in the API

9 years agoUpgrade to latest Rails, which apparently improves ActionCable performance
Eugen Rochko [Tue, 22 Nov 2016 21:26:44 +0000 (22:26 +0100)]
Upgrade to latest Rails, which apparently improves ActionCable performance

9 years agoRemove unneeded indices, improve error handling in background workers, don't needless...
Eugen Rochko [Tue, 22 Nov 2016 16:32:51 +0000 (17:32 +0100)]
Remove unneeded indices, improve error handling in background workers, don't needlessly reload reblogged status, send Devise e-mails asynchronously

9 years agoMerge pull request #2 from Gargron/master
nicolas [Tue, 22 Nov 2016 16:26:17 +0000 (17:26 +0100)]
Merge pull request #2 from Gargron/master

Merge

9 years agoMerge branch 'nclm-french-translation'
Eugen Rochko [Tue, 22 Nov 2016 10:35:15 +0000 (11:35 +0100)]
Merge branch 'nclm-french-translation'

9 years agoFix broken locales
Eugen Rochko [Tue, 22 Nov 2016 10:34:36 +0000 (11:34 +0100)]
Fix broken locales

9 years agoUpdate fr.jsx
nicolas [Tue, 22 Nov 2016 09:49:50 +0000 (10:49 +0100)]
Update fr.jsx

9 years agoUpdate fr.yml
nicolas [Tue, 22 Nov 2016 09:39:15 +0000 (10:39 +0100)]
Update fr.yml

9 years agoUpdate simple_form.fr.yml
nicolas [Tue, 22 Nov 2016 09:32:43 +0000 (10:32 +0100)]
Update simple_form.fr.yml

silenced mode + edits

9 years agoMerging code updates (Unlisted Mode)
nicolas [Tue, 22 Nov 2016 09:25:17 +0000 (10:25 +0100)]
Merging code updates (Unlisted Mode)

9 years agoAdding French locale to mastodon.jsx
nicolas [Tue, 22 Nov 2016 09:21:56 +0000 (10:21 +0100)]
Adding French locale to mastodon.jsx

9 years agoAdding French locale to settings_helper.rb
nicolas [Tue, 22 Nov 2016 09:20:28 +0000 (10:20 +0100)]
Adding French locale to settings_helper.rb

9 years agoLocal accounts can control "silenced" attribute which removes them from public timeline
Eugen Rochko [Mon, 21 Nov 2016 22:05:11 +0000 (23:05 +0100)]
Local accounts can control "silenced" attribute which removes them from public timeline

9 years agoAdding French locale
nicolas [Mon, 21 Nov 2016 21:46:59 +0000 (22:46 +0100)]
Adding French locale

9 years agoImporting doorkeeper.fr.yml
nicolas [Mon, 21 Nov 2016 21:39:20 +0000 (22:39 +0100)]
Importing doorkeeper.fr.yml

From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml

9 years agoImporting devise.fr.yml
nicolas [Mon, 21 Nov 2016 21:34:50 +0000 (22:34 +0100)]
Importing devise.fr.yml

From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013

9 years agoFix #163 - No need for Safari chrome on iOS
Eugen Rochko [Mon, 21 Nov 2016 21:33:44 +0000 (22:33 +0100)]
Fix #163 - No need for Safari chrome on iOS

9 years agoFirst version for fr.jsx
nicolas [Mon, 21 Nov 2016 21:06:05 +0000 (22:06 +0100)]
First version for fr.jsx

9 years agoAdding option to specify asset server, filter followers query by local accounts
Eugen Rochko [Mon, 21 Nov 2016 21:04:10 +0000 (22:04 +0100)]
Adding option to specify asset server, filter followers query by local accounts
during Fan Out On Write to load less stuff into memory

9 years agoCreate fr.jsx
nicolas [Mon, 21 Nov 2016 20:51:34 +0000 (21:51 +0100)]
Create fr.jsx

9 years agoFirst version for simple_form.fr.yml
nicolas [Mon, 21 Nov 2016 20:30:13 +0000 (21:30 +0100)]
First version for simple_form.fr.yml

9 years agoFirst version for fr.yml
nicolas [Mon, 21 Nov 2016 20:25:27 +0000 (21:25 +0100)]
First version for fr.yml

9 years agoCreate devise.fr.yml
nicolas [Mon, 21 Nov 2016 19:59:41 +0000 (20:59 +0100)]
Create devise.fr.yml

9 years agoCreate doorkeeper.fr.yml
nicolas [Mon, 21 Nov 2016 19:59:13 +0000 (20:59 +0100)]
Create doorkeeper.fr.yml

9 years agoCreate simple_form.fr.yml
nicolas [Mon, 21 Nov 2016 19:58:43 +0000 (20:58 +0100)]
Create simple_form.fr.yml

9 years agoCreate fr.yml
nicolas [Mon, 21 Nov 2016 19:57:28 +0000 (20:57 +0100)]
Create fr.yml

9 years agoBetter error message in doorkeeper json response
Eugen Rochko [Mon, 21 Nov 2016 15:19:35 +0000 (16:19 +0100)]
Better error message in doorkeeper json response

9 years agoPerformance improvement for notifications API
Eugen Rochko [Mon, 21 Nov 2016 15:10:42 +0000 (16:10 +0100)]
Performance improvement for notifications API

9 years agoRemove some n+1 queries from notifications API
Eugen Rochko [Mon, 21 Nov 2016 14:16:04 +0000 (15:16 +0100)]
Remove some n+1 queries from notifications API

9 years agoRemove orphaned notifications, add scopes param to app create API
Eugen Rochko [Mon, 21 Nov 2016 13:59:13 +0000 (14:59 +0100)]
Remove orphaned notifications, add scopes param to app create API

9 years agoMerge branch 'victorhck-master'
Eugen Rochko [Mon, 21 Nov 2016 10:05:33 +0000 (11:05 +0100)]
Merge branch 'victorhck-master'

9 years agoFixes for the Spanish translation
Eugen Rochko [Mon, 21 Nov 2016 10:05:11 +0000 (11:05 +0100)]
Fixes for the Spanish translation

9 years agoTry to fix for browsers that don't support notifications
Eugen Rochko [Mon, 21 Nov 2016 09:59:59 +0000 (10:59 +0100)]
Try to fix for browsers that don't support notifications

9 years agoIcon for desktop notifications
Eugen Rochko [Mon, 21 Nov 2016 09:55:49 +0000 (10:55 +0100)]
Icon for desktop notifications

9 years agoSwitch to compose route when replying and compose is not mounted
Eugen Rochko [Mon, 21 Nov 2016 09:52:11 +0000 (10:52 +0100)]
Switch to compose route when replying and compose is not mounted

9 years agoUse old rules for mention notifications as for mentions timeline
Eugen Rochko [Mon, 21 Nov 2016 09:37:34 +0000 (10:37 +0100)]
Use old rules for mention notifications as for mentions timeline

9 years agoDesktop notifications
Eugen Rochko [Mon, 21 Nov 2016 09:24:50 +0000 (10:24 +0100)]
Desktop notifications

9 years agoFix responsive layout breakpoint, replace mentions column with notifications
Eugen Rochko [Mon, 21 Nov 2016 09:03:55 +0000 (10:03 +0100)]
Fix responsive layout breakpoint, replace mentions column with notifications

9 years agoCall NotifyService about remote reblogs
Eugen Rochko [Mon, 21 Nov 2016 08:56:01 +0000 (09:56 +0100)]
Call NotifyService about remote reblogs

9 years agoAdding notifications column
Eugen Rochko [Sun, 20 Nov 2016 18:39:18 +0000 (19:39 +0100)]
Adding notifications column

9 years agoAdding unified streamable notifications
Eugen Rochko [Sat, 19 Nov 2016 23:33:02 +0000 (00:33 +0100)]
Adding unified streamable notifications

9 years agoPortuguese translation (front-end)
caesarologia [Sun, 20 Nov 2016 10:40:26 +0000 (05:40 -0500)]
Portuguese translation (front-end)

9 years agoimprovements in text made by Ekaitz
Victorhck [Sat, 19 Nov 2016 23:52:06 +0000 (00:52 +0100)]
improvements in text made by Ekaitz

9 years agofix typos, and suggestions made by Ekaitz
Victorhck [Sat, 19 Nov 2016 23:50:45 +0000 (00:50 +0100)]
fix typos, and suggestions made by Ekaitz

9 years agoFix up Spanish translations
Eugen Rochko [Sat, 19 Nov 2016 21:05:26 +0000 (22:05 +0100)]
Fix up Spanish translations

9 years agoMerge branch 'master' of https://github.com/victorhck/mastodon
victorhck [Sat, 19 Nov 2016 17:44:58 +0000 (18:44 +0100)]
Merge branch 'master' of https://github.com/victorhck/mastodon

9 years agoMerge remote-tracking branch 'upstream/master'
victorhck [Sat, 19 Nov 2016 17:42:37 +0000 (18:42 +0100)]
Merge remote-tracking branch 'upstream/master'

9 years agoFinished spanish translation config files
Victorhck [Sat, 19 Nov 2016 17:40:03 +0000 (18:40 +0100)]
Finished spanish translation config files

9 years agoFix wrong language declaration
Eugen [Sat, 19 Nov 2016 17:31:36 +0000 (18:31 +0100)]
Fix wrong language declaration

9 years agoFix wrong language declaration
Eugen [Sat, 19 Nov 2016 17:31:21 +0000 (18:31 +0100)]
Fix wrong language declaration

9 years agofinished spanish translation config files
victorhck [Sat, 19 Nov 2016 16:45:45 +0000 (17:45 +0100)]
finished spanish translation config files

9 years agoGraphic emoji in usernames in the "reblogged" string above status
Eugen Rochko [Fri, 18 Nov 2016 23:28:42 +0000 (00:28 +0100)]
Graphic emoji in usernames in the "reblogged" string above status

9 years agoDisplay human names of locales in dropdown
Eugen Rochko [Fri, 18 Nov 2016 23:19:57 +0000 (00:19 +0100)]
Display human names of locales in dropdown

9 years agoActivating Spanish i18n
Eugen Rochko [Fri, 18 Nov 2016 23:10:47 +0000 (00:10 +0100)]
Activating Spanish i18n

9 years agoAdd more Spanish i18n
Eugen Rochko [Fri, 18 Nov 2016 23:00:04 +0000 (00:00 +0100)]
Add more Spanish i18n

9 years agoSpanish translation for devise.es.yml
Victorhck [Fri, 18 Nov 2016 22:57:03 +0000 (23:57 +0100)]
Spanish translation for devise.es.yml

9 years agoUpdating some npm packages
Eugen Rochko [Fri, 18 Nov 2016 22:55:44 +0000 (23:55 +0100)]
Updating some npm packages

9 years agoMove Salmon processing to background as well as PuSH
Eugen Rochko [Fri, 18 Nov 2016 22:24:57 +0000 (23:24 +0100)]
Move Salmon processing to background as well as PuSH

9 years agoCatch validation errors in ProcessFeedService so that one failing entry wouldn't...
Eugen Rochko [Fri, 18 Nov 2016 22:19:38 +0000 (23:19 +0100)]
Catch validation errors in ProcessFeedService so that one failing entry wouldn't stop others from going through

9 years agoDon't create attachments if remote file cannot be fetched
Eugen Rochko [Fri, 18 Nov 2016 22:16:34 +0000 (23:16 +0100)]
Don't create attachments if remote file cannot be fetched

9 years agoValidate presence of text even for remote statuses
Eugen Rochko [Fri, 18 Nov 2016 22:14:41 +0000 (23:14 +0100)]
Validate presence of text even for remote statuses

9 years agoFix OAuth authorization page and add a spec for it
Eugen Rochko [Fri, 18 Nov 2016 22:08:52 +0000 (23:08 +0100)]
Fix OAuth authorization page and add a spec for it

9 years agofinished spanish translation for es.yml
Victorhck [Fri, 18 Nov 2016 22:04:26 +0000 (23:04 +0100)]
finished spanish translation for es.yml

9 years agostarted sp translations config locales
victorhck [Fri, 18 Nov 2016 19:39:40 +0000 (20:39 +0100)]
started sp translations config locales

9 years agofixed typos
victorhck [Fri, 18 Nov 2016 19:07:48 +0000 (20:07 +0100)]
fixed typos

9 years agoAdded spanish translation (#150)
Victorhck [Fri, 18 Nov 2016 18:12:44 +0000 (19:12 +0100)]
Added spanish translation (#150)

9 years agoFix syntax error
Eugen [Fri, 18 Nov 2016 18:10:38 +0000 (19:10 +0100)]
Fix syntax error

9 years agodoing spanish translation
victorhck [Fri, 18 Nov 2016 18:06:33 +0000 (19:06 +0100)]
doing spanish translation

9 years agoadded spanish translation
victorhck [Fri, 18 Nov 2016 17:52:48 +0000 (18:52 +0100)]
added spanish translation

9 years agoAdding german localization
Eugen Rochko [Fri, 18 Nov 2016 14:36:16 +0000 (15:36 +0100)]
Adding german localization

9 years agoMerge pull request #149 from larkinscott/master
Eugen [Thu, 17 Nov 2016 19:42:52 +0000 (20:42 +0100)]
Merge pull request #149 from larkinscott/master

Create .codeclimate.yml

9 years agoCreate .codeclimate.yml
Scott Larkin [Thu, 17 Nov 2016 17:40:23 +0000 (12:40 -0500)]
Create .codeclimate.yml

Created a .codeclimate.yml configuration file that will work with your existing configurations for ESLint and Rubocop.

9 years agoAdd an Intl polyfill
Eugen Rochko [Thu, 17 Nov 2016 15:34:36 +0000 (16:34 +0100)]
Add an Intl polyfill

9 years agoFix #148 - Devise mailer fixed, test spec added so it won't slip past again
Eugen Rochko [Thu, 17 Nov 2016 11:29:11 +0000 (12:29 +0100)]
Fix #148 - Devise mailer fixed, test spec added so it won't slip past again

9 years agoRemove broken test
Eugen Rochko [Wed, 16 Nov 2016 18:11:30 +0000 (19:11 +0100)]
Remove broken test

9 years agoi18n for devise mailer too
Eugen Rochko [Wed, 16 Nov 2016 17:25:21 +0000 (18:25 +0100)]
i18n for devise mailer too