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
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
