Commit Graph

1634 Commits (8e50f24a5ccceb35391f98ddf0cd9cbd8f7b9e83)

Author SHA1 Message Date
Eugen Rochko f04816f005 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 Rochko 4db2e2f4eb 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
Sina Mashek aa72831d14 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 347830262f 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 5b39827c82 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
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
Damien Erambert 22fb48ca13 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 9ba1d01fe4 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 ef1c4de714 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
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
Eugen Rochko e407ed24a6 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
Tobias Merkle 8befce32f3 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
Wonderfall 77d3ed5be3 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 Rochko 431bfcaad6 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 b794690bfe 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
TheKinrar 4bb2888a9d 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 3c6e9ee33c 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 Rochko a895f0d448 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
Eugen f4d4b368b0 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
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
shel 57e3d4c58b 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 355b9278d5 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 9d873bec34 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 bbc3a36c82 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 f1a3855f30 Fix up null values on latest migration, add notes 2017-03-30 16:06:27 +02:00
Eugen Rochko 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
2017-03-30 15:50:34 +02:00
Eugen Rochko 96e58cf289 Add counter caches for a large performance increase on API requests 2017-03-30 15:06:59 +02:00
Eugen Rochko cdbfbbc691 Improve emojis - use SVGs where possible 2017-03-29 22:27:24 +02:00
Eugen Rochko 8c97719fbc Hide drag & drop area on drop event regardless of success 2017-03-28 14:17:24 +02:00