Commit graph

893 commits

Author SHA1 Message Date
Effy Elden
80f186cdf0 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
c10a41e89e Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether 2017-01-15 10:27:54 +11:00
blackle
77e78ed6aa Make boost button arrows spin around 2017-01-14 17:56:24 -05:00
Effy Elden
6d333d9fc6 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
2c042fe57f 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
e751dd669a Fix typo in rel 2017-01-15 09:04:14 +11:00
Effy Elden
8e0c1914fb 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
49ff508743 Hide 'Do not display on public timeline' for reply toots. Fixes #412. 2017-01-15 06:10:23 +11:00
Eugen
4b384d6914 Fix too late return 2017-01-14 02:22:16 +01:00
Eugen Rochko
8442a176c5 Improve extended about page layout 2017-01-13 20:27:02 +01:00
Eugen Rochko
f2667139ad 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
533448be42 Add extended about page stub 2017-01-13 03:24:41 +01:00
Eugen Rochko
6d98465db2 Extend rails-settings-cached to merge db-saved hash values with defaults 2017-01-13 02:42:22 +01:00
Eugen Rochko
1a30737ff5 Add settings for contact information 2017-01-12 20:54:14 +01:00
Eugen Rochko
7e7c2bbb0f 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
1a77ccb668 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
992c8d2c41 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
9eb3f68499 Merge pull request #456 from ineffyble/fix-repo-url
Fix repo URL
2017-01-11 14:19:19 +01:00
Eugen Rochko
efd8ce920f Better animations 2017-01-11 04:21:49 +01:00
Effy Elden
ad61a21752 Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places 2017-01-11 13:24:14 +11:00
Eugen Rochko
bc17613e70 Fix issue when settings are not defined for column type 2017-01-10 17:33:32 +01:00
Eugen Rochko
c8bcd413e2 Home column filters 2017-01-10 17:25:10 +01:00
Eugen Rochko
15b183117c Add "not found" component to UI 2017-01-10 13:50:59 +01:00
Eugen
efd4565389 Merge pull request #450 from blackle/master
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
blackle
57e496e1bc simplify emojification on public pages with .emojify class 2017-01-09 22:41:47 -05:00
Eugen Rochko
0c0d4b7c92 Fix sandboxed iOS login again 2017-01-09 19:43:53 +01:00
Eugen Rochko
394f185e91 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 2017-01-09 14:12:40 +01:00
Eugen Rochko
a1783b80b2 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown 2017-01-09 14:10:32 +01:00
Eugen Rochko
4293e132d1 Persist UI settings, add missing localizations for German 2017-01-09 14:00:55 +01:00
Eugen Rochko
c1c814e6a1 Improve initialState loading 2017-01-09 12:37:53 +01:00
blackle
62167338b8 Generate key for each input so we can upload the same file even after deleting 2017-01-08 21:00:13 -05:00
blackle
a697b5473a Switch to compose view when tapping 'mention' in dropdown on mobile 2017-01-08 17:12:00 -05:00
Eugen Rochko
f29df16eea Fix Paperclip timeout setting. Fix bug introduced in #437 2017-01-08 19:12:54 +01:00
Eugen
9f3e2737e9 Merge pull request #443 from blackle/master
Add call-to developers on getting started page
2017-01-08 13:36:02 +01:00
blackle
9d66dfecf6 Expand dropdown leftways on status view 2017-01-08 06:32:37 -05:00
blackle
1adfe59c14 Add call-to developers on getting started page 2017-01-08 00:23:22 -05:00
Eugen
72843ea705 Merge pull request #437 from krainboltgreene/patch-1
Simplifying followers mappings
2017-01-08 04:14:54 +01:00
Kurtis Rainbolt-Greene
5cecff7f2a 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
ff835f3377 Less complicated determination 2017-01-07 17:59:51 -08:00
Kurtis Rainbolt-Greene
82b0eb2ae4 Using "rails style" order arguments 2017-01-07 17:55:40 -08:00
Eugen
3f639be601 Merge pull request #432 from blackle/volume-icon
Show correct volume icons on video player
2017-01-08 02:36:12 +01:00
blackle
85cc2dd826 Show correct volume icons on video player 2017-01-07 20:23:15 -05:00
Eugen
00c9ce1eff 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
8ceae22535 Show logout button on getting started so it's available on mobile 2017-01-07 18:41:57 -05:00
blackle
75c2397ed1 Emojify display names in notifcations 2017-01-07 18:16:14 -05:00
blackle
a914180df6 Improve contrast of bio and username text in account info 2017-01-07 16:39:30 -05:00
Eugen Rochko
d019f1632c Replace getting started icon on desktop nav bar with asterisk instead of hamburger 2017-01-07 15:46:39 +01:00
Eugen Rochko
126aba0e13 Fix #147 - Unreblogging will leave original status in feeds 2017-01-07 15:44:22 +01:00
Eugen Rochko
0dac73b5cc Add tab bar alternative to desktop UI, upgrade react & react-redux 2017-01-06 22:09:55 +01:00
Eugen Rochko
26390b1997 Clean up h-card mess of divs 2017-01-06 20:24:51 +01:00
Eugen Rochko
ecd7a46f98 Fix h-card classes and remote follow button appearing when it shouldn't 2017-01-06 20:15:24 +01:00
Greg V
8d6361b40b Add Microformats2 markup
h-feed, h-card and h-entry
2017-01-06 18:10:10 +03:00
Eugen
2804ccc958 Merge pull request #417 from ineffyble/twitter-card-metadata
Twitter Cards support
2017-01-06 01:16:45 +01:00
Eugen Rochko
0df070596e 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
fe31b43b75 Add twitter:card metatag to enable Twitter Cards support 2017-01-06 09:47:40 +11:00
Effy Elden
30cc139fad 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
6bbc2c7954 Fixed unexpected error 2017-01-05 14:23:59 +01:00
Eugen Rochko
3f1dff3dfd Fix compose form bug 2017-01-05 14:18:38 +01:00
Eugen Rochko
b2ea21b3c9 Fix selection resetting in compose form after unrelated data updates 2017-01-05 14:11:18 +01:00
Eugen Rochko
45e5326307 Revert to Roboto for all 2017-01-05 13:59:58 +01:00
Eugen
8b35bd2b92 Revert "Display native emoji on browsers which support it" 2017-01-05 13:45:21 +01:00
Eugen
06a9a0a0f4 Merge pull request #403 from ticky/use-system-fonts
Use system fonts on more platforms
2017-01-05 13:37:48 +01:00
Eugen
9f3babd80f Merge pull request #404 from mistydemeo/emoji
Display native emoji on browsers which support it
2017-01-05 13:37:29 +01:00
Eugen
d8197c27eb Merge pull request #399 from ticky/public-timeline-de-hoist
Public timeline de-hoist
2017-01-05 13:36:55 +01:00
Eugen
30adea06fb Merge pull request #400 from ticky/differentiate-settings-links
Differentiate settings links
2017-01-05 13:36:13 +01:00
Misty De Meo
8579c4ae01 Bump emoji requirement to Unicode 9 2017-01-04 22:47:51 -08:00
Misty De Meo
8dfb4048cc Display native emoji on browsers which support it 2017-01-04 22:23:02 -08:00
Jessica Stokes
6860c6bcfd 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
8745871737 Automatically position cursor when writing a reply toot 2017-01-04 20:04:14 -08:00
Jessica Stokes
c22ecd7f3b 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
1ff1f5d344 Remove hamburger from "getting started" 2017-01-04 19:30:39 -08:00
Jessica Stokes
9953f14df9 Replace "Public" in tab bar with "More" hamburger 2017-01-04 19:30:22 -08:00
Jessica Stokes
b02a33430f Move "getting started" to its own route 2017-01-04 19:30:02 -08:00
Eugen
51a491d49a Merge pull request #394 from ticky/email-reblog-to-boost
"Reblog" -> "boost" in more places
2017-01-05 03:35:22 +01:00
Eugen
0fa6bbd99e 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
bfcae97e4a Merge pull request #397 from ticky/friendlier-unknown-errors
Friendlier unknown errors
2017-01-05 03:34:06 +01:00
Eugen
d07f9f5757 Merge pull request #396 from ticky/fix-cmd-enter
Fix Command-enter tooting
2017-01-05 03:34:01 +01:00
Jessica Stokes
a91e6dbeea 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
ed51e797f0 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
a893746e5a Improve background jobs params and error handling 2017-01-05 03:28:21 +01:00
Eugen Rochko
66c5363bae Fix undesired delivering of private toot to remote accounts that follow author 2017-01-05 03:17:23 +01:00
Eugen Rochko
2de668bcf9 Make shortcode emojis work, make getting started area scrollable 2017-01-05 03:14:33 +01:00
Jessica Stokes
f380a6adb5 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
b115602bb7 "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
40bdd8905d Disallow compose navbar from being shrunk 2017-01-04 17:44:41 -08:00
Jessica Stokes
7104775362 Stop Mastodon friend from overlapping text 🐘 2017-01-04 17:33:05 -08:00
Jessica Stokes
97b3e63776 Make tabs bar take up less room on 4-inch phones 2017-01-04 17:32:11 -08:00
Jessica Stokes
2d89579a7a Improve quality of life for 4-inch phones
Removes extra UI margins < 360px, and allows the tab bar to scroll. Also slightly improves horizontal scrolling behaviour on desktop.
2017-01-04 17:29:09 -08:00
Eugen Rochko
9d87c5586f Fix #391 - relative timestamps now contain an exact datetime in title 2017-01-04 15:43:28 +01:00
Eugen Rochko
800f6cf6a3 Fix #390 - fix redirect after sign-up (to login page instead of homepage) 2017-01-04 15:31:25 +01:00
Anthony Bellew
8ed0798a98 Reduce height of media query to hide avatar/bio
An additional selector was provided to make the bio only hide on the timeline and not on the user page itself.
2017-01-03 11:55:36 -07:00
Mitchell Hentges
0f79047d49 On file-drag, show a border around textarea 2017-01-03 00:43:45 -08:00
Eugen Rochko
3cd4d3f90b Add "back" button on column headers of public and hashtag timelines. The "back"
button takes you back to getting started page
2017-01-03 01:15:42 +01:00
Eugen Rochko
0471207cc3 Fix accidental distribution of hidden stream entries to PuSH subscribers 2017-01-03 00:44:23 +01:00
Eugen Rochko
6ef2b5d1c7 Fix admin UI not loading JS, make sure to strip "acct:" out of remote account's usernames when authorizing follow 2017-01-02 22:31:10 +01:00
Eugen Rochko
b57e126d47 Unblocks also federate 2017-01-02 14:19:02 +01:00
Eugen Rochko
019df3182b See #244 - Added notifications column settings to filter what's displayed
in the column and what appears as desktop notifications. Settings do not
persist yet
2017-01-02 14:09:57 +01:00
Eugen Rochko
3e6b5d67dd Fix uri expansion during remote follow 2017-01-02 12:19:02 +01:00
Eugen Rochko
043d9114bf Federate blocks with the http://mastodon.social/schema/1.0 verb namespace 2017-01-02 12:17:51 +01:00
Eugen Rochko
95cc044a53 Update screenshot on about page 2017-01-01 19:55:33 +01:00
Eugen Rochko
df2f14d2dd Adding remote follow button 2017-01-01 19:54:34 +01:00
Eugen Rochko
d7bc0d8a33 Set in_reply_to_account on statuses to non-self value when possible, thus
resolving the confusion from self-chain replies ultimately linking to a
non-self status. Adjust filters
2016-12-31 14:36:25 +01:00
Eugen Rochko
6a20c13009 Add API for retrieving favourites 2016-12-29 20:33:26 +01:00
Eugen Rochko
2bc6e7c96e Add API for retrieving blocked accounts 2016-12-29 20:12:32 +01:00
Eugen Rochko
4030321d95 Support remote follow request providing URL instead of acct 2016-12-29 17:23:27 +01:00
Eugen Rochko
57f6f80838 Add ability to use remote follow function on other sites 2016-12-29 16:54:54 +01:00
Eugen Rochko
34febf75be Fix wrong person being notified after nested reblog call, fix favourites leaking private toots in Atom feeds 2016-12-28 13:21:12 +01:00
Eugen Rochko
bef225e5da Add illustration to getting started column 2016-12-27 23:30:11 +01:00
Eugen
68a18eb852 Add getting started illustration 2016-12-27 23:18:56 +01:00
Eugen Rochko
fde1917a54 Add preferences for follow request notification e-mails 2016-12-26 22:04:16 +01:00
Eugen Rochko
35f3b6bbf6 Only display follow requests link in getting started window if account is locked 2016-12-26 21:55:52 +01:00
Eugen Rochko
cef68b9b1c Follow requests send e-mail notifications, but are excluded from notifications API
Better initial state for unlisted/nsfw toggles
2016-12-26 21:52:03 +01:00
Eugen Rochko
6a54df90c8 Replacing follow requests in the settings area with in-UI column 2016-12-26 21:33:51 +01:00
Eugen Rochko
ef9e827c54 Adding follow requests API 2016-12-26 19:30:45 +01:00
Eugen Rochko
1ed3bb3a02 Don't show statuses to blocked users 2016-12-26 19:13:56 +01:00
Eugen Rochko
d253b0dec6 Fix #86 - resolve layout breaking on zoom-out on accounts grid 2016-12-26 18:48:33 +01:00
Eugen Rochko
4afc13868b Fix #357 - Also make textarea blur close suggestions which make it more accessible on touch devices 2016-12-24 01:39:14 +01:00
Eugen Rochko
d25168bc1e Fix #367 - Lock icon instead of retweet icon on boost button on private statuses 2016-12-24 01:33:55 +01:00
Eugen Rochko
1d40662609 Hide unlisted toggle when private is active, hide nsfw toggle when no files added 2016-12-24 01:28:10 +01:00
Anthony Bellew
dfc95491f1 Re-add unlisted toggle to the UI 2016-12-24 01:28:02 +01:00
Eugen Rochko
9e0bd72434 Fix account timelines bug 2016-12-23 01:13:16 +01:00
Eugen Rochko
64a3048f33 Fix alignment 2016-12-23 00:45:16 +01:00
Eugen Rochko
cec209dbad Fix confirmation email being sent to old address when changing it 2016-12-23 00:43:03 +01:00
Eugen Rochko
4839ab3998 Compose form in the UI now has public/private toggle instead of public/unlisted 2016-12-23 00:38:16 +01:00
Eugen Rochko
302051ffcb Add page for authorizing/rejecting follow requests 2016-12-23 00:04:52 +01:00
Eugen Rochko
77cd58545d Re-enable Webfinger for locked accounts but don't handle "follow" events
coming in via Salmon.

