tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
4,401 Commits 20 Branches 113 Tags 222 MiB
9330ea1f4d
Commit Graph

2958 Commits

Author SHA1 Message Date
Ondřej Hruška
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream 2017-09-28 09:12:17 +02:00
Ondřej Hruška
06e299cef5
Revert "autoscroll emoji suggestions box" 
This reverts commit c89cce0219.
 2017-09-28 08:56:32 +02:00
Ondřej Hruška
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest" 
This reverts commit fa3587645d, reversing
changes made to 15c9c2fd7e.
 2017-09-28 08:55:53 +02:00
Ondřej Hruška
210e6776fc
Fix intl warning with disabled secondary toot btn 
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
 2017-09-23 23:41:25 +02:00
Ondřej Hruška
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled 2017-09-23 23:38:24 +02:00
Ondřej Hruška
67f8277526 Add secondary toot button (opt-in) (#153) 
Add secondary toot button + other toot button enhancements. 
Squashing so it's easy to revert if needed.
 2017-09-23 23:11:02 +02:00
Ondřej Hruška
169d83f532 Remove "extra clickable spaces" made obsolete by status re-design 2017-09-23 00:33:35 +02:00
Ondřej Hruška
31dd261375 applied blackle's fix for gallery offset with full-width media 2017-09-22 21:47:14 +02:00
kibigo!
c2b479efec Long display names now ellipsis properly 2017-09-21 16:55:32 -07:00
kibigo!
a94dc21c79 Styling fixes for header redesign 2017-09-21 16:46:18 -07:00
David Yip
9512db920c Merge pull request #148 from glitch-soc/better-header 
Improvements to status headers and content
 2017-09-21 16:11:03 -05:00
Ondřej Hruška
c89cce0219 autoscroll emoji suggestions box 2017-09-21 15:31:24 +02:00
beatrix
fa3587645d Merge pull request #149 from glitch-soc/mojon-suggest 
Emoji and Hashtag autocomplete
 2017-09-20 23:02:23 -04:00
kibigo!
9ed51cecd0 Fixed notification appearance 2017-09-20 14:52:01 -07:00
Ondřej Hruška
514edd3c23 fulltext mojo suggestions 2017-09-20 22:13:09 +02:00
Ondřej Hruška
a3760b7729 TURBO shortcode search 2017-09-20 21:57:33 +02:00
Ondřej Hruška
cbf00168f1 add scrollbar to mojon suggestions list when too long 2017-09-20 21:53:08 +02:00
Ondřej Hruška
4f9a493d9d cache allShortcodes 2017-09-20 21:39:22 +02:00
Ondřej Hruška
8c0733a14e typo in comment 2017-09-20 21:28:44 +02:00
Ondřej Hruška
36a35be2ad Appease Travis 2017-09-20 20:34:11 +02:00
Ondřej Hruška
3783062450 Emoji and Hashtag autocomplete 2017-09-20 20:21:09 +02:00
kibigo!
15c9c2fd7e Pinned toots; embeds 2017-09-20 02:50:53 -07:00
kibigo!
227dbb6adb Added GIF hover-to-play support 2017-09-20 02:19:36 -07:00
kibigo!
769f62d96f Improvements to status headers 2017-09-20 01:57:08 -07:00
kibigo!
003bfd094e Fixed disabled boost SVG (#106) 2017-09-20 00:40:54 -07:00
kibigo!
fae8dce738 Fixed #133 (only parse links in status text) 2017-09-20 00:20:11 -07:00
unarist
4aea3f88a6 Hide sensitive image in default on the public pages (#5009) 
Additionally, this restores previous background / text color for media spoiler.
 2017-09-19 16:03:45 +02:00
Eugen Rochko
41e6c8b151 Fix incomplete account records being read (#4998) 
* Fix incomplete account records being read

- Put account processing into redis lock
- Do not save until record is complete

* Fix spaces
 2017-09-19 06:53:16 +02:00
Yamagishi Kazutoshi
1664e52cbb Fix custom emojis index (#5006) 2017-09-19 05:06:13 +02:00
Eugen Rochko
dce869dfc7 Define emoji context for ActivityPub (#5004) 
* Define emoji context for ActivityPub

* Fix the emojo

* Use general Mastodon context instead
 2017-09-19 05:05:48 +02:00
Eugen Rochko
09a94b575e Admin interface for listing, adding and removing custom emojis (#5002) 
* Admin interface for listing, adding and removing custom emojis

* Only display local ones in the list
 2017-09-19 03:52:38 +02:00
Eugen Rochko
81cec35dbf Custom emoji (#4988) 
* Custom emoji

- In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />`
- In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }`
- In REST API: Status object includes `emojis` array (`shortcode`, `url`)
- Domain blocks with reject media stop emojis
- Emoji file up to 50KB
- Web UI handles custom emojis
- Static pages render custom emojis as `<img />` tags

Side effects:

- Undo #4500 optimization, as I needed to modify it to restore
  shortcode handling in emojify()
- Formatter#plaintext should now make sure stripped out line-breaks
  and paragraphs are replaced with newlines

* Fix emoji at the start not being converted
 2017-09-19 02:42:40 +02:00
BruWalfas
c155d843f4 A few updates to the Spanish translation and some typos fixing (#4997) 
* So Spanish. Much changes. Wow.

* Some little fixes

* Updated es.yml, and fixed some ortographical errors

* Some little changes to simple_form.es.yml

* Yeah, so much translations

* Spanish e-mail messages

* Remove unused message
 2017-09-19 07:47:48 +09:00
Nolan Lawson
3d640dc8ac Add will-change to improve scrolling perf (#5001) 2017-09-18 23:29:15 +02:00
unarist
6db034a866 Re-allow underscore on valid_url_path_ending_chars (#4999) 
Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.
 2017-09-18 21:25:40 +02:00
unarist
17bf3363ac Add published property to ActivityPub activity for reblogs (#5000) 
Since reblogs are serialized as Announce activity, its published property can be used for the creation time of reblog.
 2017-09-18 20:30:11 +02:00
Yamagishi Kazutoshi
dcf1139ebd Do not add image size without meta to OGP (regression from #4901) (#4995) 2017-09-18 15:00:29 +02:00
Akihiko Odaki
9619b7f727 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) 
It is faster.
 2017-09-18 14:59:57 +02:00
Yamagishi Kazutoshi
9e0985d9e4 Add strip_insignificant_zeros: true option to number_to_human (#4993) 2017-09-18 04:55:23 +02:00
febrezo
cf14f4945a Some improvements in the Spanish translation (#4991) 2017-09-18 11:52:34 +09:00
Lynx Kotoura
4c14ff659b Oauth code in input form and add description message (#4986) 
* Oauth code in a input form and add description

* New authcode description
 2017-09-17 15:23:44 +02:00
unarist
dd6f9a1b82 Validate uri presence for remote status (#4985) 2017-09-17 15:21:57 +02:00
unarist
3f07f1b2b1 Raise an error on getting activity uri for remote status (#4984) 
We had returned `nil` for that case, but this raises an error instead, as a wrong usage of the method.
This method is currently only used in ActivitySerializer.
 2017-09-17 13:51:34 +02:00
abcang
44245926f1 Fix cancellation of scroll to the right (#4978) 2017-09-17 11:59:23 +02:00
unarist
1eab53ee10 Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979) 
* Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService

* Add specs
 2017-09-17 11:54:23 +02:00
BruWalfas
7be3131240 So Spanish. Much changes. Wow. (#4976) 2017-09-17 18:16:43 +09:00
Akihiko Odaki
198a9a4fa4 Remove local_only scope in Status (#4977) 2017-09-17 05:29:43 +02:00
unarist
ec36df97c4 Escape URL parts on formatting local status (#4975) 2017-09-16 21:33:52 +02:00
Mingye Wang
c8969dca35 Minor Chinese check & jsx addition (#4973) 
* zh-*: transition from "like" back to "fav"

This commit reverts the translation for the yellow-star "fav" button
back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is
deliberately used in zh-TW/HK by using the existing phrase "最爱"
(favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.),
"collect") in some instances.

Fixes #3511.

* zh-*: apply suggestions for PR #4557

* zh-cn: de-monetize ya account

In Chinese two separate characters, 账 and 帐, can be used to spell the
word for account (账/帐户). However, the one with a 贝 on the left is
evolved from the latter specifically for monetary purposes. Since
people usually can't figure out which one to use, it might be a good
idea to use the original not-so-money one.

* zh-*: complete jsx translation
 2017-09-16 18:48:38 +02:00
Surinna Curtis
b0487488a7 Re-center hidden media text vertical 2017-09-16 11:44:31 -05:00