Eugen Rochko
57159804b8
Merge branch 'PurpleBooth-add-missing-back-on-follow'
2017-01-30 15:22:31 +01:00
Eugen Rochko
9bde804ba2
Resolve confusion between ColumnBackButton and the slim version that
...
the public timeline has been using
2017-01-30 15:22:04 +01:00
Billie Thompson
b1571b1e1d
Add missing back button to "Follow Requests"
...
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-29 18:53:51 +00:00
James
b12bdd2aea
Add 2-FA instructions for non-technical users ( #580 )
2017-01-29 19:26:27 +01:00
Eugen
2165a0ec63
Update some API docs
2017-01-29 14:40:57 +01:00
Misty De Meo
a30e669df2
Fix avatar scaling on high-DPI displays ( #573 )
2017-01-29 14:26:50 +01:00
Eugen Rochko
ff90a5ff84
Update sample .env
2017-01-29 13:06:58 +01:00
Eugen Rochko
aa52d5fd1e
Add more links to main docs page
2017-01-29 12:59:02 +01:00
Eugen Rochko
ca8a9d5941
Fix JSON formatting in docs
2017-01-29 12:55:12 +01:00
Eugen Rochko
fe9306f346
Update docs with information about push notifications
2017-01-29 12:53:50 +01:00
Eugen Rochko
e70e721a0d
Add tests for new API
2017-01-29 12:35:55 +01:00
Eugen Rochko
83ccdeb87a
Fix tests
2017-01-29 12:25:10 +01:00
Eugen Rochko
3f075c7794
API for apps to register for push notifications
2017-01-29 01:30:32 +01:00
Eugen Rochko
1992575d57
Fix #569 - seeds.rb
2017-01-29 00:12:27 +01:00
Eugen Rochko
9b2c728251
Fix settings design on mobile
2017-01-28 21:57:03 +01:00
Eugen Rochko
23b997ae55
Split 2FA login into two prompts
2017-01-28 20:43:38 +01:00
Eugen Rochko
36c57ef8af
Add pixel background to modal images
2017-01-28 04:04:09 +01:00
Eugen Rochko
f4bc9620a9
Update settings to re-use admin layout, one big navigation tree, improve settings forms
2017-01-28 03:56:10 +01:00
Eugen Rochko
04bce0cdf2
Clean up
2017-01-27 20:38:35 +01:00
Eugen Rochko
76e970c856
Do 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
2017-01-27 20:35:16 +01:00
Eugen Rochko
ba192f12e3
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
Zachary Spector
237cb41ab4
Less ambiguous sensitive content toggle label ( #556 )
2017-01-27 19:31:14 +01:00
Eugen
2a6773d59b
Merge pull request #557 from hoodiek/master
...
fix button outline showing on clicks for prettiness
2017-01-27 18:41:05 +01:00
hoodie
6c37285580
fix button outline showing on clicks for prettiness
...
remove button outlines on-click for retweet, boost, favourite, and reply
buttons
2017-01-27 12:39:36 -05:00
Eugen Rochko
dc3e0529ca
Update broken links, add new sponsor
2017-01-27 17:01:21 +01:00
Eugen Rochko
450ad43180
Do 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
2017-01-27 16:57:23 +01:00
nicolas
9f57c7d4a6
Updated translation doc to get working links
2017-01-27 13:17:33 +01:00
Eugen Rochko
f8bd44a747
Fix font weight
2017-01-26 23:34:40 +01:00
Eugen
87667e371c
Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation
...
Add default account details to developer documentation.
2017-01-26 23:03:41 +01:00
Eugen
f7aef16668
Merge pull request #548 from PurpleBooth/make-fonts-local
...
Move the fonts from Google Fonts to local assets
2017-01-26 23:02:48 +01:00
Billie Thompson
55fa8e61e2
Move the fonts from Google Fonts to local assets
...
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-26 20:09:03 +00:00
Eugen
6ba302b725
Merge pull request #550 from wchristian/oauth_docs2
...
document that /oauth/token does not always return json
2017-01-26 20:41:53 +01:00
Eugen Rochko
f6a5977f0b
Fix key names in statsd
2017-01-26 19:46:52 +01:00
Eugen Rochko
d567f21d4f
Improve StatsD instrumentation
2017-01-26 19:08:05 +01:00
Eugen Rochko
7329fbd8a4
Fix up timeout, improve contrast on "show more", add responsive style
...
for extremely wide monitors
2017-01-26 18:48:56 +01:00
Christian Walde
12eddb5cbe
document that /oauth/token does not always return json
2017-01-26 16:28:57 +01:00
Effy Elden
ae2147d40f
Add default account details to developer documentation.
2017-01-27 02:03:13 +11:00
Eugen Rochko
cc5c1e5feb
Removed accidental n+1 query from notifications, updated some deps,
...
improved how "show more" link looks
2017-01-26 14:52:07 +01:00
Eugen
2f18c77e44
Merge pull request #526 from wchristian/oauth_docs
...
clarify the intended use of the oauth api call
2017-01-26 12:23:47 +01:00
Eugen
446d6f1643
Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments
...
Seed a default, confirmed, admin account on development environments
2017-01-26 12:22:32 +01:00
Eugen
c3a3ce8172
Merge pull request #541 from TrevInc/master
...
Add brackets to visually distinguish show more / show less text
2017-01-26 11:07:42 +01:00
Anthony Bellew
589837cfc7
Removed line break before spoiler link, changed color of bg for spoiler link
2017-01-26 03:07:02 -07:00
Anthony Bellew
ebe5095665
Add Padding to inline styles for spoiler
2017-01-26 03:03:26 -07:00
Anthony Bellew
8f18c8f9ad
Added inline spoiler button styles
2017-01-26 03:02:42 -07:00
Eugen
d53294b933
Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings
...
Add redirect for /admin => /admin/settings
2017-01-26 10:44:20 +01:00
Eugen
95b0bf9815
Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments
...
Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant
2017-01-26 10:43:54 +01:00
Effy Elden
94eccbc5de
Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant
2017-01-26 19:22:59 +11:00
Effy Elden
198ea2522e
Seed a default, confirmed, admin account on development environments
2017-01-26 19:22:00 +11:00
Effy Elden
07b9a10d4d
Add redirect for /admin => /admin/settings
2017-01-26 18:59:35 +11:00
Anthony Bellew
d944946c52
Moved brackets outside of localized strings at Gargron's suggestion
2017-01-26 00:24:52 -07:00
