Eugen
874fffb7dc
Merge branch 'master' into patch-3
2017-02-10 19:15:13 +01:00
Eugen
73e388e0d8
Merge pull request #617 from halcy/style-changes
...
Style changes
2017-02-10 19:10:15 +01:00
shel
3f1f3d0827
Add link to other instances list
...
This should help federation
2017-02-10 13:06:38 -05:00
Lorenz Diener
cbb962fd77
Move more colours to scss
2017-02-10 16:30:06 +00:00
Lorenz Diener
c9f42a7b85
Move more inline colours to scss
2017-02-10 15:35:19 +00:00
Eugen Rochko
0afed995ce
Fix the fix
2017-02-09 21:22:49 +01:00
Eugen Rochko
6331ed16e5
Fix #614 - extra reply-boolean on statuses to account for cases when replied-to
...
status is not in the system at time of distribution; fix #607 - reset privacy
settings to defaults when cancelling replies
2017-02-09 20:25:39 +01:00
Eugen Rochko
c424df5192
Progress on moving color styles to Sass
2017-02-09 01:20:09 +01:00
Eugen
942a2e7d68
Fix reblogs not having content warnings forwarded
2017-02-08 18:05:46 +01:00
Eugen
d96e031dfc
Fix #611 - Layout setting in registrations controller
2017-02-08 03:04:29 +01:00
Isabelle Knott
1d273e4430
Change blocked users icon to fa-ban in getting started view ( #608 )
2017-02-07 23:48:50 +01:00
Eugen Rochko
02e91a96dd
Make streaming API use one pattern-matching redis pubsub connection
...
Refresh timelines when streaming API reconnects in the UI
2017-02-07 14:39:08 +01:00
Eugen
9d5fb49cd8
Merge pull request #603 from evanminto/activitypub-account
...
Expose ActivityStreams 2.0 representation of accounts
2017-02-07 02:08:40 +01:00
Evan Minto
28cbb6dc21
Add AS2 format to RABL files
2017-02-06 17:00:55 -08:00
Eugen Rochko
8a081ce588
Fix wrong prediction of whether toot will apear on public timeline in UI
2017-02-07 00:40:35 +01:00
Eugen Rochko
714e41d472
Fix preferences save
2017-02-07 00:23:38 +01:00
Eugen Rochko
ac035108aa
Add "clear notifications" button, exclude posts from people who have blocked *you* from public/hashtag timelines
2017-02-07 00:06:40 +01:00
Eugen Rochko
c8252759df
Add streaming API channels for local-only statuses
2017-02-06 23:46:14 +01:00
Eugen Rochko
347a153b3d
Add API modifiers to limit returned toots from public/hashtag timelines
...
to only those from local users; Add link to "extended information" to
getting started in the UI; Add defaults for posting privacy; Change
how publish button looks depending on posting privacy chosen
2017-02-06 23:16:20 +01:00
Evan Minto
53234e5947
Add trailing newline
2017-02-06 12:15:47 -08:00
Evan Minto
3fa5d05997
Simplify RABL
2017-02-06 11:39:08 -08:00
Evan Minto
94e213c6c1
Reuse existing controller and route
2017-02-06 01:19:26 -08:00
Eugen Rochko
0af3401553
Don't allow people to follow people they blocked without unblocking first
2017-02-05 21:04:22 +01:00
Eugen Rochko
eee8afb0b7
Remove bios from blocked users list, filter out broken entries from API response
2017-02-05 19:39:00 +01:00
Eugen Rochko
c5a08eb56e
Add link to blocked users to getting started page
2017-02-05 19:22:05 +01:00
Eugen Rochko
920ba5fc4e
Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API
...
Try to fix Travis CI setup
2017-02-05 19:18:11 +01:00
Eugen Rochko
77e13c2bc9
Removing failed push notification API, make context loads use cache
2017-02-05 17:51:44 +01:00
Eugen Rochko
19b9e1e2c3
Preheat status cache
2017-02-05 17:24:18 +01:00
Eugen Rochko
6fa4e01139
Fix showing ellipsis even when link hasn't been cut off
2017-02-05 15:29:16 +01:00
Eugen Rochko
87830f99e7
Fix #552 - Replace image links with image icons in status text in the UI
2017-02-05 15:25:55 +01:00
Eugen Rochko
ff2da21d3c
Fix content warning margin
2017-02-05 14:50:58 +01:00
Eugen Rochko
b5bf807a34
Remove react-dnd as it was interfering with text selection. Move content
...
warning mentions preview into area where actual content would be
2017-02-05 04:11:14 +01:00
Eugen Rochko
fb6aa7ad5c
Add tracking of delay to streaming API
2017-02-05 03:19:04 +01:00
Eugen Rochko
6cdcac1396
Fix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer
...
overshadow requirement for remote-lookup
2017-02-05 03:01:23 +01:00
Eugen Rochko
44fad0160f
Add next/previous navigation in modal for media attachments
2017-02-05 02:48:11 +01:00
Eugen Rochko
21972bb398
No replies filter on home timeline no longer hides self-replies
2017-02-05 02:02:46 +01:00
Eugen Rochko
dbb7e5a644
Getting started on draggable columns
2017-02-05 01:58:25 +01:00
Eugen Rochko
a012e4c7ff
Fix column settings not being scrollable on short screens
2017-02-05 01:27:31 +01:00
Eugen Rochko
af007f2def
Display mentions prepended to the content warning
2017-02-05 01:19:27 +01:00
Evan Minto
8bd8ea7c04
Remove unnecessary leftover code
2017-02-04 14:49:24 -08:00
Evan Minto
e2fbf8bc74
Add an account endpoint for ActivityPub and link to it on HTML profile pages
2017-02-04 14:46:23 -08:00
hoodie
d4d3a10c25
untested!! spoiler hotfix for replies
...
untested, my vagrant is bugged again, submitted at gargron's request
2017-02-04 17:33:46 -05:00
Eugen Rochko
ccb8ac8573
Make the streaming API also handle websockets (because trying to get the browser EventSource interface to
...
work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead
of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.
2017-02-04 00:34:31 +01:00
hoodie
ac3f5a8316
easier comprehension of toot settings and properties ( #595 )
...
sounds complex, but really it just reorganizes the posting options and
adds a seperator line
2017-02-03 15:54:23 +01:00
Eugen Rochko
889b814385
Fix bug
2017-02-02 16:57:09 +01:00
Eugen Rochko
1ee4a17f37
Add logging and filtering to the node.js streaming API
2017-02-02 13:56:14 +01:00
Eugen Rochko
17ae7d132c
Prevent potential issue with public/hashtag statuses arriving after
...
they have been loaded and favourited/reblogged from another source
Since the status JSON returned from public/hashtag streams does not
contain favourited/reblogged attributes, merging them should not
override existing ones.
2017-02-02 00:49:25 +01:00
Eugen Rochko
ede04cdb24
Move rendering of JSON payloads for public/hashtag timelines to
...
FanOutOnWriteService. The only recipient-specific part on them
is reblogged/favourited. But since only newly created statuses
appear on them, it is safe to assume that both attributes would
be false
2017-02-02 00:39:17 +01:00
Eugen Rochko
d9ca46b464
Cleaning up format of broadcast real-time messages, removing
...
redis-backed "mentions" timeline as redundant (given notifications)
2017-02-02 00:03:31 +01:00
Eugen Rochko
bf60f2898d
Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI
2017-01-31 22:35:38 +01:00
Eugen Rochko
8ef79d8dc9
Revert to animating avatars by default
2017-01-31 19:16:35 +01:00
Eugen Rochko
8b9c537d5a
Fix elephant friend
2017-01-31 19:08:24 +01:00
Eugen Rochko
52d68be157
Fix CORS issue on avatars resampling
2017-01-31 19:06:13 +01:00
tom
b84d1533d4
Fix text overlapping image in Edge and on mobile ( #582 )
...
Changing the way the background image is positioned and the box is sized should fix problems with the text overlapping the image on mobile browsers and Edge.
2017-01-31 19:06:03 +01:00
Eugen Rochko
c2fbd144cf
Add "open in web" link to detailed public status pages
2017-01-30 23:01:37 +01:00
Eugen Rochko
86b3cb5120
Fix not reloading account/fetching relationship on newly independent components
2017-01-30 22:35:36 +01:00
Eugen Rochko
f21e7d6ac0
Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer
...
nested inside a common parent (<Account>), instead they all embed <HeaderContainer />
2017-01-30 21:44:11 +01:00
Eugen Rochko
404d2050d3
Add explicit "load more" link to the bottom of StatusList and notifications
2017-01-30 18:07:17 +01:00
Eugen Rochko
02cd2e42b2
Improve avatar resampling of non-animated canvas
2017-01-30 15:43:48 +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
Misty De Meo
a30e669df2
Fix avatar scaling on high-DPI displays ( #573 )
2017-01-29 14:26:50 +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
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
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
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
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
Eugen Rochko
f8bd44a747
Fix font weight
2017-01-26 23:34:40 +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 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
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
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
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
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
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
Eugen Rochko
97da56d02b
Fix loading of avatars before drawing them to canvas
2017-01-25 17:23:17 +01:00
Eugen Rochko
00fa850bdc
Fix #187 , address #441 - <Avatar> component now plays gifs only while hovered
2017-01-25 17:07:57 +01:00
Eugen Rochko
3beb24ad55
Use <summary> to encode content warnings instead
2017-01-25 16:53:30 +01:00
Eugen Rochko
51a7047367
Fix order of migrations
2017-01-25 15:01:00 +01:00
Eugen
41f5459af5
Merge pull request #524 from blackle/master
...
fix up spoilers
2017-01-25 02:16:36 +01:00
blackle
ca13ec04a8
fix up spoilers
2017-01-24 20:14:20 -05:00
Eugen Rochko
10ffd455a8
Fix #522 - prevent blocked users from reblogging
2017-01-25 01:48:46 +01:00
Eugen Rochko
999cde94a6
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
f8da0dd490
Merge branch 'master' into master
2017-01-24 21:56:06 +01:00
Eugen Rochko
8a880a3d46
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
Misty De Meo
adda642c63
Fix `invisible` CSS class
2017-01-24 11:49:31 -08:00
Eugen Rochko
e47b8e778b
Fix links in toots opening the toot at first
2017-01-24 18:51:09 +01:00
Eugen Rochko
80cefd5b3c
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
4f3264d291
Merge branch 'master' into boostspin
2017-01-24 14:27:13 +01:00
blackle
4a146a0d18
Make boost animation an SVG that uses SCSS colours
2017-01-24 07:48:13 -05:00
Eugen Rochko
21c209636d
Set isLoading false on timelines when request fails
2017-01-24 13:04:12 +01:00
Eugen Rochko
1f5792c834
API now respects ?limit param as long as it's within 2x default limit
2017-01-24 04:22:10 +01:00
Eugen Rochko
d9022884c6
Smarter infinite scroll
2017-01-24 04:12:10 +01:00
blackle
bf0f6eb62d
Implement a click-to-view spoiler system
2017-01-23 21:07:40 -05:00
Eugen Rochko
1761d3f9c3
Fix mistake
2017-01-23 22:18:08 +01:00
Eugen Rochko
d00189b55a
Domains with reject_media? set to true won't download avatars either
2017-01-23 21:55:29 +01:00
Eugen Rochko
8aab692034
Less re-rendering
2017-01-23 21:40:48 +01:00
Eugen Rochko
434cf8237e
Optional domain block attribute that prevents media attachments from being downloaded
2017-01-23 21:36:08 +01:00
Eugen Rochko
cca82bf0a2
Move merging/unmerging of timelines into background. Move blocking into
...
background as well since it's a computationally expensive
2017-01-23 21:29:34 +01:00
Eugen Rochko
f392030ab8
Add /api/v1/notifications/clear, non-existing link cards for statuses will
...
now return empty hash instead of throwing a 404 error. When following,
merge into timeline will filter statuses
2017-01-23 21:09:27 +01:00
Eugen Rochko
f2e08ff568
Remove unneeded block check
2017-01-23 17:40:23 +01:00
Eugen Rochko
6d98a73180
Domain blocks now have varying severity - auto-suspend vs auto-silence
2017-01-23 17:38:38 +01:00
Eugen Rochko
ef2b924679
Forgot to commit
2017-01-23 17:18:41 +01:00
Eugen Rochko
f855d645b2
Move all hex colors in SASS to variables and all variations to darken/lighten
2017-01-23 16:01:46 +01:00
Eugen Rochko
d4d56b8af0
Fix #365 , 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format
2017-01-23 14:45:09 +01:00
Eugen Rochko
aa9c51a34c
Fix a couple unhandled exceptions
2017-01-23 13:56:57 +01:00
Eugen Rochko
a1894786cf
Potentially fix notifications issue
2017-01-23 13:43:14 +01:00
Misty De Meo
33fd8a7d95
Textarea: fix clicking on name suggestions
...
This was broken in c3e9ba6a
, which added an onBlur to hide the
suggestions when the textarea loses focus. Unfortunately, this fired
even when the textarea lost focus to its own suggestions box, and that
meant that onSuggestionClick is never called.
Setting a short window in which onSuggestionClick can still happen
before hiding the suggestion area ensures that clicking still works,
while still hiding the suggestions if the user clicks on something else.
2017-01-22 22:57:58 -08:00
Eugen
1953e3b6ed
Fix inflection
2017-01-22 23:08:51 +01:00
Eugen
cea9fb31fe
Mitigate inconsistent notifications
2017-01-22 21:50:17 +01:00
Eugen Rochko
e22a56183a
Improve error page layouting. 500 page has to stay static because it's
...
used from nginx when Rails fails.
2017-01-21 22:30:47 +01:00
Eugen Rochko
b4a4eb73ae
Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages
2017-01-21 22:20:01 +01:00
Eugen Rochko
3a4b5961be
Method to fetch a single notification
2017-01-21 22:14:13 +01:00
Effy Elden
8f21f5522f
Call uniq on the string version of mb_chars tags
2017-01-21 21:02:42 +11:00
Eugen Rochko
1aae0cfc2c
Fix #475 - add space after autocomplete
2017-01-20 21:39:41 +01:00
Eugen Rochko
9bd3b11cfb
Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain
2017-01-20 20:14:02 +01:00
Eugen Rochko
05abd977c1
Fix preview cards layout, do preview card crawling for remote statuses
2017-01-20 18:31:49 +01:00
blackle
7f63edd820
Show visibility toggle on videos, show regardless of sensitivity
2017-01-19 21:24:30 -05:00
Eugen Rochko
c8e4b9c663
No loading bars for cards, no failure if it 404s (that's expected)
2017-01-20 01:07:53 +01:00
Eugen Rochko
f0de621e76
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
Eugen Rochko
8d0284f8d9
Hide more non-essential loading bars
2017-01-19 11:23:24 +01:00
Eugen Rochko
98560b232a
Don't show loading bar when re-loading already loaded status. Don't even try to fetch ancestors from DB when in_reply_to_id is nil
2017-01-19 11:06:06 +01:00
Eugen Rochko
9b0941182f
Don't show loading bar when checking account timeline for newer stuff
2017-01-19 11:01:01 +01:00
Eugen Rochko
46be4631ae
Fix #222 - Update followers count when following/unfollowing
...
Also, since the root component connects to the stream that updates home/notification columns,
there is pretty much no case for refreshing those columns beyond initial load. So, move the
loading of those columns into the root component, to prevent unneccessary reloads when switching tabs
on mobile or resizing desktop window between mobile/desktop layouts
2017-01-19 10:54:18 +01:00
Eugen Rochko
f051c2e813
Fix statsd null backend not being initialized properly
2017-01-19 09:37:07 +01:00
Eugen
8b9206f7d9
Try to avoid any potential loops
2017-01-19 02:14:57 +01:00
Eugen Rochko
306eb6e9c9
Add optional StatsD performance tracking
2017-01-18 23:44:29 +01:00
Eugen Rochko
7cfd5b680a
Fix forgotten change of settings
2017-01-17 20:37:54 +01:00
Eugen Rochko
c468446f4c
Fix boops?
2017-01-17 20:28:32 +01:00
Eugen Rochko
cde0476ca2
Fix #487
2017-01-17 20:11:16 +01:00
Eugen Rochko
fcb5a85cdd
Add sounds for notifications. Boop by @jk@mastodon.social
2017-01-17 20:09:03 +01:00
Eugen Rochko
6cf44ca92c
Improve how the list entry Account component looks when target is blocked/follow is requested
2017-01-16 19:36:32 +01:00
blackle
889709a2a6
Show 'do not display in public timeline' when replying to self
2017-01-16 10:26:44 -05:00
Eugen Rochko
1a33e4042e
Fix upload file input being re-rendered needlessly
2017-01-16 14:21:55 +01:00
Eugen Rochko
7d53ee73f3
Fix #238 - Add "favourites" column
2017-01-16 13:28:25 +01:00
Eugen Rochko
da5d366230
Fix #414 - Improve lightbox, add loading indicator
2017-01-16 12:04:02 +01:00
Eugen Rochko
2ae0fb4419
Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
2017-01-16 11:36:02 +01:00
Eugen Rochko
0439c7d58b
Move follow requests link above logout link in getting started column
2017-01-16 11:35:32 +01:00
blackle
144402ec7e
Show visibility toggle on media gallery for sensitive images
2017-01-15 20:27:08 -05:00
blackle
383114add3
Change boost sprite to look like fa-retweet
2017-01-15 11:40:05 -05:00
Eugen Rochko
926459fc0a
Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse
2017-01-15 14:59:25 +01:00
Eugen Rochko
7d7a11250c
Fix #427 - don't suggest hashtag if the search value contains a space
2017-01-15 14:47:39 +01:00
Eugen Rochko
1d5cbfa356
Fix #449 - don't do relationships fetch for empty array of IDs
2017-01-15 14:47:39 +01:00
Eugen Rochko
cc1eccc8bc
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
2017-01-15 14:47:39 +01:00
Eugen Rochko
e9737c2235
Fix tests, add applications to eager loading/cache for statuses, fix
...
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464 until it's consistent with non-animated version
2017-01-15 14:01:33 +01:00
Eugen Rochko
ab165547fd
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
2017-01-15 13:23:47 +01:00
Eugen
1f7c0ad8d3
Merge pull request #464 from blackle/backflip
...
Make boost button spin around
2017-01-15 13:19:15 +01:00
Effy Elden
e45fed58cb
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
Effy Elden
ed41f9f0b1
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:30:23 +11:00
Effy Elden
3f84816b24
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:27:54 +11:00
blackle
a67ffcbf56
Make boost button arrows spin around
2017-01-14 17:56:24 -05:00
Effy Elden
f81dc7a33a
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
2017-01-15 09:12:11 +11:00
Effy Elden
6c002cf615
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
2017-01-15 09:10:44 +11:00
Effy Elden
65122798b2
Fix typo in rel
2017-01-15 09:04:14 +11:00
Effy Elden
d6bc0e8db4
Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
2017-01-15 08:58:50 +11:00
Effy Elden
32d756fb22
Hide 'Do not display on public timeline' for reply toots. Fixes #412 .
2017-01-15 06:10:23 +11:00
Eugen
f63f0c4625
Fix too late return
2017-01-14 02:22:16 +01:00
Eugen Rochko
7cde08e30b
Improve extended about page layout
2017-01-13 20:27:02 +01:00
Eugen Rochko
c01dd089ff
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
Eugen Rochko
e25170f960
Add extended about page stub
2017-01-13 03:24:41 +01:00
Eugen Rochko
2939e9898b
Extend rails-settings-cached to merge db-saved hash values with defaults
2017-01-13 02:42:22 +01:00
Eugen Rochko
ca50ceeaf0
Add settings for contact information
2017-01-12 20:54:14 +01:00
Eugen Rochko
b11fdc3ae3
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
...
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
2017-01-12 20:46:24 +01:00
Eugen Rochko
4a2ee43e80
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
2017-01-12 03:54:50 +01:00
Eugen Rochko
7951e7ffd5
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
...
fix bug in process feed service
2017-01-11 15:39:31 +01:00
Eugen
10739df458
Merge pull request #456 from ineffyble/fix-repo-url
...
Fix repo URL
2017-01-11 14:19:19 +01:00
Eugen Rochko
3ad0496ccb
Better animations
2017-01-11 04:21:49 +01:00
Effy Elden
f876a8681d
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
Eugen Rochko
18b11100e7
Fix issue when settings are not defined for column type
2017-01-10 17:33:32 +01:00
Eugen Rochko
312c51b5c8
Home column filters
2017-01-10 17:25:10 +01:00
Eugen Rochko
1e9d2c4b1e
Add "not found" component to UI
2017-01-10 13:50:59 +01:00
Eugen
67a31454ad
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
blackle
917cf0bf5d
simplify emojification on public pages with .emojify class
2017-01-09 22:41:47 -05:00
Eugen Rochko
205ba00017
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
Eugen Rochko
def1f8c5b3
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-01-09 14:12:40 +01:00
Eugen Rochko
3bddd647e0
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
2017-01-09 14:10:32 +01:00
Eugen Rochko
75f80bef10
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
Eugen Rochko
23ebf60b95
Improve initialState loading
2017-01-09 12:37:53 +01:00
blackle
131bae89fd
Generate key for each input so we can upload the same file even after deleting
2017-01-08 21:00:13 -05:00
blackle
d64c454cfe
Switch to compose view when tapping 'mention' in dropdown on mobile
2017-01-08 17:12:00 -05:00
Eugen Rochko
2e71bb031b
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
Eugen
38bc85e695
Merge pull request #443 from blackle/master
...
Add call-to developers on getting started page
2017-01-08 13:36:02 +01:00
blackle
05e964688d
Expand dropdown leftways on status view
2017-01-08 06:32:37 -05:00
blackle
b4f09bae1d
Add call-to developers on getting started page
2017-01-08 00:23:22 -05:00
Eugen
69643338f6
Merge pull request #437 from krainboltgreene/patch-1
...
Simplifying followers mappings
2017-01-08 04:14:54 +01:00
Kurtis Rainbolt-Greene
abe3ae1cc2
Simplifying followers mappings
...
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
2017-01-07 18:09:00 -08:00
Kurtis Rainbolt-Greene
4a7e3e5082
Less complicated determination
2017-01-07 17:59:51 -08:00
Kurtis Rainbolt-Greene
e5d9009d71
Using "rails style" order arguments
2017-01-07 17:55:40 -08:00
Eugen
7a0a13ab53
Merge pull request #432 from blackle/volume-icon
...
Show correct volume icons on video player
2017-01-08 02:36:12 +01:00
blackle
8a571158c9
Show correct volume icons on video player
2017-01-07 20:23:15 -05:00
Eugen
cec7e69827
Merge pull request #430 from blackle/logout_mobile
...
Show logout button on getting started so it's available on mobile
2017-01-08 01:24:06 +01:00
blackle
e1ca354956
Show logout button on getting started so it's available on mobile
2017-01-07 18:41:57 -05:00
blackle
57ff221c0f
Emojify display names in notifcations
2017-01-07 18:16:14 -05:00
blackle
61211b509c
Improve contrast of bio and username text in account info
2017-01-07 16:39:30 -05:00
Eugen Rochko
be6ae3546f
Replace getting started icon on desktop nav bar with asterisk instead of hamburger
2017-01-07 15:46:39 +01:00
Eugen Rochko
5c7add2176
Fix #147 - Unreblogging will leave original status in feeds
2017-01-07 15:44:22 +01:00
Eugen Rochko
989c3f4002
Add tab bar alternative to desktop UI, upgrade react & react-redux
2017-01-06 22:09:55 +01:00
Eugen Rochko
1bfbce7b45
Clean up h-card mess of divs
2017-01-06 20:24:51 +01:00
Eugen Rochko
72c3a41bef
Fix h-card classes and remote follow button appearing when it shouldn't
2017-01-06 20:15:24 +01:00
Greg V
18deeb9db5
Add Microformats2 markup
...
h-feed, h-card and h-entry
2017-01-06 18:10:10 +03:00
Eugen
92bd5f62f6
Merge pull request #417 from ineffyble/twitter-card-metadata
...
Twitter Cards support
2017-01-06 01:16:45 +01:00
Eugen Rochko
7b9f8766e8
Fix #416 - Generate random unique 14-byte (19 characters) shortcodes
...
for local attachments, use them in URLs. Check status privacy
before redirecting to actual file.
2017-01-06 00:29:12 +01:00
Effy Elden
819bfb75c6
Add twitter:card metatag to enable Twitter Cards support
2017-01-06 09:47:40 +11:00
Effy Elden
10a9ebae3b
Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open)
2017-01-06 08:26:45 +11:00
Eugen Rochko
00b9ba64c9
Fixed unexpected error
2017-01-05 14:23:59 +01:00
Eugen Rochko
a1de2e332d
Fix compose form bug
2017-01-05 14:18:38 +01:00
Eugen Rochko
ca7dce4a5a
Fix selection resetting in compose form after unrelated data updates
2017-01-05 14:11:18 +01:00
Eugen Rochko
10e6288444
Revert to Roboto for all
2017-01-05 13:59:58 +01:00
Eugen
9e6ceb3201
Revert "Display native emoji on browsers which support it"
2017-01-05 13:45:21 +01:00
Eugen
87f76d4095
Merge pull request #403 from ticky/use-system-fonts
...
Use system fonts on more platforms
2017-01-05 13:37:48 +01:00
Eugen
c3c9879b5e
Merge pull request #404 from mistydemeo/emoji
...
Display native emoji on browsers which support it
2017-01-05 13:37:29 +01:00
Eugen
df89cb5488
Merge pull request #399 from ticky/public-timeline-de-hoist
...
Public timeline de-hoist
2017-01-05 13:36:55 +01:00
Eugen
92638308ee
Merge pull request #400 from ticky/differentiate-settings-links
...
Differentiate settings links
2017-01-05 13:36:13 +01:00
Misty De Meo
53b765f4b1
Bump emoji requirement to Unicode 9
2017-01-04 22:47:51 -08:00
Misty De Meo
c318e6e42e
Display native emoji on browsers which support it
2017-01-04 22:23:02 -08:00
Jessica Stokes
1f3c895ffb
Use system fonts on more platforms
...
This allows other platforms such as Windows, macOS and iOS to use their system fonts rather than downloading a copy of Roboto. It also makes the app feel a little closer to native on those platforms!
2017-01-04 20:24:27 -08:00
Misty De Meo
c100b83b98
Automatically position cursor when writing a reply toot
2017-01-04 20:04:14 -08:00
Jessica Stokes
7ac55d2674
Differentiate settings links
...
The "settings" links in the Getting Started section (or, if #399 were to happen, "more" menu) and compose sections are now different; the "compose" link is "Edit profile," while the one in the Getting Started section is now "Preferences."
All languages have been updated to accommodate this, based on the existing usages of these phrases in language files in the Rails part of the app!
addresses part of #384
2017-01-04 19:47:02 -08:00
Jessica Stokes
05cc5636d8
Remove hamburger from "getting started"
2017-01-04 19:30:39 -08:00
Jessica Stokes
9c493b1ea2
Replace "Public" in tab bar with "More" hamburger
2017-01-04 19:30:22 -08:00
Jessica Stokes
0c600e9db6
Move "getting started" to its own route
2017-01-04 19:30:02 -08:00
Eugen
9bb1b97d2a
Merge pull request #394 from ticky/email-reblog-to-boost
...
"Reblog" -> "boost" in more places
2017-01-05 03:35:22 +01:00
Eugen
3b604d2786
Merge pull request #395 from ticky/hide-media-list-if-no-media
...
Don't render the media list when there's no media
2017-01-05 03:34:49 +01:00
Eugen
879aa9ad26
Merge pull request #397 from ticky/friendlier-unknown-errors
...
Friendlier unknown errors
2017-01-05 03:34:06 +01:00
Eugen
52850c51db
Merge pull request #396 from ticky/fix-cmd-enter
...
Fix Command-enter tooting
2017-01-05 03:34:01 +01:00
Jessica Stokes
cc46c6b493
Friendlier unknown errors
...
Don't ask users to check the console - if they're on mobile, they probably can't anyway ;)
2017-01-04 18:31:45 -08:00
Jessica Stokes
1da73ecade
Fix Command-enter tooting
...
metaKey is only set correctly on keyDown, not keyUp, so this swaps to using that
2017-01-04 18:29:43 -08:00
Eugen Rochko
6c28886317
Improve background jobs params and error handling
2017-01-05 03:28:21 +01:00
Eugen Rochko
251b04298e
Fix undesired delivering of private toot to remote accounts that follow author
2017-01-05 03:17:23 +01:00
Eugen Rochko
98729d50c8
Make shortcode emojis work, make getting started area scrollable
2017-01-05 03:14:33 +01:00
Jessica Stokes
cbcb7e1241
Don't render the media list when there's no media
...
This stops the empty compose view from scrolling on 4-inch devices.
2017-01-04 18:10:45 -08:00
Jessica Stokes
bb033c1d37
"Reblog" -> "boost" in more places
...
A couple of places were using "reblog" rather than "boost" - this updates them to match the web UI
2017-01-04 18:00:50 -08:00
Jessica Stokes
aaee8c9b5d
Disallow compose navbar from being shrunk
2017-01-04 17:44:41 -08:00
Jessica Stokes
312736cd1b
Stop Mastodon friend from overlapping text 🐘
2017-01-04 17:33:05 -08:00
Jessica Stokes
5b75f6d0f3
Make tabs bar take up less room on 4-inch phones
2017-01-04 17:32:11 -08:00