Commit graph

39673 commits

Author SHA1 Message Date
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
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
431bfcaad6 Fix broken reference 2017-04-01 22:29:20 +02:00
Eugen Rochko
a8c2e44fee Fix broken reference 2017-04-01 22:29:20 +02:00
Eugen Rochko
d1f8bd2673 Paperclip will complain on its own if this variable is missing 2017-04-01 22:16:26 +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
b794690bfe Made modal system more generic 2017-04-01 22:11:28 +02:00
Eugen Rochko
60ebfa182f Made modal system more generic 2017-04-01 22:11:28 +02:00
Maxime BORGES
9f0d00567b Fix word-break in profile's note on profile page and profile component 2017-04-01 20:17: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
4bb2888a9d Add mastodon.xyz to instances list 2017-04-01 18:00:52 +02:00
TheKinrar
355168b939 Add mastodon.xyz to instances list 2017-04-01 18:00:52 +02:00
Eugen Rochko
348e817d53 Improve mobile tabs a little 2017-04-01 15:17:35 +02:00
Eugen Rochko
13dfd8d109 Improve mobile tabs a little 2017-04-01 15:17:35 +02:00
Eugen Rochko
3c6e9ee33c Fix reworked search 2017-03-31 22:45:56 +02:00
Eugen Rochko
d93d6f5124 Fix reworked search 2017-03-31 22:45:56 +02:00
Eugen
3a636e4c9b 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
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
a895f0d448 Rework search 2017-03-31 21:11:09 +02:00
Eugen Rochko
b4046c5957 Rework search 2017-03-31 21:11:09 +02:00
Alex Gleason
f62b7faa17 Put line breaks between API methods in docs 2017-03-31 14:55:08 -04:00
Alex Gleason
d835647ec0 Put line breaks between API methods in docs 2017-03-31 14:55:08 -04:00
Eugen
f4d4b368b0 Merge pull request #685 from yiskah/patch-2
Clarify post privacy warning
2017-03-31 16:36:29 +02:00
Eugen
553e6dd07c Merge pull request #685 from yiskah/patch-2
Clarify post privacy warning
2017-03-31 16:36:29 +02:00
Eugen
61428b270f 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
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
32d7e20fb6 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
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
57e3d4c58b Merge branch 'master' into patch-2 2017-03-31 10:34:14 -04:00
shel
f20f6b25b9 Merge branch 'master' into patch-2 2017-03-31 10:34:14 -04:00
Eugen Rochko
7931d5886c Fix web UI profile clickable area overlapping with follow button area 2017-03-31 14:23:44 +02: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
355b9278d5 Fix some views still not using counter caches 2017-03-31 14:02:07 +02:00
Eugen Rochko
bde5c0eaf9 Fix some views still not using counter caches 2017-03-31 14:02:07 +02:00
Eugen Rochko
be9accbacc Fix #700 - hide spoilers on static pages 2017-03-31 13:54:36 +02:00
Eugen Rochko
5e26295e06 Fix #700 - hide spoilers on static pages 2017-03-31 13:54:36 +02:00
Eugen Rochko
9d873bec34 Add maintenance task for updating counter caches 2017-03-31 13:01:00 +02:00
Eugen Rochko
188cddefe9 Add maintenance task for updating counter caches 2017-03-31 13:01:00 +02:00
Eugen Rochko
9169326960 :active and :focus states same as :hover for buttons 2017-03-31 12:08:51 +02:00
Eugen Rochko
3ac4455160 :active and :focus states same as :hover for buttons 2017-03-31 12:08:51 +02:00
Eugen Rochko
bbc3a36c82 Fix drag & drop overlay flickering 2017-03-31 11:48:25 +02:00
Eugen Rochko
bf61bc1b96 Fix drag & drop overlay flickering 2017-03-31 11:48:25 +02:00
Eugen Rochko
244da78105 Import feature for following/blocking lists (addresses #62, #177, #201, #454) 2017-03-30 19:42:33 +02:00
Eugen Rochko
e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454) 2017-03-30 19:42:33 +02:00