me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
4403 commits 2 branches 0 tags 429 MiB
Commit graph

4403 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ondřej Hruška
2ae4f48a48 Skip-merge commit 'b4842ef0b90be08414b57ac9f1cfae87f631ed58' into merging-upstream 2017-09-28 09:12:47 +02:00
Ondřej Hruška
914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream 2017-09-28 09:12:17 +02:00
Ondřej Hruška
ca2fd3c8a2 Revert "autoscroll emoji suggestions box" 
This reverts commit 640740eeac.
 2017-09-28 08:56:32 +02:00
Ondřej Hruška
3398d0e84c Revert "Merge pull request #149 from glitch-soc/mojon-suggest" 
This reverts commit b14d2a5ae6, reversing
changes made to 41832d083e.
 2017-09-28 08:55:53 +02:00
Ondřej Hruška
b8019a2a46 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
3b79104d29 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
b65e03fd0f 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
ba7fbb92a7 Remove "extra clickable spaces" made obsolete by status re-design 2017-09-23 00:33:35 +02:00
Ondřej Hruška
1325ec8b1d applied blackle's fix for gallery offset with full-width media 2017-09-22 21:47:14 +02:00
kibigo!
123d22f3b8 Long display names now ellipsis properly 2017-09-21 16:55:32 -07:00
kibigo!
e1fc279dfd Styling fixes for header redesign 2017-09-21 16:46:18 -07:00
David Yip
93bd063524 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
640740eeac autoscroll emoji suggestions box 2017-09-21 15:31:24 +02:00
beatrix
b14d2a5ae6 Merge pull request #149 from glitch-soc/mojon-suggest 
Emoji and Hashtag autocomplete
 2017-09-20 23:02:23 -04:00
kibigo!
47bc505c25 Fixed notification appearance 2017-09-20 14:52:01 -07:00
Ondřej Hruška
18ebb961d8 fulltext mojo suggestions 2017-09-20 22:13:09 +02:00
Ondřej Hruška
d1a08a01ad TURBO shortcode search 2017-09-20 21:57:33 +02:00
Ondřej Hruška
0ddaea5d9d add scrollbar to mojon suggestions list when too long 2017-09-20 21:53:08 +02:00
Ondřej Hruška
827277a8cc cache allShortcodes 2017-09-20 21:39:22 +02:00
Ondřej Hruška
82dc98f91c typo in comment 2017-09-20 21:28:44 +02:00
Ondřej Hruška
65673e9a91 Appease Travis 2017-09-20 20:34:11 +02:00
Ondřej Hruška
4ac158f1d3 Emoji and Hashtag autocomplete 2017-09-20 20:21:09 +02:00
kibigo!
41832d083e Pinned toots; embeds 2017-09-20 02:50:53 -07:00
kibigo!
c3476ca860 Added GIF hover-to-play support 2017-09-20 02:19:36 -07:00
kibigo!
76fda20779 Improvements to status headers 2017-09-20 01:57:08 -07:00
kibigo!
7321cea33e Fixed disabled boost SVG (#106) 2017-09-20 00:40:54 -07:00
kibigo!
8081572714 Fixed #133 (only parse links in status text) 2017-09-20 00:20:11 -07:00
Andrew
b4842ef0b9 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
 2017-09-19 16:36:23 +02:00
unarist
57c5493d4e 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
48377dfe46 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
Akihiko Odaki
637e4587e7 Remove ubuntu-toolchain-r-test (#5005) 2017-09-19 05:06:27 +02:00
Yamagishi Kazutoshi
3dde6679c2 Fix custom emojis index (#5006) 2017-09-19 05:06:13 +02:00
Eugen Rochko
ef6defa2c4 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
e9bb7e62b1 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
327d21b8a4 Run i18n-tasks normalize (#5003) 2017-09-19 03:27:08 +02:00
Eugen Rochko
eb345f8e8b 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
f4d0774877 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
6c31ded9f7 Add will-change to improve scrolling perf (#5001) 2017-09-18 23:29:15 +02:00
unarist
938a99c89d 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
f4b3642767 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
a3d75ce672 Do not add image size without meta to OGP (regression from #4901) (#4995) 2017-09-18 15:00:29 +02:00
Akihiko Odaki
f4e3449e61 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) 
It is faster.
 2017-09-18 14:59:57 +02:00
Daigo 3 Dango
0de28e70e8 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
 2017-09-18 04:55:57 +02:00
Yamagishi Kazutoshi
313d90b8f4 Add strip_insignificant_zeros: true option to number_to_human (#4993) 2017-09-18 04:55:23 +02:00
febrezo
6e94d02de6 Some improvements in the Spanish translation (#4991) 2017-09-18 11:52:34 +09:00
Lynx Kotoura
8585421eb1 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
3978894d05 Validate uri presence for remote status (#4985) 2017-09-17 15:21:57 +02:00
unarist
73fdfcb262 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
5d0e6410c4 Fix cancellation of scroll to the right (#4978) 2017-09-17 11:59:23 +02:00
Patrick Figel
dde43a9e32 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.
 2017-09-17 11:58:20 +02:00