about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-10-07raise Mastodon::ValidationError if audio file duration is over 60 secsDJ Sundog
2017-10-07update indentationDJ Sundog
2017-10-07update indentationDJ Sundog
2017-10-07add faststart to audio transcodingDJ Sundog
2017-10-07adding support for audio uploads, transcoded to mp4 videosDJ Sundog
2017-10-06Merge pull request #160 from glitch-soc/ugly-fix-notif-clearingOndřej Hruška
workaround for notif clearing
2017-10-06comment out unused stuff with VideoOndřej Hruška
2017-10-06fix haml quotes in a bid to make travis less grumpyOndřej Hruška
2017-10-05workaround for notif clearingOndřej Hruška
2017-09-30Merge pull request #125 from glitch-soc/data-columnbeatrix
Add data-column="..." to all columns
2017-09-30Merge pull request #159 from glitch-soc/closed-instance-landing-page-login-formbeatrix
add login form to landing page if regs are closed
2017-09-29add login form to landing page if regs are closedOndřej Hruška
2017-09-28Merge pull request #157 from glitch-soc/merging-upstreambeatrix
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
2017-09-28HAML fixkibigo!
2017-09-28Fixed lingering upstream Theme codekibigo!
2017-09-28new HAML for statuseskibigo!
2017-09-28unbreak onboarding modalOndřej Hruška
2017-09-28remove wrong emojify usage in old glitch componentsOndřej Hruška
2017-09-28fix custom emoji not shown in statusesOndřej Hruška
2017-09-28fix some js errors due to number->string change of status IDOndřej Hruška
2017-09-28Merge remote-tracking branch 'origin/better-themeing' into merging-upstreamOndřej Hruška
2017-09-28Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstreamOndřej Hruška
2017-09-28Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into ↵Ondřej Hruška
merging-upstream
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-28Revert "autoscroll emoji suggestions box"Ondřej Hruška
This reverts commit c89cce0219646502b4d338213d112a528373bdc4.
2017-09-28Revert "Merge pull request #149 from glitch-soc/mojon-suggest"Ondřej Hruška
This reverts commit fa3587645da228e93767b245eeadbd668bc6cd38, reversing changes made to 15c9c2fd7e5603d48b5eeb966963138b454cfe2a.
2017-09-28Update Yarn to version 1.1.0 (#5125)Yamagishi Kazutoshi
* Update Yarn to version 1.1.0 * remove hard-coding
2017-09-28Remove web UI warnings about OStatus privacy (#5102)Eugen Rochko
* Remove web UI warnings about OStatus privacy * yarn run manage:translations
2017-09-27When OAuth password verification fails, return 401 instead of redirect (#5111)Eugen Rochko
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-27Upgrade Webpacker to version 3.0.1 (#5122)Yamagishi Kazutoshi
2017-09-27Fix empty query sent to postgres for custom emojis (#5121)Eugen Rochko
2017-09-27Update brakeman to 3.0 and bundler-audit to 0.6 (#5117)Eugen Rochko
2017-09-26Refactor 500 file generation for future extension (#5105)nullkal
2017-09-26i18n: Update Polish translation (#5106)m4sk1n
* i18n: Update Polish translation * i18n: Update Polish translation
2017-09-25Fixed webpack config codekibigo!
2017-09-25Better themeing support!!kibigo!
2017-09-26Follow-up to #4582 and #5027, removing dead code (#5101)Eugen Rochko
2017-09-26Fix #5059 - Stop processing payload if it's from local account (#5100)Eugen Rochko
2017-09-26Send streaming API delete to people mentioned in status (#5103)Eugen Rochko
- 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-25New error page graphic. Other error page improvements (#5099)Eugen Rochko
- 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-25Fix size of single media in media-gallery (#5098)Lynx Kotoura
2017-09-25Fix emojify() by generating a mapping to existing Twemoji files (#5080)Eugen Rochko
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-25Add missing validations in ActivityPub::Activity::Create (#5096)Akihiko Odaki
2017-09-25Increase max height of preview card image (#5092)unarist
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-25Refresh manifest before generate 500.html (#5090)Yamagishi Kazutoshi
2017-09-25Generate 500.html with assets:precompile, remove loading from Google Fonts ↵Eugen Rochko
(#5067)
2017-09-25Add strong_migrations gem to warn when creating unsafe migrations (#5078)Eugen Rochko
2017-09-24Fix streaming API double-JSON-encoding status IDs for deletes (#5069)Eugen Rochko
2017-09-24OC update: different emoji picker (#5046) (#5077)JeanGauthier
2017-09-24Thread toot notification mails by conversation (#5061)ThibG
* Thread toot notification mails by conversation * Make codeclimate happy and avoid potential mis-threading