]> cat aescling's git repositories - mastodon.git/log
mastodon.git
9 years agoMake boost button arrows spin around
blackle [Sat, 14 Jan 2017 04:32:27 +0000 (23:32 -0500)]
Make boost button arrows spin around

9 years agoFix too late return
Eugen [Sat, 14 Jan 2017 01:22:16 +0000 (02:22 +0100)]
Fix too late return

9 years agoImprove extended about page layout
Eugen Rochko [Fri, 13 Jan 2017 19:27:02 +0000 (20:27 +0100)]
Improve extended about page layout

9 years agoAdding about/more page with extended information that can be set up by an admin
Eugen Rochko [Fri, 13 Jan 2017 19:14:21 +0000 (20:14 +0100)]
Adding about/more page with extended information that can be set up by an admin

9 years agoAdd extended about page stub
Eugen Rochko [Fri, 13 Jan 2017 02:24:41 +0000 (03:24 +0100)]
Add extended about page stub

9 years agoExtend rails-settings-cached to merge db-saved hash values with defaults
Eugen Rochko [Fri, 13 Jan 2017 01:42:22 +0000 (02:42 +0100)]
Extend rails-settings-cached to merge db-saved hash values with defaults

9 years agoAdd settings for contact information
Eugen Rochko [Thu, 12 Jan 2017 19:54:14 +0000 (20:54 +0100)]
Add settings for contact information

9 years agoMigrate from ledermann/rails-settings to rails-settings-cached which allows global...
Eugen Rochko [Thu, 12 Jan 2017 19:46:24 +0000 (20:46 +0100)]
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

9 years agoMerge pull request #461 from vjackson725/master
Eugen [Thu, 12 Jan 2017 12:50:17 +0000 (13:50 +0100)]
Merge pull request #461 from vjackson725/master

fix Vagrantfile so that the correct ruby is installed

9 years agofix Vagrantfile so that the correct ruby is installed
vjackson725 [Thu, 12 Jan 2017 12:20:55 +0000 (23:20 +1100)]
fix Vagrantfile so that the correct ruby is installed

Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit mastodon@7951e7f, this no longer works.

Change the provision scrip so that 2.3.1 is installed via rbenv. Note this drastically increases provision time.

9 years agoAdd rake task for clearing out media from silenced accounts
Eugen Rochko [Thu, 12 Jan 2017 03:19:04 +0000 (04:19 +0100)]
Add rake task for clearing out media from silenced accounts

9 years agoFix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss...
Eugen Rochko [Thu, 12 Jan 2017 02:54:50 +0000 (03:54 +0100)]
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)

9 years agoAdd ruby version to Gemfile, move devDependencies in package.json to dependencies,
Eugen Rochko [Wed, 11 Jan 2017 14:39:31 +0000 (15:39 +0100)]
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
fix bug in process feed service

9 years agoMerge pull request #456 from ineffyble/fix-repo-url
Eugen [Wed, 11 Jan 2017 13:19:19 +0000 (14:19 +0100)]
Merge pull request #456 from ineffyble/fix-repo-url

Fix repo URL

9 years agoBetter animations
Eugen Rochko [Wed, 11 Jan 2017 03:21:49 +0000 (04:21 +0100)]
Better animations

9 years agoUpdate the Mastodon repository URL from Gargron/ to tootsuite/ in various places
Effy Elden [Wed, 11 Jan 2017 02:24:14 +0000 (13:24 +1100)]
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places

9 years agoFix env variable name
Eugen [Tue, 10 Jan 2017 21:01:13 +0000 (22:01 +0100)]
Fix env variable name

9 years agoFix issue when settings are not defined for column type
Eugen Rochko [Tue, 10 Jan 2017 16:33:32 +0000 (17:33 +0100)]
Fix issue when settings are not defined for column type

9 years agoHome column filters
Eugen Rochko [Tue, 10 Jan 2017 16:25:10 +0000 (17:25 +0100)]
Home column filters

9 years agoAdd "not found" component to UI
Eugen Rochko [Tue, 10 Jan 2017 12:50:40 +0000 (13:50 +0100)]
Add "not found" component to UI

9 years agoAdd link to list of apps
Eugen [Tue, 10 Jan 2017 11:23:30 +0000 (12:23 +0100)]
Add link to list of apps

9 years agoMerge pull request #450 from blackle/master
Eugen [Tue, 10 Jan 2017 11:21:06 +0000 (12:21 +0100)]
Merge pull request #450 from blackle/master