Currently no way to prevent remote follows, but they will only receive public
and unlisted posts
2016-12-22 23:17:57 +01:00
Eugen Rochko
337c3d0ed8 Private posts mentioning non-followers should not notify them, neither locally nor via Salmon 2016-12-22 23:14:24 +01:00
Eugen Rochko
a3680345b7 Hide follow/unfollow button from public page if follow already requested 2016-12-22 23:07:46 +01:00
Eugen Rochko
238233440f Follow call on locked account creates follow request instead
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
2016-12-22 23:03:57 +01:00
Eugen Rochko
09a477c782 Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users 2016-12-22 21:34:19 +01:00
Eugen Rochko
11e2159859 Merge branch 'master' into development 2016-12-22 11:35:00 +01:00
Eugen Rochko
8038c663b0 Ensure that reblogs and favs always refer to the original status rather than a reblog wrapper 2016-12-22 11:34:05 +01:00
Eugen Rochko
bb74b9787a Fix notifications reducer bug 2016-12-22 11:23:30 +01:00
Eugen Rochko
d417da7d3a Private visibility on statuses prevents non-followers from seeing those
Filters out hidden stream entries from Atom feed
Blocks now generate hidden stream entries, can be used to federate blocks
Private statuses cannot be reblogged (generates generic 422 error for now)
POST /api/v1/statuses now takes visibility=(public|unlisted|private) param instead of unlisted boolean
Statuses JSON now contains visibility=(public|unlisted|private) field
2016-12-21 20:04:13 +01:00
Eugen Rochko
8057380928 Federated profile bio now formatted 2016-12-21 19:10:19 +01:00
Eugen Rochko
c06069563a Fix #250 - no text adjust 2016-12-21 00:56:13 +01:00
Eugen Rochko
ecfd51aaef Improved launcher icon on Android 2016-12-21 00:28:57 +01:00
Eugen Rochko
090e3a245d Fix #249 - use window.location hack to let people login from sandboxed iOS homescreen 2016-12-21 00:13:13 +01:00
Toby Pinder
d22dba776a Smush assets for quicker load times/less bandwidth used. 2016-12-20 19:49:44 +00:00
Eugen Rochko
0f4c9d1124 Adding some rescues to workers, e.g. don't fail removal job when status can't be found in the first place (already removed) 2016-12-19 09:31:12 +01:00
Eugen Rochko
b2945b025f Make unfavouriting async to prevent timeout errors from leaving orphaned records behind 2016-12-19 09:12:29 +01:00
Eugen
4bfaca1470 Merge pull request #356 from victorhck/master
added two missings spanish  translations
2016-12-18 21:22:46 +01:00
Eugen Rochko
346aae50b0 Adjusting public display of statuses to look similar to logged-in UI,
fix #361 with rich OEmbed display via iframe, fix #237 by hiding sensitive
content behind a spoiler on public pages
2016-12-18 19:47:11 +01:00
Eugen Rochko
6d7f3be2f6 Add OEmbed iframe HTML, convert emojis on public pages, increase size of attachment thumbnails 2016-12-18 15:20:39 +01:00
Eugen Rochko
9d4f96f440 Removing external hub completely, fix #333 fixing digit-only hashtags,
removing web app capability from non-webapp pages
2016-12-18 12:24:37 +01:00
Eugen Rochko
6bd9019458 Add a better cropped image 2016-12-15 01:07:58 +01:00
Eugen Rochko
85acac12c2 Adding art by cutewitchirl, open graph tags for about page 2016-12-15 00:59:49 +01:00
victorhck
b254629157 added to missings spanish translations 2016-12-14 18:43:00 +01:00
Eugen Rochko
001fee6bd5 Fix key up listener on compose form 2016-12-14 18:38:28 +01:00
Eugen Rochko
d088b3cade Re-implemented autosuggestions component for the compose form
Fix #205, fix #156, fix #124
2016-12-14 18:21:31 +01:00