Olivia Mossberg
30da6440d0
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
2017-04-02 17:04:31 +02:00
Olivia Mossberg
2d8a0caf98
Fix word-break in account profiles
...
word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors.
2017-04-02 16:54:24 +02:00
Olivia Mossberg
f4b5fe9caf
Fix word-break in account profiles
...
word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors.
2017-04-02 16:54:24 +02:00
Eugen Rochko
f04816f005
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
2017-04-02 16:45:49 +02:00
Eugen Rochko
4b7dca4713
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
2017-04-02 16:45:49 +02:00
Eugen
1e01011f65
Merge pull request #728 from bottitytto/add-mashek
...
Adding social.mashek.net
2017-04-02 16:30:30 +02:00
Eugen
3a62721e54
Merge pull request #728 from bottitytto/add-mashek
...
Adding social.mashek.net
2017-04-02 16:30:30 +02:00
Eugen Rochko
4db2e2f4eb
Fix issue with feed merge-in code as well
2017-04-02 15:58:25 +02:00
Eugen Rochko
d6b965cf08
Fix issue with feed merge-in code as well
2017-04-02 15:58:25 +02:00
Eugen Rochko
572cf64791
Fix feed regeneration bug
2017-04-02 15:46:31 +02:00
Eugen Rochko
e809caa0e1
Fix feed regeneration bug
2017-04-02 15:46:31 +02:00
Sina Mashek
aa72831d14
Adding social.mashek.net
2017-04-02 16:22:13 +03:00
Sina Mashek
aaea7e1e7c
Adding social.mashek.net
2017-04-02 16:22:13 +03:00
Eugen Rochko
5bc32b0884
Merge branch 'maximeborges-master'
2017-04-02 12:38:11 +02:00
Eugen Rochko
750662d9e2
Merge branch 'maximeborges-master'
2017-04-02 12:38:11 +02:00
Eugen Rochko
347830262f
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
2017-04-02 12:36:26 +02:00
Eugen Rochko
34aff3e269
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
2017-04-02 12:36:26 +02:00
Eugen
7a475be4a5
Merge pull request #723 from jkap/patch-1
...
Updated list of instances for gay.crime.team
2017-04-02 12:33:34 +02:00
Eugen
e70661b495
Merge pull request #723 from jkap/patch-1
...
Updated list of instances for gay.crime.team
2017-04-02 12:33:34 +02:00
Eugen
5b39827c82
Merge branch 'master' into patch-1
2017-04-02 12:33:29 +02:00
Eugen
a2fa09518f
Merge branch 'master' into patch-1
2017-04-02 12:33:29 +02:00
Eugen
0993a18356
Merge pull request #727 from TheKinrar/patch-2
...
Add IPv6 column in list and remove dead instance
2017-04-02 12:32:17 +02:00
Eugen
3e84a86eb8
Merge pull request #727 from TheKinrar/patch-2
...
Add IPv6 column in list and remove dead instance
2017-04-02 12:32:17 +02:00
TheKinrar
e7840652bb
Add IPv6 column in list and remove dead instance
...
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own.
2017-04-02 12:05:32 +02:00
TheKinrar
f5d434e433
Add IPv6 column in list and remove dead instance
...
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own.
2017-04-02 12:05:32 +02:00
Damien Erambert
22fb48ca13
Add fr locale for community_timeline in fr.jsx
2017-04-01 23:45:53 -07:00
Damien Erambert
3ed75efc31
Add fr locale for community_timeline in fr.jsx
2017-04-01 23:45:53 -07:00
Damien Erambert
180edd4baa
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
Damien Erambert
cb1989cbd8
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
Damien Erambert
9ba1d01fe4
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
Damien Erambert
03d676faa8
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
Damien Erambert
cfc96a619c
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
Damien Erambert
9e26af264e
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
Damien Erambert
ef1c4de714
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
Damien Erambert
f9f6098e22
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
Damien Erambert
b256d43b14
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -07:00
Damien Erambert
2c881e6717
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -07:00
jenn kaplan
9460fa9d10
Updated list of instances for gay.crime.team
...
Updated out-of-date info for gay.crime.team
2017-04-01 22:37:10 -07:00
jenn kaplan
1389d5d7fd
Updated list of instances for gay.crime.team
...
Updated out-of-date info for gay.crime.team
2017-04-01 22:37:10 -07:00
Eugen Rochko
e407ed24a6
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
Eugen Rochko
433cb198fa
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
Eugen
15f18c303b
Merge pull request #720 from 0x70b1a5/master
...
improve video button visibililty (issue #713 )
2017-04-02 03:15:22 +02:00
Eugen
3ffa27e812
Merge pull request #720 from 0x70b1a5/master
...
improve video button visibililty (issue #713 )
2017-04-02 03:15:22 +02:00
Tobias Merkle
8befce32f3
improve video button visibililty
2017-04-01 21:02:30 -04:00
Tobias Merkle
ae43978433
improve video button visibililty
2017-04-01 21:02:30 -04:00
Eugen
e5f0015000
Merge pull request #718 from Wonderfall/master
...
Add social.targaryen.house to instances list
2017-04-02 01:27:02 +02:00
Eugen
0f05643f5d
Merge pull request #718 from Wonderfall/master
...
Add social.targaryen.house to instances list
2017-04-02 01:27:02 +02:00
Wonderfall
77d3ed5be3
Add social.targaryen.house to instances list
2017-04-01 23:53:00 +02:00
Wonderfall
7ccc9b8b02
Add social.targaryen.house to instances list
2017-04-01 23:53:00 +02:00
Eugen
e0ac6c9186
Merge pull request #714 from TheKinrar/patch-1
...
Add mastodon.xyz to instances list
2017-04-01 23:10:39 +02:00