simplify emojification on public pages with .emojify class

9 years agosimplify emojification on public pages with .emojify class
blackle [Tue, 10 Jan 2017 03:40:45 +0000 (22:40 -0500)]
simplify emojification on public pages with .emojify class

9 years agoFix sandboxed iOS login again
Eugen Rochko [Mon, 9 Jan 2017 18:43:53 +0000 (19:43 +0100)]
Fix sandboxed iOS login again

9 years agoMerge branch 'blackle-master'
Eugen Rochko [Mon, 9 Jan 2017 13:13:46 +0000 (14:13 +0100)]
Merge branch 'blackle-master'

9 years agoMerge branch 'master' of https://github.com/blackle/mastodon into blackle-master
Eugen Rochko [Mon, 9 Jan 2017 13:12:40 +0000 (14:12 +0100)]
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

9 years agoMerge branch 'blackle-dropdown'
Eugen Rochko [Mon, 9 Jan 2017 13:12:00 +0000 (14:12 +0100)]
Merge branch 'blackle-dropdown'

9 years agoMerge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
Eugen Rochko [Mon, 9 Jan 2017 13:10:32 +0000 (14:10 +0100)]
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown

9 years agoPersist UI settings, add missing localizations for German
Eugen Rochko [Mon, 9 Jan 2017 13:00:55 +0000 (14:00 +0100)]
Persist UI settings, add missing localizations for German

9 years agoImprove initialState loading
Eugen Rochko [Mon, 9 Jan 2017 11:37:15 +0000 (12:37 +0100)]
Improve initialState loading

9 years agoGenerate key for each input so we can upload the same file even after deleting
blackle [Mon, 9 Jan 2017 02:00:13 +0000 (21:00 -0500)]
Generate key for each input so we can upload the same file even after deleting

9 years agoSwitch to compose view when tapping 'mention' in dropdown on mobile
blackle [Sun, 8 Jan 2017 10:04:01 +0000 (05:04 -0500)]
Switch to compose view when tapping 'mention' in dropdown on mobile

9 years agoFix Paperclip timeout setting. Fix bug introduced in #437
Eugen Rochko [Sun, 8 Jan 2017 18:12:54 +0000 (19:12 +0100)]
Fix Paperclip timeout setting. Fix bug introduced in #437

9 years agoMerge pull request #443 from blackle/master
Eugen [Sun, 8 Jan 2017 12:36:02 +0000 (13:36 +0100)]
Merge pull request #443 from blackle/master

Add call-to developers on getting started page

9 years agoMerge pull request #446 from blackle/dropdown2
Eugen [Sun, 8 Jan 2017 12:34:27 +0000 (13:34 +0100)]
Merge pull request #446 from blackle/dropdown2

Expand dropdown leftways on status view

9 years agoExpand dropdown leftways on status view
blackle [Sun, 8 Jan 2017 11:32:37 +0000 (06:32 -0500)]
Expand dropdown leftways on status view

9 years agoAdd call-to developers on getting started page
blackle [Sun, 8 Jan 2017 05:23:22 +0000 (00:23 -0500)]
Add call-to developers on getting started page

9 years agoMerge pull request #437 from krainboltgreene/patch-1
Eugen [Sun, 8 Jan 2017 03:14:54 +0000 (04:14 +0100)]
Merge pull request #437 from krainboltgreene/patch-1

Simplifying followers mappings

9 years agoMerge pull request #436 from krainboltgreene/patch-2
Eugen [Sun, 8 Jan 2017 03:00:22 +0000 (04:00 +0100)]
Merge pull request #436 from krainboltgreene/patch-2

Less complicated determination of subscription

9 years agoUpdate badges
Eugen [Sun, 8 Jan 2017 02:47:33 +0000 (03:47 +0100)]
Update badges

9 years agoSimplifying followers mappings
Kurtis Rainbolt-Greene [Sun, 8 Jan 2017 02:09:00 +0000 (18:09 -0800)]
Simplifying followers mappings

Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.

9 years agoLess complicated determination
Kurtis Rainbolt-Greene [Sun, 8 Jan 2017 01:59:51 +0000 (17:59 -0800)]
Less complicated determination

9 years agoMerge pull request #434 from vjackson725/fix_vagrantfile
Eugen [Sun, 8 Jan 2017 01:58:43 +0000 (02:58 +0100)]
Merge pull request #434 from vjackson725/fix_vagrantfile

