nicolas
9f9680412f
Merge pull request #6 from Gargron/master
...
Merge
2016-11-25 18:14:42 +01:00
Andrea Faulds
b107a4820a
Remove remnants of Neo4J
2016-11-25 16:15:46 +00:00
Eugen Rochko
4495baf451
X-RateLimit-Reset formatted with iso8601
2016-11-25 15:21:22 +01:00
kodacs
b503a5e05e
#275 fix missing i18n item
2016-11-25 14:56:28 +01:00
Eugen Rochko
898ab66e2e
Fix checkbox spacing
2016-11-25 14:02:12 +01:00
nicolas
c1aab76da4
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
kodacs
7bd559158b
fixing yamls for #275
2016-11-25 13:57:37 +01:00
Eugen
50bec5b999
Merge pull request #276 from nclm/french-translation
...
French translation update
2016-11-25 13:41:49 +01:00
kodacs
6586408c69
fix #275
2016-11-25 13:35:08 +01:00
nicolas
959e4b8198
Merge branch 'master' into french-translation
2016-11-25 13:33:00 +01:00
nicolas
effdb42f4c
Update fr.jsx
2016-11-25 13:31:46 +01:00
nicolas
9bb885805c
Update simple_form.fr.yml
2016-11-25 13:30:52 +01:00
Eugen Rochko
8a3745a4df
Remove stale entries from cache results
2016-11-25 13:25:40 +01:00
Eugen Rochko
1ff0d5aea6
Normalized locale files
2016-11-25 13:15:07 +01:00
Eugen
1c9e21a507
Merge pull request #273 from nclm/french-translation
...
French localisation update
2016-11-25 13:14:30 +01:00
Eugen Rochko
71401659b8
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
kodacs
eb3a12bba6
Server side HU translation + Toot fix.
2016-11-25 12:43:23 +01:00
Eugen Rochko
e3ed212b85
Filter statuses that mention blocked users
2016-11-25 12:35:52 +01:00
kodacs
7d6c461739
Hungarian translation
2016-11-25 09:43:19 +01:00
nicolas
d0122045f4
Update simple_form.fr.yml
2016-11-25 09:25:31 +01:00
nicolas
4cc6684881
Update fr.yml
2016-11-25 09:25:29 +01:00
nicolas
03d22fabb7
Update fr.jsx
2016-11-25 09:25:28 +01:00
nicolas
9af6c52a41
Merge pull request #3 from Gargron/master
...
Merge
2016-11-25 08:53:34 +01:00
Eugen Rochko
543d06971e
Fix bad reference
2016-11-24 23:56:37 +01:00
Eugen Rochko
34e18eb251
Fix forgotten reference
2016-11-24 23:49:45 +01:00
Eugen Rochko
8efa081f21
Remove Neo4J
2016-11-24 23:46:27 +01:00
Eugen Rochko
fca183968e
Center header in account column, hide media in "muted" status components (notifications)
2016-11-24 23:09:53 +01:00
Eugen
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
nicolas
60577f4c6e
Merge branch 'master' into french-translation
2016-11-24 20:13:30 +01:00
nicolas
5e33445c5f
Update index.jsx
...
Forgot to add `fr` here.
2016-11-24 20:12:16 +01:00
Eugen Rochko
8e34bed7cc
Mini Profiler not working well, remove it
2016-11-24 19:59:11 +01:00
Alyssa Ross
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
Eugen Rochko
b6ee2fb1c6
Add some OpenGraph tags to public statuses
2016-11-24 18:28:10 +01:00
Eugen Rochko
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
Eugen
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
Alyssa Ross
cefef2c571
Extract filename obfuscation into module
2016-11-24 00:30:58 +00:00
Eugen Rochko
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
Eugen Rochko
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
Andrea Faulds
7161f91313
Rename media to avoid exposing filename ( fixes #207 )
2016-11-23 21:03:03 +00:00
Eugen Rochko
3373ae02de
Merge branch 'development'
2016-11-23 19:01:12 +01:00
Eugen Rochko
79a0135869
Cache accounts/:id/statuses and single statuses too
2016-11-23 19:00:43 +01:00
Eugen Rochko
2112a81e86
Adding content sensitivity toggle, spoilers for media
2016-11-23 18:53:23 +01:00
Andrea Faulds
8e936b03d5
Improve contrast for settings pages ( fixes #173 )
2016-11-23 17:37:10 +00:00
Eugen
d74cef45aa
Merge pull request #227 from nclm/french-translation
...
Missing lines in the French translation
2016-11-23 17:18:27 +01:00
nicolas
e8725d2d98
Rename ‘Publier’ to ‘Pouet’ in French locale.
...
🎺 https://mastodon.social/users/Pierrec/updates/100589
2016-11-23 15:53:49 +01:00
nicolas
23677bc51e
Merge branch 'master' into french-translation
2016-11-23 15:43:27 +01:00
nicolas
1e95fbb10b
Update doorkeeper.fr.yml
...
e
2016-11-23 14:47:41 +01:00
nicolas
94f96a6e85
Update doorkeeper.fr.yml
2016-11-23 14:45:31 +01:00
Eugen Rochko
5434ad3002
Add content spoilers for media in sensitive-content statuses
2016-11-23 11:23:32 +01:00
Eugen Rochko
0603971894
Adding sensitive marker to statuses in API
2016-11-23 10:46:48 +01:00
