9af6c52a41
Merge pull request #3 from Gargron/master
...
Merge
2016-11-25 08:53:34 +01:00
543d06971e
Fix bad reference
2016-11-24 23:56:37 +01:00
34e18eb251
Fix forgotten reference
2016-11-24 23:49:45 +01:00
8efa081f21
Remove Neo4J
2016-11-24 23:46:27 +01:00
fca183968e
Center header in account column, hide media in "muted" status components (notifications)
2016-11-24 23:09:53 +01:00
c0a223b480
Merge pull request #265 from nclm/french-translation
...
Forgot to add one `fr` to make the French locale (hopefully) work
2016-11-24 20:31:35 +01:00
60577f4c6e
Merge branch 'master' into french-translation
2016-11-24 20:13:30 +01:00
5e33445c5f
Update index.jsx
...
Forgot to add `fr` here.
2016-11-24 20:12:16 +01:00
8e34bed7cc
Mini Profiler not working well, remove it
2016-11-24 19:59:11 +01:00
75d0903317
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.
2016-11-24 17:48:25 +00:00
b6ee2fb1c6
Add some OpenGraph tags to public statuses
2016-11-24 18:28:10 +01:00
4f1d863615
Only distribute statuses to followers who signed in in the last 2 weeks, add rake task for clearing feeds of inactive users
2016-11-24 18:17:58 +01:00
7baca3fe4d
Merge pull request #242 from TazeTSchnitzel/media_uri_obfuscation
...
Rename media to avoid exposing filename (fixes #207 )
2016-11-24 16:27:32 +01:00
cefef2c571
Extract filename obfuscation into module
2016-11-24 00:30:58 +00:00
cbc50016eb
Follow/unfollow button outside of dropdown, also make favs/reblogs update indicator instantly and
...
then adjust to failure later if the request fails
2016-11-23 23:34:12 +01:00
7cee27f517
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
2016-11-23 22:57:57 +01:00
7161f91313
Rename media to avoid exposing filename ( fixes #207 )
2016-11-23 21:03:03 +00:00
3373ae02de
Merge branch 'development'
2016-11-23 19:01:12 +01:00
79a0135869
Cache accounts/:id/statuses and single statuses too
2016-11-23 19:00:43 +01:00
2112a81e86
Adding content sensitivity toggle, spoilers for media
2016-11-23 18:53:23 +01:00
8e936b03d5
Improve contrast for settings pages ( fixes #173 )
2016-11-23 17:37:10 +00:00
d74cef45aa
Merge pull request #227 from nclm/french-translation
...
Missing lines in the French translation
2016-11-23 17:18:27 +01:00
e8725d2d98
Rename ‘Publier’ to ‘Pouet’ in French locale.
...
🎺 https://mastodon.social/users/Pierrec/updates/100589
2016-11-23 15:53:49 +01:00
23677bc51e
Merge branch 'master' into french-translation
2016-11-23 15:43:27 +01:00
1e95fbb10b
Update doorkeeper.fr.yml
...
e
2016-11-23 14:47:41 +01:00
94f96a6e85
Update doorkeeper.fr.yml
2016-11-23 14:45:31 +01:00
5434ad3002
Add content spoilers for media in sensitive-content statuses
2016-11-23 11:23:32 +01:00
0603971894
Adding sensitive marker to statuses in API
2016-11-23 10:46:48 +01:00
82191b3383
Explain application secrets ( #217 )
2016-11-23 09:30:53 +01:00
4bdb6a0eaf
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
2016-11-23 09:20:34 +01:00
9b53c7d353
Fix #168 - Turn off e-mail notifications by default
2016-11-23 08:39:04 +01:00
cf912e01fd
Implement includes caching for timelines APIs
2016-11-23 08:34:35 +01:00
5c78547198
More query optimizations
2016-11-22 23:18:54 +01:00
fc90d38893
Moving some counter queries out of subqueries in the API
2016-11-22 22:59:54 +01:00
4b5b953d42
Upgrade to latest Rails, which apparently improves ActionCable performance
2016-11-22 22:26:44 +01:00
45c7ee39b3
Remove unneeded indices, improve error handling in background workers, don't needlessly reload reblogged status, send Devise e-mails asynchronously
2016-11-22 17:32:51 +01:00
f5dd152e1a
Merge pull request #2 from Gargron/master
...
Merge
2016-11-22 17:26:17 +01:00
95db6cbe28
Merge branch 'nclm-french-translation'
2016-11-22 11:35:15 +01:00
4a422650bb
Fix broken locales
2016-11-22 11:34:36 +01:00
c7031fd535
Update fr.jsx
2016-11-22 10:49:50 +01:00
82cb34916a
Update fr.yml
2016-11-22 10:39:15 +01:00
ba4c03de71
Update simple_form.fr.yml
...
silenced mode + edits
2016-11-22 10:32:43 +01:00
89dab7c534
Merging code updates (Unlisted Mode)
2016-11-22 10:25:17 +01:00
f9bd3d8808
Adding French locale to mastodon.jsx
2016-11-22 10:21:56 +01:00
115ce90578
Adding French locale to settings_helper.rb
2016-11-22 10:20:28 +01:00
1788164352
Local accounts can control "silenced" attribute which removes them from public timeline
2016-11-21 23:06:41 +01:00
64cfbbcc55
Adding French locale
2016-11-21 22:46:59 +01:00
46d9076e99
Importing doorkeeper.fr.yml
...
From https://github.com/doorkeeper-gem/doorkeeper-i18n/blob/master/rails/locales/fr.yml
2016-11-21 22:39:20 +01:00
12e9f789ab
Importing devise.fr.yml
...
From https://gist.github.com/qsypoq/4cf3b858ff8242ffb013
2016-11-21 22:34:50 +01:00
7abbb02824
Fix #163 - No need for Safari chrome on iOS
2016-11-21 22:33:44 +01:00
nicolas
Eugen Rochko
Alyssa Ross
Andrea Faulds