specter/mastodon
1
0
Fork 1
forked from fedi/mastodon
Code Pull requests Activity
1519 commits 82 branches 202 tags 316 MiB
Commit graph

1519 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Eugen Rochko 5e26295e06 Fix #700 - hide spoilers on static pages 2017-03-31 13:54:36 +02:00
Eugen Rochko 188cddefe9 Add maintenance task for updating counter caches 2017-03-31 13:01:00 +02:00
Eugen Rochko 3ac4455160 :active and :focus states same as :hover for buttons 2017-03-31 12:08:51 +02:00
Eugen Rochko bf61bc1b96 Fix drag & drop overlay flickering 2017-03-31 11:48:25 +02:00
Eugen Rochko e8875c6046 Import feature for following/blocking lists (addresses #62, #177, #201, #454) 2017-03-30 19:42:33 +02:00
Eugen Rochko 03fb6c16ec Fix up null values on latest migration, add notes 2017-03-30 16:06:27 +02:00
Eugen Rochko 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
 2017-03-30 15:50:34 +02:00
Eugen Rochko de22c202f5 Add counter caches for a large performance increase on API requests 2017-03-30 15:06:59 +02:00
Eugen Rochko 333e44c3fc Improve emojis - use SVGs where possible 2017-03-29 22:27:24 +02:00
Eugen Rochko bb7006bda1 Hide drag & drop area on drop event regardless of success 2017-03-28 14:17:24 +02:00
Eugen Rochko 139fc994e2 Fix #408 - link @ names in bios 2017-03-28 14:16:08 +02:00
Eugen Rochko 1c6b02f936 Fix #690 - Webfinger should handle new shortform profile URLs now (nice) 2017-03-28 11:25:43 +02:00
Eugen 448a07cc3f Merge pull request #688 from yiskah/patch-3 
Update amaroq name
 2017-03-26 21:45:49 +02:00
shel 5181702a60 Update amaroq name 2017-03-26 15:45:16 -04:00
shel 76188d61f2 Clarify post privacy warning 
I was informed that the current warning if you @ a remote server in a private post is inadequate. These are suggested changes to better inform users.
 2017-03-26 12:49:14 -04:00
Eugen Rochko c334541011 Add tooltip to privacy dropdown 2017-03-26 13:30:57 +02:00
Eugen Rochko f864fee116 Fix up some localizations 2017-03-26 13:22:38 +02:00
Eugen Rochko ebe53cb38c Merge branch 'leopku-feature/language_zh-cn' 2017-03-26 13:13:57 +02:00
Eugen Rochko efbbd42216 Fix style issue 2017-03-26 13:13:41 +02:00
Eugen Rochko dddb2eb84f Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn 2017-03-26 13:10:04 +02:00
Eugen Rochko 6ec6fe259a Compose form layout fixes 2017-03-26 13:08:15 +02:00
Eugen Rochko 874d91126c Merge branch 'yiskah-patch-1' 2017-03-26 12:49:31 +02:00
leopku d5d5afff9c 🌐 add simplified chinese language 2017-03-26 14:13:18 +08:00
shel 5f7c997654 Change to using variables 
Thanks garg
 2017-03-25 20:42:49 -04:00