Commit Graph

996 Commits (babc6a1528e2f7d777d81a972f2d50c58381f45e)
 

Author SHA1 Message Date
Eugen babc6a1528 Merge pull request #461 from vjackson725/master
fix Vagrantfile so that the correct ruby is installed
8 years ago
vjackson725 91dc21c469 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.
8 years ago
Eugen Rochko 8f54a8851a Add rake task for clearing out media from silenced accounts 8 years ago
Eugen Rochko 4a2ee43e80 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) 8 years ago
Eugen Rochko 7951e7ffd5 Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
fix bug in process feed service
8 years ago
Eugen 10739df458 Merge pull request #456 from ineffyble/fix-repo-url
Fix repo URL
8 years ago
Eugen Rochko 3ad0496ccb Better animations 8 years ago
Effy Elden f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places 8 years ago
Eugen 4292cf60ae Fix env variable name 8 years ago
Eugen Rochko 18b11100e7 Fix issue when settings are not defined for column type 8 years ago
Eugen Rochko 312c51b5c8 Home column filters 8 years ago
Eugen Rochko 1e9d2c4b1e Add "not found" component to UI 8 years ago
Eugen a1db2a191b Add link to list of apps 8 years ago
Eugen 67a31454ad Merge pull request #450 from blackle/master
simplify emojification on public pages with .emojify class
8 years ago
blackle 917cf0bf5d simplify emojification on public pages with .emojify class 8 years ago
Eugen Rochko 205ba00017 Fix sandboxed iOS login again 8 years ago
Eugen Rochko 5d558c14b4 Merge branch 'blackle-master' 8 years ago
Eugen Rochko def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 8 years ago
Eugen Rochko d6a456dc71 Merge branch 'blackle-dropdown' 8 years ago
Eugen Rochko 3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown 8 years ago
Eugen Rochko 75f80bef10 Persist UI settings, add missing localizations for German 8 years ago
Eugen Rochko 23ebf60b95 Improve initialState loading 8 years ago
blackle 131bae89fd Generate key for each input so we can upload the same file even after deleting 8 years ago
blackle d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile 8 years ago
Eugen Rochko 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in #437 8 years ago
Eugen 38bc85e695 Merge pull request #443 from blackle/master
Add call-to developers on getting started page
8 years ago
Eugen a8e30060ae Merge pull request #446 from blackle/dropdown2
Expand dropdown leftways on status view
8 years ago
blackle 05e964688d Expand dropdown leftways on status view 8 years ago
blackle b4f09bae1d Add call-to developers on getting started page 8 years ago
Eugen 69643338f6 Merge pull request #437 from krainboltgreene/patch-1
Simplifying followers mappings
8 years ago
Eugen e8d6f6c8c1 Merge pull request #436 from krainboltgreene/patch-2
Less complicated determination of subscription
8 years ago
Eugen db8a088502 Update badges 8 years ago
Kurtis Rainbolt-Greene abe3ae1cc2 Simplifying followers mappings
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
8 years ago
Kurtis Rainbolt-Greene 4a7e3e5082 Less complicated determination 8 years ago
Eugen 6d097d559b Merge pull request #434 from vjackson725/fix_vagrantfile
Fix Vagrantfile to include yarn
8 years ago
Eugen 4447c4c7c8 Merge pull request #435 from krainboltgreene/patch-1
Using "rails style" order arguments
8 years ago
Kurtis Rainbolt-Greene e5d9009d71 Using "rails style" order arguments 8 years ago
vjackson725 db3d5d811c 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.
8 years ago
Eugen 7a0a13ab53 Merge pull request #432 from blackle/volume-icon
Show correct volume icons on video player
8 years ago
blackle 8a571158c9 Show correct volume icons on video player 8 years ago
Eugen cec7e69827 Merge pull request #430 from blackle/logout_mobile
Show logout button on getting started so it's available on mobile
8 years ago
blackle e1ca354956 Show logout button on getting started so it's available on mobile 8 years ago
Eugen 679aa35e15 Merge pull request #429 from blackle/emojify_usernames
Emojify display names in notifcations
8 years ago
blackle 57ff221c0f Emojify display names in notifcations 8 years ago
Eugen 165df323ae Merge pull request #428 from blackle/contrast
Improve contrast of bio and username text in account info
8 years ago
blackle 61211b509c Improve contrast of bio and username text in account info 8 years ago
Eugen 2fbb38e4b2 Merge pull request #425 from ineffyble/vagrant
Add Vagrant support for easy development environments
8 years ago
Eugen Rochko be6ae3546f Replace getting started icon on desktop nav bar with asterisk instead of hamburger 8 years ago
Eugen Rochko 5c7add2176 Fix #147 - Unreblogging will leave original status in feeds 8 years ago
Eugen Rochko 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images 8 years ago