about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-09-30Merge pull request #125 from glitch-soc/data-columnbeatrix
Add data-column="..." to all columns
2017-09-29add login form to landing page if regs are closedOndřej Hruška
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-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-28Remove web UI warnings about OStatus privacy (#5102)Eugen Rochko
* Remove web UI warnings about OStatus privacy * yarn run manage:translations
2017-09-27Fix empty query sent to postgres for custom emojis (#5121)Eugen Rochko
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-25Generate 500.html with assets:precompile, remove loading from Google Fonts ↵Eugen Rochko
(#5067)
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
2017-09-24Compact status_ids in StatusRelationshipsPresenter (#5073)Daigo 3 Dango
2017-09-24Fix media spoiler of DetailedStatus (#5071)abcang
2017-09-24Suppress backtrace when failed to communicate with a remote instance (#5076)Daigo 3 Dango
2017-09-24In detail status view, display attachment uncropped if there's only one (#5054)Eugen Rochko
* In detail status view, display attachment uncropped if there's only one * Make media spoiler the size of the media it hides, enable on static
2017-09-24Make sure nil IDs to not get cast to empty string in REST API (#5068)Eugen Rochko
2017-09-24Change mobile layout breakpoint from 1024px to 630px (#5063)Eugen Rochko
630px = Drawer + 1 Column
2017-09-24Dropdown triangles a bit nicer, smoother scrolling on touch (#5062)Eugen Rochko
2017-09-24Fix media gallery CSS (#5064)Eugen Rochko
2017-09-24Require at least 2 characters before showing autosuggestions (#5065)Eugen Rochko
2017-09-23Fix intl warning with disabled secondary toot btnOndřej Hruška
- Moved building the secondary btn text into the if to avoid trying to translate 'none' visibility
2017-09-23Make secondary toot button work nicer with file attachments & revert to the ↵Ondřej Hruška
original behavior if it's disabled
2017-09-23Add secondary toot button (opt-in) (#153)Ondřej Hruška
Add secondary toot button + other toot button enhancements. Squashing so it's easy to revert if needed.
2017-09-23jsx/zh-*: Fix "pin column" for Chinese (#5060)Mingye Wang
2017-09-23i18n: Update Polish translation (#5058)m4sk1n
2017-09-23Fix overflowing tabs in account__action-bar (#5056)Lynx Kotoura
* Fix numbers in accounts columns * Support edge compact-header
2017-09-23Add emoji autosuggest (#5053)Eugen Rochko
* Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once
2017-09-23Add custom emojis to the emoji picker (#5052)Eugen Rochko
2017-09-23New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)Eugen Rochko
2017-09-23Fix custom emojis not detected when used in content warning (#5049)Eugen Rochko
2017-09-23Switch from EmojiOne to Twemoji, different emoji picker (#5046)Eugen Rochko
* Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations
2017-09-23Remove "extra clickable spaces" made obsolete by status re-designOndřej Hruška
2017-09-22applied blackle's fix for gallery offset with full-width mediaOndřej Hruška