6e4703703a
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
8 years ago
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.
8 years ago
f04816f005
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
8 years ago
1e01011f65
Merge pull request #728 from bottitytto/add-mashek
...
Adding social.mashek.net
8 years ago
4db2e2f4eb
Fix issue with feed merge-in code as well
8 years ago
572cf64791
Fix feed regeneration bug
8 years ago
aa72831d14
Adding social.mashek.net
8 years ago
5bc32b0884
Merge branch 'maximeborges-master'
8 years ago
347830262f
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
8 years ago
7a475be4a5
Merge pull request #723 from jkap/patch-1
...
Updated list of instances for gay.crime.team
8 years ago
5b39827c82
Merge branch 'master' into patch-1
8 years ago
0993a18356
Merge pull request #727 from TheKinrar/patch-2
...
Add IPv6 column in list and remove dead instance
8 years ago
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.
8 years ago
22fb48ca13
Add fr locale for community_timeline in fr.jsx
8 years ago
180edd4baa
Add locale in devise.fr.yml
8 years ago
9ba1d01fe4
Add french translation for "scopes" in doorkeeper.fr.yml
8 years ago
cfc96a619c
Fix small typo in doorkeeper.fr.yml
8 years ago
ef1c4de714
Complete localization of in simple_form.fr.yml
8 years ago
b256d43b14
Improve french locales on the backend (WIP)
8 years ago
9460fa9d10
Updated list of instances for gay.crime.team
...
Updated out-of-date info for gay.crime.team
8 years ago
e407ed24a6
Fix landing page sign up form ignoring username field
8 years ago
15f18c303b
Merge pull request #720 from 0x70b1a5/master
...
improve video button visibililty (issue #713 )
8 years ago
8befce32f3
improve video button visibililty
8 years ago
e5f0015000
Merge pull request #718 from Wonderfall/master
...
Add social.targaryen.house to instances list
8 years ago
77d3ed5be3
Add social.targaryen.house to instances list
8 years ago
e0ac6c9186
Merge pull request #714 from TheKinrar/patch-1
...
Add mastodon.xyz to instances list
8 years ago
431bfcaad6
Fix broken reference
8 years ago
d1f8bd2673
Paperclip will complain on its own if this variable is missing
8 years ago
b794690bfe
Made modal system more generic
8 years ago
9f0d00567b
Fix word-break in profile's note on profile page and profile component
8 years ago
4bb2888a9d
Add mastodon.xyz to instances list
8 years ago
348e817d53
Improve mobile tabs a little
8 years ago
3c6e9ee33c
Fix reworked search
8 years ago
3a636e4c9b
Merge pull request #706 from alexgleason/patch-3
...
Put line breaks between API methods in docs
8 years ago
a895f0d448
Rework search
8 years ago
f62b7faa17
Put line breaks between API methods in docs
8 years ago
f4d4b368b0
Merge pull request #685 from yiskah/patch-2
...
Clarify post privacy warning
8 years ago
61428b270f
Merge pull request #703 from alexgleason/patch-1
...
Mastodon is not an alternative, it is a solution
8 years ago
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.
8 years ago
57e3d4c58b
Merge branch 'master' into patch-2
8 years ago
7931d5886c
Fix web UI profile clickable area overlapping with follow button area
8 years ago
355b9278d5
Fix some views still not using counter caches
8 years ago
be9accbacc
Fix #700 - hide spoilers on static pages
8 years ago
9d873bec34
Add maintenance task for updating counter caches
8 years ago
9169326960
:active and :focus states same as :hover for buttons
8 years ago
bbc3a36c82
Fix drag & drop overlay flickering
8 years ago
244da78105
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
8 years ago
f1a3855f30
Fix up null values on latest migration, add notes
8 years ago
03245e1a72
Do NOT try to update the new fields from the migration. Takes too long on a live DB
...
Needs to be a separate task with no locking
8 years ago
2c15b7966d
Merge branch 'master' into development
8 years ago
Olivia Mossberg
Eugen Rochko
Sina Mashek
TheKinrar
Damien Erambert
jenn kaplan
Tobias Merkle
Wonderfall
Maxime BORGES
Alex Gleason
shel