17ae7d132cPrevent potential issue with public/hashtag statuses arriving after they have been loaded and favourited/reblogged from another source
Eugen Rochko
2017-02-02 00:45:57 +01:00
ede04cdb24Move rendering of JSON payloads for public/hashtag timelines to FanOutOnWriteService. The only recipient-specific part on them is reblogged/favourited. But since only newly created statuses appear on them, it is safe to assume that both attributes would be false
Eugen Rochko
2017-02-02 00:39:17 +01:00
d9ca46b464Cleaning up format of broadcast real-time messages, removing redis-backed "mentions" timeline as redundant (given notifications)
Eugen Rochko
2017-02-02 00:03:31 +01:00
1da0ce5c7cLooks like log level :debug is required for activerecord times to be tracked
Eugen Rochko
2017-02-01 12:13:16 +01:00
65402d9c09Fix activerecord logging in production
Eugen Rochko
2017-02-01 11:34:50 +01:00
bf60f2898dFix#529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
Eugen Rochko
2017-01-31 22:34:33 +01:00
8ef79d8dc9Revert to animating avatars by default
Eugen Rochko
2017-01-31 19:16:35 +01:00
8b9c537d5aFix elephant friend
Eugen Rochko
2017-01-31 19:08:24 +01:00
52d68be157Fix CORS issue on avatars resampling
Eugen Rochko
2017-01-31 19:05:26 +01:00
b84d1533d4Fix text overlapping image in Edge and on mobile (#582)
tom
2017-01-31 13:06:03 -05:00
c2fbd144cfAdd "open in web" link to detailed public status pages
Eugen Rochko
2017-01-30 23:01:37 +01:00
86b3cb5120Fix not reloading account/fetching relationship on newly independent components
Eugen Rochko
2017-01-30 22:35:36 +01:00
f21e7d6ac0Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer nested inside a common parent (<Account>), instead they all embed <HeaderContainer />
Eugen Rochko
2017-01-30 21:40:55 +01:00
a2a85e8549Add capistrano to development environment
Eugen Rochko
2017-01-30 20:03:17 +01:00
404d2050d3Add explicit "load more" link to the bottom of StatusList and notifications
Eugen Rochko
2017-01-30 18:04:15 +01:00
02cd2e42b2Improve avatar resampling of non-animated canvas
Eugen Rochko
2017-01-30 15:43:48 +01:00
57159804b8Merge branch 'PurpleBooth-add-missing-back-on-follow'
Eugen Rochko
2017-01-30 15:22:31 +01:00
9bde804ba2Resolve confusion between ColumnBackButton and the slim version that the public timeline has been using
Eugen Rochko
2017-01-30 15:22:04 +01:00
Add missing back button to "Follow Requests"
Billie Thompson
2017-01-28 23:49:42 +00:00
b12bdd2aeaAdd 2-FA instructions for non-technical users (#580)
James
2017-01-29 10:26:27 -08:00
2165a0ec63Update some API docs
Eugen
2017-01-29 14:40:57 +01:00
a30e669df2Fix avatar scaling on high-DPI displays (#573)
Misty De Meo
2017-01-29 05:26:50 -08:00
ff90a5ff84Update sample .env
Eugen Rochko
2017-01-29 13:06:58 +01:00
aa52d5fd1eAdd more links to main docs page
Eugen Rochko
2017-01-29 12:59:02 +01:00
ca8a9d5941Fix JSON formatting in docs
Eugen Rochko
2017-01-29 12:55:12 +01:00
fe9306f346Update docs with information about push notifications
Eugen Rochko
2017-01-29 12:53:50 +01:00
e70e721a0dAdd tests for new API
Eugen Rochko
2017-01-29 12:35:55 +01:00
83ccdeb87aFix tests
Eugen Rochko
2017-01-29 12:25:10 +01:00
3f075c7794API for apps to register for push notifications
Eugen Rochko
2017-01-29 01:30:32 +01:00
1992575d57Fix#569 - seeds.rb
Eugen Rochko
2017-01-29 00:12:27 +01:00
9b2c728251Fix settings design on mobile
Eugen Rochko
2017-01-28 21:57:03 +01:00
23b997ae55Split 2FA login into two prompts
Eugen Rochko
2017-01-28 20:43:38 +01:00
36c57ef8afAdd pixel background to modal images
Eugen Rochko
2017-01-28 04:04:09 +01:00
f4bc9620a9Update settings to re-use admin layout, one big navigation tree, improve settings forms
Eugen Rochko
2017-01-28 03:56:10 +01:00
04bce0cdf2Clean up
Eugen Rochko
2017-01-27 20:38:35 +01:00
76e970c856Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled) Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit
Eugen Rochko
2017-01-27 20:34:22 +01:00
ba192f12e3Added optional two-factor authentication
Eugen Rochko
2017-01-27 20:28:46 +01:00
2a6773d59bMerge pull request #557 from hoodiek/master
Eugen
2017-01-27 18:41:05 +01:00
6c37285580fix button outline showing on clicks for prettiness
hoodie
2017-01-27 12:39:36 -05:00
dc3e0529caUpdate broken links, add new sponsor
Eugen Rochko
2017-01-27 17:01:21 +01:00
450ad43180Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB, fix ProcessFeedService pushing status into distribution if called a second time while the first is still running (i.e. when a PuSH comes after a Salmon slap), fix not running escape on spoiler text before emojify
Eugen Rochko
2017-01-27 16:55:06 +01:00
9f57c7d4a6Updated translation doc to get working links
nicolas
2017-01-27 13:17:33 +01:00
f8bd44a747Fix font weight
Eugen Rochko
2017-01-26 23:34:40 +01:00
87667e371cMerge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
Eugen
2017-01-26 23:03:41 +01:00
f7aef16668Merge pull request #548 from PurpleBooth/make-fonts-local
Eugen
2017-01-26 23:02:48 +01:00
cc5c1e5febRemoved accidental n+1 query from notifications, updated some deps, improved how "show more" link looks
Eugen Rochko
2017-01-26 14:52:07 +01:00
2f18c77e44Merge pull request #526 from wchristian/oauth_docs
Eugen
2017-01-26 12:23:47 +01:00
446d6f1643Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments
Eugen
2017-01-26 12:22:32 +01:00
c3a3ce8172Merge pull request #541 from TrevInc/master
Eugen
2017-01-26 11:07:42 +01:00
589837cfc7Removed line break before spoiler link, changed color of bg for spoiler link
Anthony Bellew
2017-01-26 03:07:02 -07:00
ebe5095665Add Padding to inline styles for spoiler
Anthony Bellew
2017-01-26 03:03:26 -07:00
8f18c8f9adAdded inline spoiler button styles
Anthony Bellew
2017-01-26 03:02:42 -07:00
d53294b933Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings
Eugen
2017-01-26 10:44:20 +01:00
95b0bf9815Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments
Eugen
2017-01-26 10:43:54 +01:00
94eccbc5deAdd a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant
Effy Elden
2017-01-26 19:22:59 +11:00
198ea2522eSeed a default, confirmed, admin account on development environments
Effy Elden
2017-01-26 19:22:00 +11:00
d944946c52Moved brackets outside of localized strings at Gargron's suggestion
Anthony Bellew
2017-01-26 00:24:52 -07:00
baa52984e9Add brackets to visually distinguish show more / show less text
Anthony Bellew
2017-01-25 20:56:33 -07:00
3d890c4073Merge pull request #3 from tootsuite/master
Anthony Bellew
2017-01-25 20:53:57 -07:00
905c829179Improve infinite scroll on notifications
Eugen Rochko
2017-01-26 04:30:40 +01:00
57f7cf8349Follow request authorizations faster
Eugen Rochko
2017-01-26 03:56:26 +01:00
eb62778becFix#537 - opengraph description should display spoiler text when present
Eugen Rochko
2017-01-26 03:45:14 +01:00
1c507ff172Fix#538 - Darken buttons to increase contrast
Eugen Rochko
2017-01-26 03:32:00 +01:00
3a310e8f63Fix CSS mistake
Eugen Rochko
2017-01-26 03:17:48 +01:00
97d9517b6bMerge pull request #534 from yiskah/patch-2
Eugen
2017-01-26 02:51:27 +01:00
0a391a2872Merge pull request #536 from blackle/leftclick
Eugen
2017-01-26 02:50:55 +01:00
6bba337080Only open status on left mouse press
blackle
2017-01-25 20:43:41 -05:00
33e09cc76bIncrease color contrast on getting started text
shel
2017-01-25 20:19:37 -05:00
3b6af5245bclarify the intended use of the oauth api call as per this issue:
Christian Walde
2017-01-25 18:31:15 +01:00
97da56d02bFix loading of avatars before drawing them to canvas
Eugen Rochko
2017-01-25 17:23:17 +01:00
00fa850bdcFix#187, address #441 - <Avatar> component now plays gifs only while hovered
Eugen Rochko
2017-01-25 17:07:57 +01:00
3beb24ad55Use <summary> to encode content warnings instead
Eugen Rochko
2017-01-25 16:53:30 +01:00
0430f7c0faFix spoiler_text not having "not null" constraint
Eugen Rochko
2017-01-25 15:24:19 +01:00
51a7047367Fix order of migrations
Eugen Rochko
2017-01-25 15:01:00 +01:00
ca04002c93Add content warning example to docs
Eugen Rochko
2017-01-25 02:54:28 +01:00
ab94ad3504Add description of Mastodon's current protocol extensions
Eugen Rochko
2017-01-25 02:46:16 +01:00
41f5459af5Merge pull request #524 from blackle/master
Eugen
2017-01-25 02:16:36 +01:00
ca13ec04a8fix up spoilers
blackle
2017-01-24 20:14:20 -05:00
10ffd455a8Fix#522 - prevent blocked users from reblogging
Eugen Rochko
2017-01-25 01:48:46 +01:00
ca28d9c2aeMerge branch 'blackle-master'
Eugen Rochko
2017-01-25 01:29:40 +01:00
999cde94a6Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" /> Clean up schema file from accidental development migrations
Eugen Rochko
2017-01-25 00:49:08 +01:00
f8da0dd490Merge branch 'master' into master
Eugen
2017-01-24 21:56:06 +01:00
8a880a3d46Make blocks create entries and unfollows instantly, but do the clean up in the background instead. Should fix delay where blocked person can interact with blocker for a short time before background job gets processed
Eugen Rochko
2017-01-24 21:40:41 +01:00
326c75b35bMerge pull request #521 from mistydemeo/fix_invisible_css
Eugen
2017-01-24 21:26:18 +01:00
adda642c63Fix invisible CSS class
Misty De Meo
2017-01-24 11:07:46 -08:00
e47b8e778bFix links in toots opening the toot at first
Eugen Rochko
2017-01-24 18:51:09 +01:00
80cefd5b3cFix#204, fix#515 - URL truncating is now a style so copypasting is not affected, replaced onClick handler with onMouseUp/Down to detect text selection not trigger onClick handler then
Eugen Rochko
2017-01-24 17:05:44 +01:00
b06a375ee4Merge branch 'blackle-boostspin'
Eugen Rochko
2017-01-24 14:28:54 +01:00
4f3264d291Merge branch 'master' into boostspin
Eugen
2017-01-24 14:27:13 +01:00
4a146a0d18Make boost animation an SVG that uses SCSS colours
blackle
2017-01-23 21:02:13 -05:00
21c209636dSet isLoading false on timelines when request fails
Eugen Rochko
2017-01-24 13:04:12 +01:00