780df33037
Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive
2017-01-16 11:36:02 +01:00
972fb80de6
Move follow requests link above logout link in getting started column
2017-01-16 11:35:32 +01:00
9ac182d831
Show visibility toggle on media gallery for sensitive images
2017-01-15 20:27:08 -05:00
5c3c7c545c
Change boost sprite to look like fa-retweet
2017-01-15 11:40:05 -05:00
7e46083338
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
73e217d9d7
Fix #427 - don't suggest hashtag if the search value contains a space
2017-01-15 14:47:39 +01:00
58b0fe2f28
Fix #449 - don't do relationships fetch for empty array of IDs
2017-01-15 14:47:39 +01:00
11117f5aec
Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up
2017-01-15 14:47:39 +01:00
5d88ef90c9
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
3a957e127a
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
91edf829ec
Merge pull request #464 from blackle/backflip
...
Make boost button spin around
2017-01-15 13:19:15 +01:00
21c888fefd
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
80f186cdf0
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:30:23 +11:00
c10a41e89e
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:27:54 +11:00
77e78ed6aa
Make boost button arrows spin around
2017-01-14 17:56:24 -05:00
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
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
e751dd669a
Fix typo in rel
2017-01-15 09:04:14 +11:00
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
49ff508743
Hide 'Do not display on public timeline' for reply toots. Fixes #412 .
2017-01-15 06:10:23 +11:00
4b384d6914
Fix too late return
2017-01-14 02:22:16 +01:00
8442a176c5
Improve extended about page layout
2017-01-13 20:27:02 +01:00
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
533448be42
Add extended about page stub
2017-01-13 03:24:41 +01:00
6d98465db2
Extend rails-settings-cached to merge db-saved hash values with defaults
2017-01-13 02:42:22 +01:00
1a30737ff5
Add settings for contact information
2017-01-12 20:54:14 +01:00
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
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
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
9eb3f68499
Merge pull request #456 from ineffyble/fix-repo-url
...
Fix repo URL
2017-01-11 14:19:19 +01:00
efd8ce920f
Better animations
2017-01-11 04:21:49 +01:00
ad61a21752
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
bc17613e70
Fix issue when settings are not defined for column type
2017-01-10 17:33:32 +01:00
c8bcd413e2
Home column filters
2017-01-10 17:25:10 +01:00
15b183117c
Add "not found" component to UI
2017-01-10 13:50:59 +01:00
efd4565389
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
57e496e1bc
simplify emojification on public pages with .emojify class
2017-01-09 22:41:47 -05:00
0c0d4b7c92
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
394f185e91
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-01-09 14:12:40 +01:00
a1783b80b2
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
2017-01-09 14:10:32 +01:00
4293e132d1
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
c1c814e6a1
Improve initialState loading
2017-01-09 12:37:53 +01:00
62167338b8
Generate key for each input so we can upload the same file even after deleting
2017-01-08 21:00:13 -05:00
a697b5473a
Switch to compose view when tapping 'mention' in dropdown on mobile
2017-01-08 17:12:00 -05:00
f29df16eea
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
9f3e2737e9
Merge pull request #443 from blackle/master
...
Add call-to developers on getting started page
2017-01-08 13:36:02 +01:00
9d66dfecf6
Expand dropdown leftways on status view
2017-01-08 06:32:37 -05:00
1adfe59c14
Add call-to developers on getting started page
2017-01-08 00:23:22 -05:00
72843ea705
Merge pull request #437 from krainboltgreene/patch-1
...
Simplifying followers mappings
2017-01-08 04:14:54 +01:00
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
ff835f3377
Less complicated determination
2017-01-07 17:59:51 -08:00
82b0eb2ae4
Using "rails style" order arguments
2017-01-07 17:55:40 -08:00
3f639be601
Merge pull request #432 from blackle/volume-icon
...
Show correct volume icons on video player
2017-01-08 02:36:12 +01:00
85cc2dd826
Show correct volume icons on video player
2017-01-07 20:23:15 -05:00
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
8ceae22535
Show logout button on getting started so it's available on mobile
2017-01-07 18:41:57 -05:00
75c2397ed1
Emojify display names in notifcations
2017-01-07 18:16:14 -05:00
a914180df6
Improve contrast of bio and username text in account info
2017-01-07 16:39:30 -05:00
d019f1632c
Replace getting started icon on desktop nav bar with asterisk instead of hamburger
2017-01-07 15:46:39 +01:00
126aba0e13
Fix #147 - Unreblogging will leave original status in feeds
2017-01-07 15:44:22 +01:00
0dac73b5cc
Add tab bar alternative to desktop UI, upgrade react & react-redux
2017-01-06 22:09:55 +01:00
26390b1997
Clean up h-card mess of divs
2017-01-06 20:24:51 +01:00
ecd7a46f98
Fix h-card classes and remote follow button appearing when it shouldn't
2017-01-06 20:15:24 +01:00
8d6361b40b
Add Microformats2 markup
...
h-feed, h-card and h-entry
2017-01-06 18:10:10 +03:00
2804ccc958
Merge pull request #417 from ineffyble/twitter-card-metadata
...
Twitter Cards support
2017-01-06 01:16:45 +01:00
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
fe31b43b75
Add twitter:card metatag to enable Twitter Cards support
2017-01-06 09:47:40 +11:00
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
6bbc2c7954
Fixed unexpected error
2017-01-05 14:23:59 +01:00
3f1dff3dfd
Fix compose form bug
2017-01-05 14:18:38 +01:00
b2ea21b3c9
Fix selection resetting in compose form after unrelated data updates
2017-01-05 14:11:18 +01:00
45e5326307
Revert to Roboto for all
2017-01-05 13:59:58 +01:00
8b35bd2b92
Revert "Display native emoji on browsers which support it"
2017-01-05 13:45:21 +01:00
06a9a0a0f4
Merge pull request #403 from ticky/use-system-fonts
...
Use system fonts on more platforms
2017-01-05 13:37:48 +01:00
9f3babd80f
Merge pull request #404 from mistydemeo/emoji
...
Display native emoji on browsers which support it
2017-01-05 13:37:29 +01:00
d8197c27eb
Merge pull request #399 from ticky/public-timeline-de-hoist
...
Public timeline de-hoist
2017-01-05 13:36:55 +01:00
30adea06fb
Merge pull request #400 from ticky/differentiate-settings-links
...
Differentiate settings links
2017-01-05 13:36:13 +01:00
8579c4ae01
Bump emoji requirement to Unicode 9
2017-01-04 22:47:51 -08:00
8dfb4048cc
Display native emoji on browsers which support it
2017-01-04 22:23:02 -08:00
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
8745871737
Automatically position cursor when writing a reply toot
2017-01-04 20:04:14 -08:00
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
1ff1f5d344
Remove hamburger from "getting started"
2017-01-04 19:30:39 -08:00
9953f14df9
Replace "Public" in tab bar with "More" hamburger
2017-01-04 19:30:22 -08:00
b02a33430f
Move "getting started" to its own route
2017-01-04 19:30:02 -08:00
51a491d49a
Merge pull request #394 from ticky/email-reblog-to-boost
...
"Reblog" -> "boost" in more places
2017-01-05 03:35:22 +01:00
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
bfcae97e4a
Merge pull request #397 from ticky/friendlier-unknown-errors
...
Friendlier unknown errors
2017-01-05 03:34:06 +01:00
d07f9f5757
Merge pull request #396 from ticky/fix-cmd-enter
...
Fix Command-enter tooting
2017-01-05 03:34:01 +01:00
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
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
a893746e5a
Improve background jobs params and error handling
2017-01-05 03:28:21 +01:00
66c5363bae
Fix undesired delivering of private toot to remote accounts that follow author
2017-01-05 03:17:23 +01:00
2de668bcf9
Make shortcode emojis work, make getting started area scrollable
2017-01-05 03:14:33 +01:00
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
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
40bdd8905d
Disallow compose navbar from being shrunk
2017-01-04 17:44:41 -08:00
7104775362
Stop Mastodon friend from overlapping text 🐘
2017-01-04 17:33:05 -08:00
97b3e63776
Make tabs bar take up less room on 4-inch phones
2017-01-04 17:32:11 -08:00
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