3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,080 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

832 Commits (956da43e19e484f94df91f715e4a88794a25dbec)

Author SHA1 Message Date
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
Jessica Stokes 3807b0b171
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 98b83aca37 Fix #391 - relative timestamps now contain an exact datetime in title 2017-01-04 15:43:28 +01:00
Eugen Rochko 1bbcd71cd4 Fix #390 - fix redirect after sign-up (to login page instead of homepage) 2017-01-04 15:31:25 +01:00
Anthony Bellew 1fcb807d91 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 4d300e2507 On file-drag, show a border around textarea 2017-01-03 00:43:45 -08:00
Eugen Rochko 3125dd8920 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 86be6d48c9 Fix accidental distribution of hidden stream entries to PuSH subscribers 2017-01-03 00:44:23 +01:00
Eugen Rochko f79ba2de83 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 136e18b875 Unblocks also federate 2017-01-02 14:19:02 +01:00
Eugen Rochko 65647a2472 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 75122e162d Fix uri expansion during remote follow 2017-01-02 12:19:02 +01:00
Eugen Rochko c04002b340 Federate blocks with the http://mastodon.social/schema/1.0 verb namespace 2017-01-02 12:17:51 +01:00
Eugen Rochko 9f9e11ce07 Update screenshot on about page 2017-01-01 19:55:33 +01:00
Eugen Rochko 8f47f6a7ec Adding remote follow button 2017-01-01 19:54:34 +01:00
Eugen Rochko 8d44281677 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 a302e56f9a Add API for retrieving favourites 2016-12-29 20:33:26 +01:00
Eugen Rochko 49834a6e7f Add API for retrieving blocked accounts 2016-12-29 20:12:32 +01:00
Eugen Rochko 8724094ed0 Support remote follow request providing URL instead of acct 2016-12-29 17:23:27 +01:00
Eugen Rochko d7dc84439c Add ability to use remote follow function on other sites 2016-12-29 16:54:54 +01:00
Eugen Rochko 8b94d283fb 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 e2c2fefc36 Add illustration to getting started column 2016-12-27 23:30:11 +01:00
Eugen 9aaf223ae2 Add getting started illustration 2016-12-27 23:18:56 +01:00
Eugen Rochko eca6110fc4 Add preferences for follow request notification e-mails 2016-12-26 22:04:16 +01:00
Eugen Rochko 5418df467d Only display follow requests link in getting started window if account is locked 2016-12-26 21:55:52 +01:00