edb6713849
Merge pull request #6 from Gargron/master
...
Merge
2016-11-25 18:14:42 +01:00
6acc54b2b1
Remove remnants of Neo4J
2016-11-25 16:15:46 +00:00
abeccf6eb2
X-RateLimit-Reset formatted with iso8601
2016-11-25 15:21:22 +01:00
e737856f59
#275 fix missing i18n item
2016-11-25 14:56:28 +01:00
62dc431e9d
Fix checkbox spacing
2016-11-25 14:02:12 +01:00
c6d369c52b
Checkboxes label adjustement
...
When the label of a checkbox is more than one line long, avoid unalignment.
2016-11-25 14:02:12 +01:00
2774adc6fe
fixing yamls for #275
2016-11-25 13:57:37 +01:00
ff4d38ac85
Merge pull request #276 from nclm/french-translation
...
French translation update
2016-11-25 13:41:49 +01:00
9849c564de
fix #275
2016-11-25 13:35:08 +01:00
8cd2d6a174
Merge branch 'master' into french-translation
2016-11-25 13:33:00 +01:00
12100797c4
Update fr.jsx
2016-11-25 13:31:46 +01:00
3958b6c655
Update simple_form.fr.yml
2016-11-25 13:30:52 +01:00
666eda7256
Remove stale entries from cache results
2016-11-25 13:25:40 +01:00
9798cf624a
Normalized locale files
2016-11-25 13:15:07 +01:00
8183330361
Merge pull request #273 from nclm/french-translation
...
French localisation update
2016-11-25 13:14:30 +01:00
ea0846645a
Fix #65 - Options to block notifications from people you don't follow/who don't follow you
2016-11-25 13:13:16 +01:00
6d952d6815
Server side HU translation + Toot fix.
2016-11-25 12:43:23 +01:00
3b3bf2dd59
Filter statuses that mention blocked users
2016-11-25 12:35:52 +01:00
c6353f6d39
Hungarian translation
2016-11-25 09:43:19 +01:00
283623e3d4
Update simple_form.fr.yml
2016-11-25 09:25:31 +01:00
ed8361b57a
Update fr.yml
2016-11-25 09:25:29 +01:00
b70a12c0f3
Update fr.jsx
2016-11-25 09:25:28 +01:00
1b2e66ecfe
Merge pull request #3 from Gargron/master
...
Merge
2016-11-25 08:53:34 +01:00
ca342abbff
Fix bad reference
2016-11-24 23:56:37 +01:00
45c68c76d0
Fix forgotten reference
2016-11-24 23:49:45 +01:00
30f9e9e624
Remove Neo4J
2016-11-24 23:46:27 +01:00
4bbec58034
Center header in account column, hide media in "muted" status components (notifications)
2016-11-24 23:09:53 +01:00
a353fc5c4d
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
f447649d25
Merge branch 'master' into french-translation
2016-11-24 20:13:30 +01:00
d46c2e98ee
Update index.jsx
...
Forgot to add `fr` here.
2016-11-24 20:12:16 +01:00
8ab2fcbb2c
Mini Profiler not working well, remove it
2016-11-24 19:59:11 +01:00
ae142ab32a
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
4af2805038
Add some OpenGraph tags to public statuses
2016-11-24 18:28:10 +01:00
f613f2b84a
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
2152dfef02
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
cb06801b21
Extract filename obfuscation into module
2016-11-24 00:30:58 +00:00
90b3ff2518
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
f6d196255c
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
66a20701b7
Rename media to avoid exposing filename ( fixes #207 )
2016-11-23 21:03:03 +00:00
cda67241d4
Merge branch 'development'
2016-11-23 19:01:12 +01:00
d78962c1ed
Cache accounts/:id/statuses and single statuses too
2016-11-23 19:00:43 +01:00
1c8ca7aed5
Adding content sensitivity toggle, spoilers for media
2016-11-23 18:53:23 +01:00
5dc7e130f8
Improve contrast for settings pages ( fixes #173 )
2016-11-23 17:37:10 +00:00
48bd02124c
Merge pull request #227 from nclm/french-translation
...
Missing lines in the French translation
2016-11-23 17:18:27 +01:00
862b82051a
Rename ‘Publier’ to ‘Pouet’ in French locale.
...
🎺 https://mastodon.social/users/Pierrec/updates/100589
2016-11-23 15:53:49 +01:00
29bcf41808
Merge branch 'master' into french-translation
2016-11-23 15:43:27 +01:00
cb19a97e3e
Update doorkeeper.fr.yml
...
e
2016-11-23 14:47:41 +01:00
85e53eb127
Update doorkeeper.fr.yml
2016-11-23 14:45:31 +01:00
3c12f6f23b
Add content spoilers for media in sensitive-content statuses
2016-11-23 11:23:32 +01:00
65d6191147
Adding sensitive marker to statuses in API
2016-11-23 10:46:48 +01:00
nicolas