Commit graph

1147 commits

Author SHA1 Message Date
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
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
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
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
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
543aa1a957 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
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
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
Effy Elden
e529d3ddfe 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
72514a07b9 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
0e00c04091 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
Eugen Rochko
2efefb380b Improve infinite scroll on notifications 2017-01-26 04:30:40 +01:00
Eugen Rochko
803652ff75 Follow request authorizations faster 2017-01-26 03:56:26 +01:00
Eugen Rochko
922588157c Fix #537 - opengraph description should display spoiler text when present 2017-01-26 03:45:14 +01:00
Eugen Rochko
1cab764556 Fix #538 - Darken buttons to increase contrast 2017-01-26 03:32:00 +01:00
Eugen Rochko
6745264849 Fix CSS mistake 2017-01-26 03:17:48 +01:00
Eugen
2e73794b02 Merge pull request #534 from yiskah/patch-2
Increase color contrast on getting started text
2017-01-26 02:51:27 +01:00
Eugen
dbb30ba2d2 Merge pull request #536 from blackle/leftclick
Only open status on left mouse press
2017-01-26 02:50:55 +01:00
blackle
6ac1beab44 Only open status on left mouse press 2017-01-25 20:43:41 -05:00
shel
9001c057b7 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
fbfaf0663f 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
30106ce53d Fix loading of avatars before drawing them to canvas 2017-01-25 17:23:17 +01:00
Eugen Rochko
f163a77428 Fix #187, address #441 - <Avatar> component now plays gifs only while hovered 2017-01-25 17:07:57 +01:00
Eugen Rochko
4d011ee829 Use <summary> to encode content warnings instead 2017-01-25 16:53:30 +01:00
Eugen Rochko
f751e16e2a Fix spoiler_text not having "not null" constraint 2017-01-25 15:24:19 +01:00
Eugen Rochko
30abab790e Fix order of migrations 2017-01-25 15:01:00 +01:00
Eugen Rochko
2627571ba4 Add content warning example to docs 2017-01-25 02:54:28 +01:00
Eugen Rochko
92b8fc56a8 Add description of Mastodon's current protocol extensions 2017-01-25 02:46:16 +01:00
Eugen
bd00d67b04 Merge pull request #524 from blackle/master
fix up spoilers
2017-01-25 02:16:36 +01:00
blackle
fa25fc812d fix up spoilers 2017-01-24 20:14:20 -05:00
Eugen Rochko
e17b31bca6 Fix #522 - prevent blocked users from reblogging 2017-01-25 01:48:46 +01:00
Eugen Rochko
89c86c226d Merge branch 'blackle-master' 2017-01-25 01:29:40 +01:00
Eugen Rochko
959e064186 Instead 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
2017-01-25 01:29:16 +01:00
Eugen
c7778752e3 Merge branch 'master' into master 2017-01-24 21:56:06 +01:00
Eugen Rochko
ea8b548ee9 Make 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
2017-01-24 21:40:41 +01:00
Eugen
f0b49d04ba Merge pull request #521 from mistydemeo/fix_invisible_css
Fix `invisible` CSS class
2017-01-24 21:26:18 +01:00
Misty De Meo
6b829eea23 Fix invisible CSS class 2017-01-24 11:49:31 -08:00
Eugen Rochko
593737499e Fix links in toots opening the toot at first 2017-01-24 18:51:09 +01:00
Eugen Rochko
cb33960e0e Fix #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
2017-01-24 17:05:44 +01:00
Eugen Rochko
2173889c48 Merge branch 'blackle-boostspin' 2017-01-24 14:28:54 +01:00
Eugen
1df5242352 Merge branch 'master' into boostspin 2017-01-24 14:27:13 +01:00
blackle
cc579e1b61 Make boost animation an SVG that uses SCSS colours 2017-01-24 07:48:13 -05:00
Eugen Rochko
604c654f8d Set isLoading false on timelines when request fails 2017-01-24 13:04:12 +01:00
Eugen Rochko
b4ec84067a API now respects ?limit param as long as it's within 2x default limit 2017-01-24 04:22:10 +01:00
Eugen Rochko
271569fffb Smarter infinite scroll 2017-01-24 04:12:10 +01:00
blackle
e25fc71c2c Implement a click-to-view spoiler system 2017-01-23 21:07:40 -05:00