about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-01-30Merge branch 'PurpleBooth-add-missing-back-on-follow'Eugen Rochko
2017-01-30Resolve confusion between ColumnBackButton and the slim version thatEugen Rochko
the public timeline has been using
2017-01-29Add missing back button to "Follow Requests"Billie Thompson
Currently we have the problem where the follow request button is missing from the Follow request tab. This means that when you visit that tab you either have to press the back button in the browser or re-enter the home page, which breaks the app flow. This will resolve that issue by adding a new back button to that tab, in the same way that the public timeline, and favourites have.
2017-01-29Add 2-FA instructions for non-technical users (#580)James
2017-01-29Update some API docsEugen
2017-01-29Fix avatar scaling on high-DPI displays (#573)Misty De Meo
2017-01-29Update sample .envEugen Rochko
2017-01-29Add more links to main docs pageEugen Rochko
2017-01-29Fix JSON formatting in docsEugen Rochko
2017-01-29Update docs with information about push notificationsEugen Rochko
2017-01-29Add tests for new APIEugen Rochko
2017-01-29Fix testsEugen Rochko
2017-01-29API for apps to register for push notificationsEugen Rochko
2017-01-29Fix #569 - seeds.rbEugen Rochko
2017-01-28Fix settings design on mobileEugen Rochko
2017-01-28Split 2FA login into two promptsEugen Rochko
2017-01-28Add pixel background to modal imagesEugen Rochko
2017-01-28Update settings to re-use admin layout, one big navigation tree, improve ↵Eugen Rochko
settings forms
2017-01-27Clean upEugen Rochko
2017-01-27Do not automatically login after password reset, as it would circumvent ↵Eugen Rochko
two-factor auth (if enabled) Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit
2017-01-27Added optional two-factor authenticationEugen Rochko
2017-01-27Less ambiguous sensitive content toggle label (#556)Zachary Spector
2017-01-27Merge pull request #557 from hoodiek/masterEugen
fix button outline showing on clicks for prettiness
2017-01-27fix button outline showing on clicks for prettinesshoodie
remove button outlines on-click for retweet, boost, favourite, and reply buttons
2017-01-27Update broken links, add new sponsorEugen Rochko
2017-01-27Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB,Eugen Rochko
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
2017-01-27Updated translation doc to get working linksnicolas
2017-01-26Fix font weightEugen Rochko
2017-01-26Merge pull request #549 from ↵Eugen
ineffyble/docs/add-default-account-to-dev-documentation Add default account details to developer documentation.
2017-01-26Merge pull request #548 from PurpleBooth/make-fonts-localEugen
Move the fonts from Google Fonts to local assets
2017-01-26Move the fonts from Google Fonts to local assetsBillie Thompson
Currently we have two problems that are resolved by this change. The first is that we have a dependency on Google Fonts, which means that should it ever go down, or it have issues we would also have issues. This will resolve this by moving the dependencies we load from there to the local server. The second issue is that Google Fonts is currently returning the `local()` css font source. This causes a problem where the users browser fails to fallback to a missing glyph, resulting in many unusual characters displaying the failure glyph. This will resolve this by creating a font-family definition that does not use the `local()` source. I did not update the error pages with local fonts, they still use the remote google fonts api, so they're a self contained page that does not use the asset pipeline. This resolves tootsuite/mastodon#531 and tootsuite/mastodon#12
2017-01-26Merge pull request #550 from wchristian/oauth_docs2Eugen
document that /oauth/token does not always return json
2017-01-26Fix key names in statsdEugen Rochko
2017-01-26Improve StatsD instrumentationEugen Rochko
2017-01-26Fix up timeout, improve contrast on "show more", add responsive styleEugen Rochko
for extremely wide monitors
2017-01-26document that /oauth/token does not always return jsonChristian Walde
2017-01-27Add default account details to developer documentation.Effy Elden
2017-01-26Removed accidental n+1 query from notifications, updated some deps,Eugen Rochko
improved how "show more" link looks
2017-01-26Merge pull request #526 from wchristian/oauth_docsEugen
clarify the intended use of the oauth api call
2017-01-26Merge pull request #543 from ↵Eugen
ineffyble/tweak/seed-default-admin-account-on-dev-environments Seed a default, confirmed, admin account on development environments
2017-01-26Merge pull request #541 from TrevInc/masterEugen
Add brackets to visually distinguish show more / show less text
2017-01-26Removed line break before spoiler link, changed color of bg for spoiler linkAnthony Bellew
2017-01-26Add Padding to inline styles for spoilerAnthony Bellew
2017-01-26Added inline spoiler button stylesAnthony Bellew
2017-01-26Merge pull request #542 from ↵Eugen
ineffyble/tweak/redirect-admin-path-to-admin-settings Add redirect for /admin => /admin/settings
2017-01-26Merge pull request #544 from ↵Eugen
ineffyble/tweak/add-default-local-domain-for-vagrant-environments Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant
2017-01-26Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrantEffy Elden
2017-01-26Seed a default, confirmed, admin account on development environmentsEffy Elden
2017-01-26Add redirect for /admin => /admin/settingsEffy Elden
2017-01-26Moved brackets outside of localized strings at Gargron's suggestionAnthony Bellew