fcf0d2078e
Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into merging-upstream
7 years ago
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
06e299cef5
Revert "autoscroll emoji suggestions box"
...
This reverts commit c89cce0219
7 years ago
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
7 years ago
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
7 years ago
1924a71b5a
Make secondary toot button work nicer with file attachments & revert to the original behavior if it's disabled
7 years ago
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.
7 years ago
169d83f532
Remove "extra clickable spaces" made obsolete by status re-design
7 years ago
31dd261375
applied blackle's fix for gallery offset with full-width media
7 years ago
c2b479efec
Long display names now ellipsis properly
7 years ago
a94dc21c79
Styling fixes for header redesign
7 years ago
9512db920c
Merge pull request #148 from glitch-soc/better-header
...
Improvements to status headers and content
7 years ago
c89cce0219
autoscroll emoji suggestions box
7 years ago
fa3587645d
Merge pull request #149 from glitch-soc/mojon-suggest
...
Emoji and Hashtag autocomplete
7 years ago
9ed51cecd0
Fixed notification appearance
7 years ago
514edd3c23
fulltext mojo suggestions
7 years ago
a3760b7729
TURBO shortcode search
7 years ago
cbf00168f1
add scrollbar to mojon suggestions list when too long
7 years ago
4f9a493d9d
cache allShortcodes
7 years ago
8c0733a14e
typo in comment
7 years ago
36a35be2ad
Appease Travis
7 years ago
3783062450
Emoji and Hashtag autocomplete
7 years ago
15c9c2fd7e
Pinned toots; embeds
7 years ago
227dbb6adb
Added GIF hover-to-play support
7 years ago
769f62d96f
Improvements to status headers
7 years ago
003bfd094e
Fixed disabled boost SVG ( #106 )
7 years ago
fae8dce738
Fixed #133 (only parse links in status text)
7 years ago
0401a24558
Add support for multiple themes ( #4959 )
...
* Add support for selecting a theme
* Fix codeclimate issues
* Look up site default style if current user is not available due to e.g. not being logged in
* Remove outdated comment in common.js
* Address requested changes in themes PR
* Fix codeclimate issues
* Explicitly check current_account in application controller and only check theme availability if non-nil
* codeclimate
* explicit precedence with &&
* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml
* codeclimate: indentation + return
7 years ago
4aea3f88a6
Hide sensitive image in default on the public pages ( #5009 )
...
Additionally, this restores previous background / text color for media spoiler.
7 years ago
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
7 years ago
813e650729
Remove ubuntu-toolchain-r-test ( #5005 )
7 years ago
1664e52cbb
Fix custom emojis index ( #5006 )
7 years ago
dce869dfc7
Define emoji context for ActivityPub ( #5004 )
...
* Define emoji context for ActivityPub
* Fix the emojo
* Use general Mastodon context instead
7 years ago
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
7 years ago
d43944143a
Run i18n-tasks normalize ( #5003 )
7 years ago
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
7 years ago
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
7 years ago
3d640dc8ac
Add will-change to improve scrolling perf ( #5001 )
7 years ago
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 .
7 years ago
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.
7 years ago
dcf1139ebd
Do not add image size without meta to OGP (regression from #4901 ) ( #4995 )
7 years ago
9619b7f727
Use Account.local.sum(statuses_count) instead of Status.local.count ( #4996 )
...
It is faster.
7 years ago
66be6475b6
Bump ruby version to 2.4.2 ( #4958 )
...
* Bump ruby version to 2.4.2
https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/
Gemfile.lock is also updated.
TODO
- [ ] Update Dockerfile with Alpine release of ruby-2.4.2
* Revert jwt version
It seems that jwt 2.0.0 fails in some environment.
ref. https://github.com/zaru/webpush/issues/42
* Bump Ruby version on docker image
7 years ago
9e0985d9e4
Add `strip_insignificant_zeros: true` option to `number_to_human` ( #4993 )
7 years ago
cf14f4945a
Some improvements in the Spanish translation ( #4991 )
7 years ago
4c14ff659b
Oauth code in input form and add description message ( #4986 )
...
* Oauth code in a input form and add description
* New authcode description
7 years ago
dd6f9a1b82
Validate uri presence for remote status ( #4985 )
7 years ago
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.
7 years ago
44245926f1
Fix cancellation of scroll to the right ( #4978 )
7 years ago
8811778b55
Randomize sidekiq-scheduler cron schedule ( #4980 )
...
SubscriptionsScheduler in particular causes high load across the
entire fediverse at 5 AM UTC every day. Randomizing cron schedules
and/or adding a random delay is considered best practice to avoid
this issue.
7 years ago
Ondřej Hruška