Commit graph

39685 commits

Author SHA1 Message Date
Eugen
ff4d38ac85 Merge pull request #276 from nclm/french-translation
French translation update
2016-11-25 13:41:49 +01:00
Eugen
50bec5b999 Merge pull request #276 from nclm/french-translation
French translation update
2016-11-25 13:41:49 +01:00
kodacs
9849c564de fix #275 2016-11-25 13:35:08 +01:00
kodacs
6586408c69 fix #275 2016-11-25 13:35:08 +01:00
nicolas
8cd2d6a174 Merge branch 'master' into french-translation 2016-11-25 13:33:00 +01:00
nicolas
959e4b8198 Merge branch 'master' into french-translation 2016-11-25 13:33:00 +01:00
nicolas
12100797c4 Update fr.jsx 2016-11-25 13:31:46 +01:00
nicolas
effdb42f4c Update fr.jsx 2016-11-25 13:31:46 +01:00
nicolas
3958b6c655 Update simple_form.fr.yml 2016-11-25 13:30:52 +01:00
nicolas
9bb885805c Update simple_form.fr.yml 2016-11-25 13:30:52 +01:00
Eugen Rochko
666eda7256 Remove stale entries from cache results 2016-11-25 13:25:40 +01:00
Eugen Rochko
8a3745a4df Remove stale entries from cache results 2016-11-25 13:25:40 +01:00
Eugen Rochko
9798cf624a Normalized locale files 2016-11-25 13:15:07 +01:00
Eugen Rochko
1ff0d5aea6 Normalized locale files 2016-11-25 13:15:07 +01:00
Eugen
8183330361 Merge pull request #273 from nclm/french-translation
French localisation update
2016-11-25 13:14:30 +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
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
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
6d952d6815 Server side HU translation + Toot fix. 2016-11-25 12:43:23 +01:00
kodacs
eb3a12bba6 Server side HU translation + Toot fix. 2016-11-25 12:43:23 +01:00
Eugen Rochko
3b3bf2dd59 Filter statuses that mention blocked users 2016-11-25 12:35:52 +01:00
Eugen Rochko
e3ed212b85 Filter statuses that mention blocked users 2016-11-25 12:35:52 +01:00
kodacs
c6353f6d39 Hungarian translation 2016-11-25 09:43:19 +01:00
kodacs
7d6c461739 Hungarian translation 2016-11-25 09:43:19 +01:00
nicolas
283623e3d4 Update simple_form.fr.yml 2016-11-25 09:25:31 +01:00
nicolas
d0122045f4 Update simple_form.fr.yml 2016-11-25 09:25:31 +01:00
nicolas
ed8361b57a Update fr.yml 2016-11-25 09:25:29 +01:00
nicolas
4cc6684881 Update fr.yml 2016-11-25 09:25:29 +01:00
nicolas
b70a12c0f3 Update fr.jsx 2016-11-25 09:25:28 +01:00
nicolas
03d22fabb7 Update fr.jsx 2016-11-25 09:25:28 +01:00
nicolas
1b2e66ecfe Merge pull request #3 from Gargron/master
Merge
2016-11-25 08:53:34 +01:00
nicolas
9af6c52a41 Merge pull request #3 from Gargron/master
Merge
2016-11-25 08:53:34 +01:00
Eugen Rochko
ca342abbff Fix bad reference 2016-11-24 23:56:37 +01:00
Eugen Rochko
543d06971e Fix bad reference 2016-11-24 23:56:37 +01:00
Eugen Rochko
45c68c76d0 Fix forgotten reference 2016-11-24 23:49:45 +01:00
Eugen Rochko
34e18eb251 Fix forgotten reference 2016-11-24 23:49:45 +01:00
Eugen Rochko
30f9e9e624 Remove Neo4J 2016-11-24 23:46:27 +01:00
Eugen Rochko
8efa081f21 Remove Neo4J 2016-11-24 23:46:27 +01:00
Eugen Rochko
4bbec58034 Center header in account column, hide media in "muted" status components (notifications) 2016-11-24 23:09:53 +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
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
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
f447649d25 Merge branch 'master' into french-translation 2016-11-24 20:13:30 +01:00
nicolas
60577f4c6e Merge branch 'master' into french-translation 2016-11-24 20:13:30 +01:00
nicolas
d46c2e98ee Update index.jsx
Forgot to add `fr` here.
2016-11-24 20:12:16 +01:00
nicolas
5e33445c5f Update index.jsx
Forgot to add `fr` here.
2016-11-24 20:12:16 +01:00
Eugen Rochko
8ab2fcbb2c Mini Profiler not working well, remove it 2016-11-24 19:59:11 +01:00
Eugen Rochko
8e34bed7cc Mini Profiler not working well, remove it 2016-11-24 19:59:11 +01:00
Alyssa Ross
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
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