Fix Vagrantfile to include yarn

9 years agoMerge pull request #435 from krainboltgreene/patch-1
Eugen [Sun, 8 Jan 2017 01:58:19 +0000 (02:58 +0100)]
Merge pull request #435 from krainboltgreene/patch-1

Using "rails style" order arguments

9 years agoUsing "rails style" order arguments
Kurtis Rainbolt-Greene [Sun, 8 Jan 2017 01:55:40 +0000 (17:55 -0800)]
Using "rails style" order arguments

9 years agoFix Vagrantfile to include yarn
vjackson725 [Sun, 8 Jan 2017 01:38:04 +0000 (12:38 +1100)]
Fix Vagrantfile to include yarn

The current Vagrantfile fails to build upon provisioning, as it lacks yarn.

Change the Vagrantfile to add the yarn repository, and install yarn.

9 years agoMerge pull request #432 from blackle/volume-icon
Eugen [Sun, 8 Jan 2017 01:36:12 +0000 (02:36 +0100)]
Merge pull request #432 from blackle/volume-icon

Show correct volume icons on video player

9 years agoShow correct volume icons on video player
blackle [Sun, 8 Jan 2017 01:21:50 +0000 (20:21 -0500)]
Show correct volume icons on video player

9 years agoMerge pull request #430 from blackle/logout_mobile
Eugen [Sun, 8 Jan 2017 00:24:06 +0000 (01:24 +0100)]
Merge pull request #430 from blackle/logout_mobile

Show logout button on getting started so it's available on mobile

9 years agoShow logout button on getting started so it's available on mobile
blackle [Sat, 7 Jan 2017 23:41:57 +0000 (18:41 -0500)]
Show logout button on getting started so it's available on mobile

9 years agoMerge pull request #429 from blackle/emojify_usernames
Eugen [Sat, 7 Jan 2017 23:19:24 +0000 (00:19 +0100)]
Merge pull request #429 from blackle/emojify_usernames

Emojify display names in notifcations

9 years agoEmojify display names in notifcations
blackle [Sat, 7 Jan 2017 23:16:14 +0000 (18:16 -0500)]
Emojify display names in notifcations

9 years agoMerge pull request #428 from blackle/contrast
Eugen [Sat, 7 Jan 2017 21:51:15 +0000 (22:51 +0100)]
Merge pull request #428 from blackle/contrast

Improve contrast of bio and username text in account info

9 years agoImprove contrast of bio and username text in account info
blackle [Sat, 7 Jan 2017 21:39:30 +0000 (16:39 -0500)]
Improve contrast of bio and username text in account info

9 years agoMerge pull request #425 from ineffyble/vagrant
Eugen [Sat, 7 Jan 2017 17:31:59 +0000 (18:31 +0100)]
Merge pull request #425 from ineffyble/vagrant

Add Vagrant support for easy development environments

9 years agoReplace getting started icon on desktop nav bar with asterisk instead of hamburger
Eugen Rochko [Sat, 7 Jan 2017 14:46:39 +0000 (15:46 +0100)]
Replace getting started icon on desktop nav bar with asterisk instead of hamburger

9 years agoFix #147 - Unreblogging will leave original status in feeds
Eugen Rochko [Sat, 7 Jan 2017 14:44:22 +0000 (15:44 +0100)]
Fix #147 - Unreblogging will leave original status in feeds

9 years agoAdd read timeout to paperclip when it's downloading remote images
Eugen Rochko [Sat, 7 Jan 2017 14:43:56 +0000 (15:43 +0100)]
Add read timeout to paperclip when it's downloading remote images

9 years agoTweak Vagrant info in README
Effy Elden [Sat, 7 Jan 2017 14:30:48 +0000 (01:30 +1100)]
Tweak Vagrant info in README

9 years agoImprove Vagrantfile, load environment variables from .env.vagrant, always forward...
Effy Elden [Sat, 7 Jan 2017 14:28:49 +0000 (01:28 +1100)]
Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000

9 years agoAdd Vagrant development environment support
Effy Elden [Sat, 7 Jan 2017 12:22:24 +0000 (23:22 +1100)]
Add Vagrant development environment support

9 years agoAdd tab bar alternative to desktop UI, upgrade react & react-redux
Eugen Rochko [Fri, 6 Jan 2017 21:09:55 +0000 (22:09 +0100)]
Add tab bar alternative to desktop UI, upgrade react & react-redux

