30da6440d0
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
8 years ago
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.
8 years ago
4b7dca4713
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
8 years ago
3a62721e54
Merge pull request #728 from bottitytto/add-mashek
...
Adding social.mashek.net
8 years ago
d6b965cf08
Fix issue with feed merge-in code as well
8 years ago
e809caa0e1
Fix feed regeneration bug
8 years ago
aaea7e1e7c
Adding social.mashek.net
8 years ago
750662d9e2
Merge branch 'maximeborges-master'
8 years ago
34aff3e269
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
8 years ago
e70661b495
Merge pull request #723 from jkap/patch-1
...
Updated list of instances for gay.crime.team
8 years ago
a2fa09518f
Merge branch 'master' into patch-1
8 years ago
3e84a86eb8
Merge pull request #727 from TheKinrar/patch-2
...
Add IPv6 column in list and remove dead instance
8 years ago
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.
8 years ago
3ed75efc31
Add fr locale for community_timeline in fr.jsx
8 years ago
cb1989cbd8
Add locale in devise.fr.yml
8 years ago
03d676faa8
Add french translation for "scopes" in doorkeeper.fr.yml
8 years ago
9e26af264e
Fix small typo in doorkeeper.fr.yml
8 years ago
f9f6098e22
Complete localization of in simple_form.fr.yml
8 years ago
2c881e6717
Improve french locales on the backend (WIP)
8 years ago
1389d5d7fd
Updated list of instances for gay.crime.team
...
Updated out-of-date info for gay.crime.team
8 years ago
433cb198fa
Fix landing page sign up form ignoring username field
8 years ago
3ffa27e812
Merge pull request #720 from 0x70b1a5/master
...
improve video button visibililty (issue #713 )
8 years ago
ae43978433
improve video button visibililty
8 years ago
0f05643f5d
Merge pull request #718 from Wonderfall/master
...
Add social.targaryen.house to instances list
8 years ago
7ccc9b8b02
Add social.targaryen.house to instances list
8 years ago
55d275d30f
Merge pull request #714 from TheKinrar/patch-1
...
Add mastodon.xyz to instances list
8 years ago
a8c2e44fee
Fix broken reference
8 years ago
808017ff18
Paperclip will complain on its own if this variable is missing
8 years ago
60ebfa182f
Made modal system more generic
8 years ago
f693ab69f3
Fix word-break in profile's note on profile page and profile component
8 years ago
355168b939
Add mastodon.xyz to instances list
8 years ago
13dfd8d109
Improve mobile tabs a little
8 years ago
d93d6f5124
Fix reworked search
8 years ago
7ddda65269
Merge pull request #706 from alexgleason/patch-3
...
Put line breaks between API methods in docs
8 years ago
b4046c5957
Rework search
8 years ago
d835647ec0
Put line breaks between API methods in docs
8 years ago
553e6dd07c
Merge pull request #685 from yiskah/patch-2
...
Clarify post privacy warning
8 years ago
1ee292b4cc
Merge pull request #703 from alexgleason/patch-1
...
Mastodon is not an alternative, it is a solution
8 years ago
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.
8 years ago
f20f6b25b9
Merge branch 'master' into patch-2
8 years ago
680f9efe9c
Fix web UI profile clickable area overlapping with follow button area
8 years ago
bde5c0eaf9
Fix some views still not using counter caches
8 years ago
5e26295e06
Fix #700 - hide spoilers on static pages
8 years ago
188cddefe9
Add maintenance task for updating counter caches
8 years ago
3ac4455160
:active and :focus states same as :hover for buttons
8 years ago
bf61bc1b96
Fix drag & drop overlay flickering
8 years ago
e8875c6046
Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )
8 years ago
03fb6c16ec
Fix up null values on latest migration, add notes
8 years ago
87513b31e0
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
30964350b2
Merge branch 'master' into development
8 years ago
Olivia Mossberg