Eugen Rochko
2d07cb5771
Catching rack timeout from rails doesn't work
2017-04-02 21:12:18 +02:00
Tobias Merkle
f25fc04ea1
single-quotes
2017-04-02 14:55:13 -04:00
Tobias Merkle
ca21be3e16
remove black border on buttons
2017-04-02 14:54:24 -04:00
Eugen Rochko
5b12624847
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
Neville Park
54c796c8df
Corrected spelling mistake
2017-04-02 13:01:55 -04:00
Eugen
34ff11c496
Merge pull request #729 from Abzol/master
...
Fix word-break in account profiles
2017-04-02 17:53:00 +02:00
Eugen
25ed563cdb
Merge pull request #735 from TheKinrar/patch-3
...
Add link to instances.mastodon.xyz
2017-04-02 17:50:15 +02:00
TheKinrar
9f219d8968
Add link to instances.mastodon.xyz
2017-04-02 17:48:25 +02:00
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
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
4b7dca4713
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
2017-04-02 16:45:49 +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
d6b965cf08
Fix issue with feed merge-in code as well
2017-04-02 15:58:25 +02:00
Eugen Rochko
e809caa0e1
Fix feed regeneration bug
2017-04-02 15:46:31 +02:00
Sina Mashek
aaea7e1e7c
Adding social.mashek.net
2017-04-02 16:22:13 +03:00
Eugen Rochko
750662d9e2
Merge branch 'maximeborges-master'
2017-04-02 12:38:11 +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
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
a2fa09518f
Merge branch 'master' into patch-1
2017-04-02 12:33:29 +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
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
3ed75efc31
Add fr locale for community_timeline in fr.jsx
2017-04-01 23:45:53 -07:00
Damien Erambert
cb1989cbd8
Add locale in devise.fr.yml
2017-04-01 23:38:40 -07:00
Damien Erambert
03d676faa8
Add french translation for "scopes" in doorkeeper.fr.yml
2017-04-01 23:35:11 -07:00
Damien Erambert
9e26af264e
Fix small typo in doorkeeper.fr.yml
2017-04-01 23:34:37 -07:00
Damien Erambert
f9f6098e22
Complete localization of in simple_form.fr.yml
2017-04-01 23:26:26 -07:00
Damien Erambert
2c881e6717
Improve french locales on the backend (WIP)
2017-04-01 23:15:49 -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
433cb198fa
Fix landing page sign up form ignoring username field
2017-04-02 04:13: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
ae43978433
improve video button visibililty
2017-04-01 21:02:30 -04: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
7ccc9b8b02
Add social.targaryen.house to instances list
2017-04-01 23:53:00 +02:00
Eugen
55d275d30f
Merge pull request #714 from TheKinrar/patch-1
...
Add mastodon.xyz to instances list
2017-04-01 23:10:39 +02:00
Eugen Rochko
a8c2e44fee
Fix broken reference
2017-04-01 22:29:20 +02:00
Eugen Rochko
808017ff18
Paperclip will complain on its own if this variable is missing
2017-04-01 22:16:26 +02:00
Eugen Rochko
60ebfa182f
Made modal system more generic
2017-04-01 22:11:28 +02:00
Maxime BORGES
f693ab69f3
Fix word-break in profile's note on profile page and profile component
2017-04-01 20:17:28 +02:00
TheKinrar
355168b939
Add mastodon.xyz to instances list
2017-04-01 18:00:52 +02:00
Eugen Rochko
13dfd8d109
Improve mobile tabs a little
2017-04-01 15:17:35 +02:00
Eugen Rochko
d93d6f5124
Fix reworked search
2017-03-31 22:45:56 +02:00
Eugen
7ddda65269
Merge pull request #706 from alexgleason/patch-3
...
Put line breaks between API methods in docs
2017-03-31 21:25:31 +02:00
Eugen Rochko
b4046c5957
Rework search
2017-03-31 21:11:09 +02:00
Alex Gleason
d835647ec0
Put line breaks between API methods in docs
2017-03-31 14:55:08 -04:00
Eugen
553e6dd07c
Merge pull request #685 from yiskah/patch-2
...
Clarify post privacy warning
2017-03-31 16:36:29 +02:00
Eugen
1ee292b4cc
Merge pull request #703 from alexgleason/patch-1
...
Mastodon is not an alternative, it is a solution
2017-03-31 16:36:21 +02:00
Alex Gleason
e4c10b32b3
Mastodon is not an alternative, it is a solution
...
This month I traveled to Cambridge, Massachusetts with my friends and attended LibrePlanet 2017. At the talk *Technology for direct actions*, Andrew Seeder pointed out that we often call free software an "alternative" to what exists. But an alternative is something that is mostly similar, and differentiated by preference rather than need. For instance, a trackball is an alternative to a mouse, but a jail is not an alternative to a bedroom. Andrew suggested that we start looking at free software as "solutions" rather than alternatives. So I propose boldly proclaiming that Mastodon is not an alternative to Twitter, but rather a solution to it.
2017-03-31 10:34:21 -04:00
shel
f20f6b25b9
Merge branch 'master' into patch-2
2017-03-31 10:34:14 -04:00
Eugen Rochko
680f9efe9c
Fix web UI profile clickable area overlapping with follow button area
2017-03-31 14:23:44 +02:00
Eugen Rochko
bde5c0eaf9
Fix some views still not using counter caches
2017-03-31 14:02:07 +02:00
