Commit Graph

1652 Commits (79828478c68ac535b53c1cf9b7605b6622587c83)

Author SHA1 Message Date
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 2c15b7966d Merge branch 'master' into development 2017-03-30 15:07:27 +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 947caf5678 Add counter caches for a large performance increase on API requests 2017-03-30 04:47:04 +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
Eugen Rochko 4ef48bcc42 Fix #408 - link @ names in bios 2017-03-28 14:16:08 +02:00
Eugen Rochko a4ce8b09fb Fix #690 - Webfinger should handle new shortform profile URLs now (nice) 2017-03-28 11:25:43 +02:00
Eugen 0c787dd9d6 Merge pull request #688 from yiskah/patch-3
Update amaroq name
2017-03-26 21:45:49 +02:00
shel 3656972cea Update amaroq name 2017-03-26 15:45:16 -04:00
shel 728174500e 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 02e2336daa Add tooltip to privacy dropdown 2017-03-26 13:30:57 +02:00
Eugen Rochko 74fb333eb7 Fix up some localizations 2017-03-26 13:22:38 +02:00
Eugen Rochko 6146a009a5 Merge branch 'leopku-feature/language_zh-cn' 2017-03-26 13:13:57 +02:00
Eugen Rochko d50aa74690 Fix style issue 2017-03-26 13:13:41 +02:00
Eugen Rochko 66ba47a1f3 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 2a8906d56a Compose form layout fixes 2017-03-26 13:08:15 +02:00
Eugen Rochko 690910479c Merge branch 'yiskah-patch-1' 2017-03-26 12:49:31 +02:00
leopku 58c9d97d07 🌐 add simplified chinese language 2017-03-26 14:13:18 +08:00
shel 8ab274f67a Change to using variables
Thanks garg
2017-03-25 20:42:49 -04:00
shel 1503068ba0 Increase color contrast
Privacy descriptions were very difficult to reason. This is the minimal level of color contrast to be WCAG AA compliant.
2017-03-25 20:02:36 -04:00
shel 7800909a0d Clarify privacy options
Descriptions of differences between scope are more clear
2017-03-25 19:59:38 -04:00
Eugen Rochko d30fa5c52d Fix up visual indicators for compose form privacy 2017-03-25 20:24:30 +01:00
Eugen Rochko d5c71b1403 Improve sign up page on small screens 2017-03-25 20:13:34 +01:00
Eugen Rochko e03f11e6a0 When replying to status with content warning, prefill content warning 2017-03-25 19:30:56 +01:00
Eugen Rochko 830f5c846e Temporary spacing fix 2017-03-25 19:27:31 +01:00
Eugen Rochko 54b4f60906 Privacy dropdown i18n 2017-03-25 19:22:24 +01:00
Eugen Rochko 6cce7c58a0 Fix public profile pagination links 2017-03-25 19:16:17 +01:00
Eugen Rochko 53ef83be1e Redesigned compose form 2017-03-25 19:14:12 +01:00
leopku e4205b09d1 🚧 chinese translation WIP 2017-03-24 19:03:14 +08:00
leopku 017e3b7da8 🌐 add chinese language file 2017-03-24 18:53:41 +08:00
Eugen Rochko 0ef0ea3e34 Fix #675 - return created_at in notifications API 2017-03-24 03:55:45 +01:00
Eugen Rochko b899b3def2 Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295) 2017-03-24 03:55:45 +01:00
Eugen c56017ab5f Merge pull request #676 from leopku/feature/s3_protocol_from_env
🔧 S3 protocol  from ENV
2017-03-24 00:13:08 +01:00
leopku 11f8faa6ba 🔧 S3 protocol from ENV
add support for reading S3 protocol from ENV
also add S3_HOSTNAME in .env.production.sample
2017-03-23 15:44:55 +08:00
Eugen Rochko 4fcd08a6b0 Merge branch 'feature-omnisearch' 2017-03-22 19:56:38 +01:00
Eugen Rochko b3cb765a94 Prettier account and stream entry URLs 2017-03-22 19:55:14 +01:00
Eugen Rochko a015d2e08b Shorter timeout on FetchAtomService 2017-03-22 17:41:52 +01:00