Commit graph

39754 commits

Author SHA1 Message Date
Eugen Rochko
f8bd44a747 Fix font weight 2017-01-26 23:34:40 +01:00
Eugen
380ddcdebf 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
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
d225fac6f3 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
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
c8b97ebd75 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
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
2bf0addfd9 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
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
8008b60324 Fix key names in statsd 2017-01-26 19:46:52 +01:00
Eugen Rochko
f6a5977f0b Fix key names in statsd 2017-01-26 19:46:52 +01:00
Eugen Rochko
fd23876e75 Improve StatsD instrumentation 2017-01-26 19:08:05 +01:00
Eugen Rochko
d567f21d4f Improve StatsD instrumentation 2017-01-26 19:08:05 +01:00
Eugen Rochko
4bd0286045 Fix up timeout, improve contrast on "show more", add responsive style
for extremely wide monitors
2017-01-26 18:48:56 +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
43075a246e document that /oauth/token does not always return json 2017-01-26 16:28:57 +01:00
Christian Walde
12eddb5cbe document that /oauth/token does not always return json 2017-01-26 16:28:57 +01:00
Effy Elden
0a909f2e6b Add default account details to developer documentation. 2017-01-27 02:03:13 +11:00
Effy Elden
ae2147d40f Add default account details to developer documentation. 2017-01-27 02:03:13 +11:00
Eugen Rochko
096ff9ba38 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 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
9e21f3434c 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
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
ae912afae6 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
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
3b326b4353 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
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
1505254334 Removed line break before spoiler link, changed color of bg for spoiler link 2017-01-26 03:07:02 -07: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
543aa1a957 Add Padding to inline styles for spoiler 2017-01-26 03:03:26 -07:00
Anthony Bellew
ebe5095665 Add Padding to inline styles for spoiler 2017-01-26 03:03:26 -07:00
Anthony Bellew
704713cea6 Added inline spoiler button styles 2017-01-26 03:02:42 -07:00
Anthony Bellew
8f18c8f9ad Added inline spoiler button styles 2017-01-26 03:02:42 -07:00
Eugen
6895ea29fd 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
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
d99de2a1a3 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
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
e529d3ddfe Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant 2017-01-26 19:22:59 +11:00
Effy Elden
94eccbc5de Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant 2017-01-26 19:22:59 +11:00
Effy Elden
26756a48e7 Seed a default, confirmed, admin account on development environments 2017-01-26 19:22:00 +11:00
Effy Elden
198ea2522e Seed a default, confirmed, admin account on development environments 2017-01-26 19:22:00 +11:00
Effy Elden
72514a07b9 Add redirect for /admin => /admin/settings 2017-01-26 18:59:35 +11:00
Effy Elden
07b9a10d4d Add redirect for /admin => /admin/settings 2017-01-26 18:59:35 +11:00
Anthony Bellew
1c684c0888 Moved brackets outside of localized strings at Gargron's suggestion 2017-01-26 00:24:52 -07:00
Anthony Bellew
d944946c52 Moved brackets outside of localized strings at Gargron's suggestion 2017-01-26 00:24:52 -07:00
Anthony Bellew
0e00c04091 Add brackets to visually distinguish show more / show less text 2017-01-25 20:56:33 -07:00
Anthony Bellew
baa52984e9 Add brackets to visually distinguish show more / show less text 2017-01-25 20:56:33 -07:00
Anthony Bellew
68bdedbe5f Merge pull request #3 from tootsuite/master
Updating to current
2017-01-25 20:53:57 -07:00
Anthony Bellew
3d890c4073 Merge pull request #3 from tootsuite/master
Updating to current
2017-01-25 20:53:57 -07:00
Eugen Rochko
2efefb380b Improve infinite scroll on notifications 2017-01-26 04:30:40 +01:00