tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,871 Commits 10 Branches 0 Tags
47e507fa61be6dc39dd9821e1d07c33e993cc246
Commit Graph

9871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anthony Bellew
baa52984e9 Add brackets to visually distinguish show more / show less text 2017-01-25 20:56:33 -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
905c829179 Improve infinite scroll on notifications 2017-01-26 04:30:40 +01:00
Eugen Rochko
57f7cf8349 Follow request authorizations faster 2017-01-26 03:56:26 +01:00
Eugen Rochko
eb62778bec Fix #537 - opengraph description should display spoiler text when present 2017-01-26 03:45:14 +01:00
Eugen Rochko
1c507ff172 Fix #538 - Darken buttons to increase contrast 2017-01-26 03:32:00 +01:00
Eugen Rochko
3a310e8f63 Fix CSS mistake 2017-01-26 03:17:48 +01:00
Eugen
97d9517b6b Merge pull request #534 from yiskah/patch-2 
Increase color contrast on getting started text
 2017-01-26 02:51:27 +01:00
Eugen
0a391a2872 Merge pull request #536 from blackle/leftclick 
Only open status on left mouse press
 2017-01-26 02:50:55 +01:00
blackle
6bba337080 Only open status on left mouse press 2017-01-25 20:43:41 -05:00
shel
33e09cc76b Increase color contrast on getting started text 
Currently, the getting started text fails WCAG standards for color contrast by a lot. Especially on the part overlapping with the elephant graphic which is nearly unreadable even for users with 20|20 vision. This change doesn't fix the elephant overlap but at least makes the text meet AAA WCAG Small Text color contrast standards, making it easier to read.
 2017-01-25 20:19:37 -05:00
Christian Walde
3b6af5245b clarify the intended use of the oauth api call as per this issue: 
https://github.com/alin-rautoiu/mastodroid/issues/23
 2017-01-25 18:31:15 +01:00
Eugen Rochko
97da56d02b Fix loading of avatars before drawing them to canvas 2017-01-25 17:23:17 +01:00