9 years agoClean up h-card mess of divs
Eugen Rochko [Fri, 6 Jan 2017 19:24:51 +0000 (20:24 +0100)]
Clean up h-card mess of divs

9 years agoFix h-card classes and remote follow button appearing when it shouldn't
Eugen Rochko [Fri, 6 Jan 2017 19:15:24 +0000 (20:15 +0100)]
Fix h-card classes and remote follow button appearing when it shouldn't

9 years agoMerge branch 'myfreeweb-master'
Eugen Rochko [Fri, 6 Jan 2017 19:09:34 +0000 (20:09 +0100)]
Merge branch 'myfreeweb-master'

9 years agoAdd Microformats2 markup
Greg V [Fri, 6 Jan 2017 15:08:40 +0000 (18:08 +0300)]
Add Microformats2 markup

h-feed, h-card and h-entry

9 years agoMerge pull request #417 from ineffyble/twitter-card-metadata
Eugen [Fri, 6 Jan 2017 00:16:45 +0000 (01:16 +0100)]
Merge pull request #417 from ineffyble/twitter-card-metadata

Twitter Cards support

9 years agoMerge pull request #418 from ticky/upgrade-emojione
Eugen [Fri, 6 Jan 2017 00:13:34 +0000 (01:13 +0100)]
Merge pull request #418 from ticky/upgrade-emojione

Upgrade EmojiOne to 2.2.7

9 years agoFix #416 - Generate random unique 14-byte (19 characters) shortcodes
Eugen Rochko [Thu, 5 Jan 2017 23:21:12 +0000 (00:21 +0100)]
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.

9 years agoUpgrade EmojiOne to 2.2.7
Jessica Stokes [Thu, 5 Jan 2017 23:16:13 +0000 (15:16 -0800)]
Upgrade EmojiOne to 2.2.7

Adds support for, among other things, 🏳️‍🌈

9 years agoAdd twitter:card metatag to enable Twitter Cards support
Effy Elden [Thu, 5 Jan 2017 22:47:40 +0000 (09:47 +1100)]
Add twitter:card metatag to enable Twitter Cards support

9 years agoMerge pull request #415 from ineffyble/master
Eugen [Thu, 5 Jan 2017 22:15:01 +0000 (23:15 +0100)]
Merge pull request #415 from ineffyble/master

Prevent duplicate desktop notifications

9 years agoAdd tag property to desktop notifications, preventing duplicates (i.e. when multiple...
Effy Elden [Thu, 5 Jan 2017 21:26:45 +0000 (08:26 +1100)]
Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open)

9 years agoFixed unexpected error
Eugen Rochko [Thu, 5 Jan 2017 13:23:59 +0000 (14:23 +0100)]
Fixed unexpected error

9 years agoFix compose form bug
Eugen Rochko [Thu, 5 Jan 2017 13:18:38 +0000 (14:18 +0100)]
Fix compose form bug

9 years agoFix selection resetting in compose form after unrelated data updates
Eugen Rochko [Thu, 5 Jan 2017 13:06:09 +0000 (14:06 +0100)]
Fix selection resetting in compose form after unrelated data updates

9 years agoRevert to Roboto for all
Eugen Rochko [Thu, 5 Jan 2017 12:59:58 +0000 (13:59 +0100)]
Revert to Roboto for all

9 years agoMerge pull request #406 from Gargron/revert-404-emoji
Eugen [Thu, 5 Jan 2017 12:45:37 +0000 (13:45 +0100)]
Merge pull request #406 from Gargron/revert-404-emoji

Revert "Display native emoji on browsers which support it"

9 years agoRevert "Display native emoji on browsers which support it"
Eugen [Thu, 5 Jan 2017 12:45:21 +0000 (13:45 +0100)]
Revert "Display native emoji on browsers which support it"

9 years agoMerge pull request #403 from ticky/use-system-fonts
Eugen [Thu, 5 Jan 2017 12:37:48 +0000 (13:37 +0100)]
Merge pull request #403 from ticky/use-system-fonts

Use system fonts on more platforms

9 years agoMerge pull request #404 from mistydemeo/emoji
Eugen [Thu, 5 Jan 2017 12:37:29 +0000 (13:37 +0100)]
Merge pull request #404 from mistydemeo/emoji

Display native emoji on browsers which support it

