treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
4,493 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

4493 Commits (c7cae1bf0f38b60a58ba672e9a956189b6199230)

Author SHA1 Message Date
DJ Sundog c7cae1bf0f add faststart to audio transcoding 2017-10-07 19:59:22 +00:00
DJ Sundog c3e5510289 adding support for audio uploads, transcoded to mp4 videos 2017-10-07 19:54:10 +00:00
Ondřej Hruška 7f8f0e3890 Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing 
workaround for notif clearing
 2017-10-06 09:34:12 +02:00
Ondřej Hruška 4bc0a9d1e9 comment out unused stuff with Video 2017-10-06 09:23:28 +02:00
Ondřej Hruška 851d5c03e2 fix haml quotes in a bid to make travis less grumpy 2017-10-06 09:07:04 +02:00
Ondřej Hruška 37f69bb4db workaround for notif clearing 2017-10-05 21:55:02 +02:00
beatrix 2955141d2e Merge pull request #125 from glitch-soc/data-column 
Add data-column="..." to all columns
 2017-09-30 15:02:21 -04:00
beatrix cd46df6671 Merge pull request #159 from glitch-soc/closed-instance-landing-page-login-form 
add login form to landing page if regs are closed
 2017-09-30 15:01:32 -04:00
Ondřej Hruška 18988b89cf add login form to landing page if regs are closed 2017-09-29 16:41:18 +02:00
beatrix 075db77f04 Merge pull request #157 from glitch-soc/merging-upstream 
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
 2017-09-28 21:48:28 -04:00
kibigo! 9bee4d313a HAML fix 2017-09-28 18:16:04 -07:00
kibigo! 62fbd4d247 Fixed lingering upstream Theme code 2017-09-28 17:45:16 -07:00
kibigo! 9feca5cabf new HAML for statuses 2017-09-28 17:18:12 -07:00
Ondřej Hruška 7c8bd52431 unbreak onboarding modal 2017-09-28 11:13:37 +02:00
Ondřej Hruška 34a29615fa remove wrong emojify usage in old glitch components 2017-09-28 11:03:23 +02:00
Ondřej Hruška b769f9c0df fix custom emoji not shown in statuses 2017-09-28 10:13:16 +02:00
Ondřej Hruška 3e3073081d fix some js errors due to number->string change of status ID 2017-09-28 10:04:20 +02:00
Ondřej Hruška 282a126b3f Merge remote-tracking branch 'origin/better-themeing' into merging-upstream 2017-09-28 09:20:59 +02:00
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream 2017-09-28 09:18:35 +02:00
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
Yamagishi Kazutoshi 9ab3021562 Update Yarn to version 1.1.0 (#5125) 
* Update Yarn to version 1.1.0

* remove hard-coding
 2017-09-28 04:51:36 +02:00
Eugen Rochko a2a189819e Remove web UI warnings about OStatus privacy (#5102) 
* Remove web UI warnings about OStatus privacy

* yarn run manage:translations
 2017-09-28 00:26:33 +02:00
Eugen Rochko 7031e350b3 When OAuth password verification fails, return 401 instead of redirect (#5111) 
Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.
 2017-09-27 23:42:49 +02:00
Yamagishi Kazutoshi 12b7306a03 Upgrade Webpacker to version 3.0.1 (#5122) 2017-09-27 14:41:54 +02:00
Eugen Rochko e8871341bf Fix empty query sent to postgres for custom emojis (#5121) 2017-09-27 04:14:03 +02:00
Eugen Rochko a90aac6953 Update brakeman to 3.0 and bundler-audit to 0.6 (#5117) 2017-09-27 03:13:09 +02:00
nullkal 463bbe870f Refactor 500 file generation for future extension (#5105) 2017-09-26 11:55:33 +02:00
m4sk1n 7291f1de08 i18n: Update Polish translation (#5106) 
* i18n: Update Polish translation

* i18n: Update Polish translation
 2017-09-26 14:19:25 +09:00
kibigo! cae9e7ab76 Fixed webpack config code 2017-09-25 19:35:54 -07:00
kibigo! aac16a82d6 Better themeing support!! 2017-09-25 19:24:32 -07:00
Eugen Rochko 10a2b3dd4c Follow-up to #4582 and #5027, removing dead code (#5101) 2017-09-26 01:06:27 +02:00
Eugen Rochko 1efe904a28 Fix #5059 - Stop processing payload if it's from local account (#5100) 2017-09-26 01:06:13 +02:00
Eugen Rochko 25d6a51276 Send streaming API delete to people mentioned in status (#5103) 
- Previously they wouldn't receive it unless they were author's
  followers
- Skip unpush from public/hashtag timelines if status wasn't
  public in the first place
 2017-09-26 00:29:29 +02:00
Eugen Rochko 1767f9817c New error page graphic. Other error page improvements (#5099) 
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>)
- 500 content appended with "on our end" to make clear it's
  not user's fault
 2017-09-25 23:05:54 +02:00
Lynx Kotoura cad208ba43 Fix size of single media in media-gallery (#5098) 2017-09-25 20:26:50 +02:00
Eugen Rochko 8b7c639bbe Fix emojify() by generating a mapping to existing Twemoji files (#5080) 
A new rake task emojis:generate downloads a full list of valid
unicode sequences from unicode.org and checks it against existing
Twemoji files, finally generating a map from each sequence to the
existing file (e.g. when there's multiple ways an emoji can be
expressed). The map is dumped into app/javascript/mastodon/emoji_map.json

That file is loaded by emojione_light.js (now a misnomer) which
decorates it further with shortcodes taken from emoji-mart's index.
 2017-09-25 18:36:33 +02:00
Akihiko Odaki 77424c156d Add missing validations in ActivityPub::Activity::Create (#5096) 2017-09-25 18:33:11 +02:00
unarist df27f599d2 Increase max height of preview card image (#5092) 
We added horizontal layout to preview card for wide image. However, max height of the thumbnail is still limited to 120px and it makes nearly square images to too small for that layout.

This PR increases max height as well as max width.
 2017-09-25 17:10:49 +02:00
Yamagishi Kazutoshi 5391b6d44d Refresh manifest before generate 500.html (#5090) 2017-09-25 16:58:12 +02:00
Eugen Rochko 6b0ea1e79c Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067) 2017-09-25 04:04:04 +02:00
Eugen Rochko 65827bd2b4 Add strong_migrations gem to warn when creating unsafe migrations (#5078) 2017-09-25 02:11:14 +02:00
Eugen Rochko 6d12bcb225 Fix streaming API double-JSON-encoding status IDs for deletes (#5069) 2017-09-24 15:31:03 +02:00
JeanGauthier 91fa75997a OC update: different emoji picker (#5046) (#5077) 2017-09-24 12:17:47 +02:00
ThibG 2338b5954c Thread toot notification mails by conversation (#5061) 
* Thread toot notification mails by conversation

* Make codeclimate happy and avoid potential mis-threading
 2017-09-24 11:19:42 +02:00
Daigo 3 Dango 7e6322863c Compact status_ids in StatusRelationshipsPresenter (#5073) 2017-09-24 11:18:32 +02:00
abcang 9cdd517849 Fix media spoiler of DetailedStatus (#5071) 2017-09-24 11:15:11 +02:00
Daigo 3 Dango e7624bfaae Suppress backtrace when failed to communicate with a remote instance (#5076) 2017-09-24 11:14:06 +02:00