about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-12Importing vanillin from upstream ;) ;)kibigo!
2017-07-12Moved glitch files to their own location ;)kibigo!
2017-07-12Improve UI of admin site settings (#4163)Eugen Rochko
2017-07-11First lame pass at adding optional git commit hash display on /about/… (#67)DJ Sundog
* First lame pass at adding optional git commit hash display on /about/more page. Currently, this is implemented by checking for the existence of a file called CURRENT_RELEASE in the home directory of the user running Mastodon. If the file exists, its contents are added. I've modified my update process to include the following before precompiling assets: git log -1 | head -n 1 | cut -d " " -f2 > ~/CURRENT_RELEASE That puts the current commit hash into the file ~/CURRENT_RELEASE, but you figured that out because you're a smart cookie. As I am quite sure this is a horrible methodology for implementing this, I look forward to any improvements you have to offer! * Updated to handle instances that share a user - the CURRENT_RELEASE file now lives in the instance's base directory. This also requires modifying the update hook to `git log -1 | head -n 1 | cut -d " " -f2 > CURRENT_RELEASE`
2017-07-12Fix #4067 - Do not make HTTP round-trip when resolving local URL (#4160)Eugen Rochko
2017-07-11Fixed #66 disabling collapse collapses all tootsOndřej Hruška
2017-07-11Fix media modal prev button behavior. (#4158)Naoki Kosaka
2017-07-11Revert "Wrap methods of ProcessFeedService::ProcessEntry in classes (#4151)" ↵nightpool
(#4157) This reverts commit 425acecfdb15093a265b191120fb2d4e4c4135c4.
2017-07-11Fix extra clickable spaces for narrow screenOndřej Hruška
2017-07-11Fix #2848 - Rake task to redownload avatars/headers (#4156)Eugen Rochko
Can be filtered by a specific domain Resolves #2292
2017-07-11Fix #3462 - Require authentication for search API (#4155)Eugen Rochko
This makes it consistent with /api/v1/accounts/search and previous behaviour has been an oversight.
2017-07-11Redesign the landing page, mount public timeline on it (#4122)Eugen Rochko
* Redesign the landing page, mount public timeline on it * Adjust the standalone mounted component to the lacking of router * Adjust auth layout pages to new design * Fix tests * Standalone public timeline polling every 5 seconds * Remove now obsolete translations * Add responsive design for new landing page * Address reviews * Add floating clouds behind frontpage form * Use access token from public page when available * Fix mentions and hashtags links, cursor on status content in standalone mode * Add footer link to source code * Fix errors on pages that don't embed the component, use classnames * Fix tests * Change anonymous autoPlayGif default to false * When gif autoplay is disabled, hover to play * Add option to hide the timeline preview * Slightly improve alt layout * Add elephant friend to new frontpage * Display "back to mastodon" in place of "login" when logged in on frontpage * Change polling time to 3s
2017-07-11Require stylesheets in common.js (#4152)Akihiko Odaki (@fn_aki@pawoo.net)
Require stylesheets in common.js because stylesheets are shared by the entry points.
2017-07-11Drawer tab according to column (#4135)Yamagishi Kazutoshi
* Add notifications link to drawer * Remove local and public timeline tab in drawer * Add home
2017-07-11Wrap methods of ProcessFeedService::ProcessEntry in classes (#4151)Akihiko Odaki (@fn_aki@pawoo.net)
ProcessFeedService::ProcessEntry had many methods, so wrap them in classes representing activities.
2017-07-11Remove redundant inclusion (#4150)Akihiko Odaki (@fn_aki@pawoo.net)
2017-07-11refactor: Rewrite immutablejs import statements using destructuring (#4147)Sorin Davidoi
2017-07-11Fix PrecomputeFeedService for filtered statuses (#4148)Akihiko Odaki (@fn_aki@pawoo.net)
2017-07-10Remote following success page (#4129)STJrInuyasha
* Added a success page to remote following Includes follow-through links to web (the old redirect target) and back to the remote user's profile * Use Account.new in spec instead of a fake with only id (fixes spec) * Fabricate(:account) over Account.new * Remove self from the success text (and all HTML with it)
2017-07-10Limit total subscribe retries to 10, but space them out more (#4142)Eugen Rochko
Since there is little point in retrying so often when a service is down or does not exist anymore. Subscriptions are renewed 1 day before they should expire, so retrying in 30 minutes, then 2 hours, then 12 hours is fine. If even after that, the remote server does not work, there is little sense in retrying more often than once a day Also, uniqueness of the job should ensure that failed retries will not result in multiple retries for the same endpoint when the next resubscription cycle comes
2017-07-10i18n: @63baab0 (pl) (#4141)m4sk1n
2017-07-10Add Japanese translations (#4140)Yamagishi Kazutoshi
* Add Japanese translations for #3879 * Add Japanese translations for #4033 * Add Japanese translations for #4136
2017-07-10Toot context menu is now centeredOndřej Hruška
2017-07-10Added extra clickable area in status gutterOndřej Hruška
2017-07-10Add Japanese translation of terms and flash (#4137)のら
2017-07-10Fix regular expression for RFC 5646 (regression from #3604) (#4133)Yamagishi Kazutoshi
2017-07-10Add setting a always mark media as sensitive (#4136)Yamagishi Kazutoshi
2017-07-10Rescue exceptions related to Goldfinger at FetchRemoteStatusService (#4138)abcang
2017-07-10Make avatar in compose navbar hover-to-playOndřej Hruška
2017-07-10Fix duplication of tag in columns_area.js (#4131)Lynx Kotoura
Deleted ">" just a typo.
2017-07-10Add attribute for default privacy to verify credentials (#4075)Yamagishi Kazutoshi
* Add attribute for default privacy to verify credentials * add raw_note * source
2017-07-09fix(components/media_modal): Aspect ratio (#4128)Sorin Davidoi
* fix(components/media_modal): Aspect ratio * fix: Remove useless style
2017-07-09Rescue exceptions related to Goldfinger (#4044)abcang
* Rescue exceptions related to Goldfinger * Exclude Goldfinger::SSLError
2017-07-09Swipeable views (#4105)Sorin Davidoi
* feat: Replace react-swipeable with react-swipeable-views * fix: iOS 9
2017-07-09Avoid async import if the component is previously loaded (#4127)unarist
2017-07-09Small indent fix in components.scssOndřej Hruška
2017-07-09Avatar in the detail column no longer autoplaysOndřej Hruška
2017-07-09Fix initial loading of pinned Notifications column (#4126)unarist
2017-07-09refactor: Make all reducers sync (#4125)Sorin Davidoi
2017-07-09Fix fullwidth media CSS bugs with NSFW video, and bad spoiler margin on ↵Ondřej Hruška
static pages (#60) * Fix fullwidth style not applied to NSFW video correctly * Fix botched video .media-spoiler margin on static pages
2017-07-08Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)nullkal
* Specs for language detection * Use CharlockHolmes instead of NKF * Correct mistakes * Correct style * Set hint_enc instead of falling back and strip_tags * Improve specs * Add dependencies
2017-07-08Change account link to admin account link on report page (#4119)abcang
2017-07-08fix: Rerender Bundle on route change (#4120)Sorin Davidoi
2017-07-08Fix first loading of notifications when the column is pinned (#4114)unarist
2017-07-08Don't use preview when image size is unknown (#4113)Yamagishi Kazutoshi
2017-07-08Use srcSet only when know width (#4112)Yamagishi Kazutoshi
2017-07-08Update and improvement Dutch language strings (#4117)Jeroen
* Update * Update
2017-07-08Replace OEmbed and initial state Rabl templates with serializers (#4110)Eugen Rochko
* Replace OEmbed Rabl template with serializer * Replace initial state rabl with serializer
2017-07-08Fix JSON serialization of media_attachment (#4111)unarist