9 years agoMerge pull request #399 from ticky/public-timeline-de-hoist
Eugen [Thu, 5 Jan 2017 12:36:55 +0000 (13:36 +0100)]
Merge pull request #399 from ticky/public-timeline-de-hoist

Public timeline de-hoist

9 years agoMerge pull request #400 from ticky/differentiate-settings-links
Eugen [Thu, 5 Jan 2017 12:36:13 +0000 (13:36 +0100)]
Merge pull request #400 from ticky/differentiate-settings-links

Differentiate settings links

9 years agoMerge pull request #401 from mistydemeo/new_toot_cursor_position
Eugen [Thu, 5 Jan 2017 12:35:14 +0000 (13:35 +0100)]
Merge pull request #401 from mistydemeo/new_toot_cursor_position

Automatically position cursor when writing a reply toot

9 years agoBump emoji requirement to Unicode 9
Misty De Meo [Thu, 5 Jan 2017 06:47:51 +0000 (22:47 -0800)]
Bump emoji requirement to Unicode 9

9 years agoDisplay native emoji on browsers which support it
Misty De Meo [Thu, 5 Jan 2017 06:23:02 +0000 (22:23 -0800)]
Display native emoji on browsers which support it

9 years agoUse system fonts on more platforms
Jessica Stokes [Thu, 5 Jan 2017 04:24:27 +0000 (20:24 -0800)]
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!

9 years agoAutomatically position cursor when writing a reply toot
Misty De Meo [Thu, 5 Jan 2017 04:04:14 +0000 (20:04 -0800)]
Automatically position cursor when writing a reply toot

9 years agoDifferentiate settings links
Jessica Stokes [Thu, 5 Jan 2017 03:47:02 +0000 (19:47 -0800)]
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

9 years agoRemove hamburger from "getting started"
Jessica Stokes [Thu, 5 Jan 2017 03:30:39 +0000 (19:30 -0800)]
Remove hamburger from "getting started"

9 years agoReplace "Public" in tab bar with "More" hamburger
Jessica Stokes [Thu, 5 Jan 2017 03:30:22 +0000 (19:30 -0800)]
Replace "Public" in tab bar with "More" hamburger

9 years agoMove "getting started" to its own route
Jessica Stokes [Thu, 5 Jan 2017 03:30:02 +0000 (19:30 -0800)]
Move "getting started" to its own route

9 years agoMerge pull request #394 from ticky/email-reblog-to-boost
Eugen [Thu, 5 Jan 2017 02:35:22 +0000 (03:35 +0100)]
Merge pull request #394 from ticky/email-reblog-to-boost

"Reblog" -> "boost" in more places

9 years agoMerge pull request #395 from ticky/hide-media-list-if-no-media
Eugen [Thu, 5 Jan 2017 02:34:49 +0000 (03:34 +0100)]
Merge pull request #395 from ticky/hide-media-list-if-no-media

Don't render the media list when there's no media

9 years agoMerge pull request #397 from ticky/friendlier-unknown-errors
Eugen [Thu, 5 Jan 2017 02:34:06 +0000 (03:34 +0100)]
Merge pull request #397 from ticky/friendlier-unknown-errors

Friendlier unknown errors

9 years agoMerge pull request #396 from ticky/fix-cmd-enter
Eugen [Thu, 5 Jan 2017 02:34:01 +0000 (03:34 +0100)]
Merge pull request #396 from ticky/fix-cmd-enter

Fix Command-enter tooting

9 years agoFriendlier unknown errors
Jessica Stokes [Thu, 5 Jan 2017 02:31:45 +0000 (18:31 -0800)]
Friendlier unknown errors

Don't ask users to check the console - if they're on mobile, they probably can't anyway ;)

9 years agoFix Command-enter tooting
Jessica Stokes [Thu, 5 Jan 2017 02:29:43 +0000 (18:29 -0800)]
Fix Command-enter tooting

metaKey is only set correctly on keyDown, not keyUp, so this swaps to using that

9 years agoImprove background jobs params and error handling
Eugen Rochko [Thu, 5 Jan 2017 02:28:21 +0000 (03:28 +0100)]
Improve background jobs params and error handling

9 years agoFix undesired delivering of private toot to remote accounts that follow author
Eugen Rochko [Thu, 5 Jan 2017 02:17:23 +0000 (03:17 +0100)]
Fix undesired delivering of private toot to remote accounts that follow author