Effy Elden
3f84816b24
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
7 years ago
blackle
a67ffcbf56
Make boost button arrows spin around
7 years ago
Effy Elden
f81dc7a33a
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
7 years ago
Effy Elden
6c002cf615
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
7 years ago
Effy Elden
65122798b2
Fix typo in rel
7 years ago
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
7 years ago
Eugen
88801f7554
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
Hide 'Do not display on public timeline' for reply toots
7 years ago
Effy Elden
32d756fb22
Hide 'Do not display on public timeline' for reply toots. Fixes #412 .
7 years ago
Eugen
f63f0c4625
Fix too late return
7 years ago
Eugen Rochko
7cde08e30b
Improve extended about page layout
7 years ago
Eugen Rochko
c01dd089ff
Adding about/more page with extended information that can be set up by an admin
7 years ago
Eugen Rochko
e25170f960
Add extended about page stub
7 years ago
Eugen Rochko
2939e9898b
Extend rails-settings-cached to merge db-saved hash values with defaults
7 years ago
Eugen Rochko
ca50ceeaf0
Add settings for contact information
7 years ago
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
7 years ago
Eugen
babc6a1528
Merge pull request #461 from vjackson725/master
fix Vagrantfile so that the correct ruby is installed
7 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.
7 years ago
Eugen Rochko
8f54a8851a
Add rake task for clearing out media from silenced accounts
7 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)
7 years ago
Eugen Rochko
7951e7ffd5
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
fix bug in process feed service
7 years ago
Eugen
10739df458
Merge pull request #456 from ineffyble/fix-repo-url
Fix repo URL
7 years ago
Eugen Rochko
3ad0496ccb
Better animations
7 years ago
Effy Elden
f876a8681d
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
7 years ago
Eugen
4292cf60ae
Fix env variable name
7 years ago
Eugen Rochko
18b11100e7
Fix issue when settings are not defined for column type
7 years ago
Eugen Rochko
312c51b5c8
Home column filters
7 years ago
Eugen Rochko
1e9d2c4b1e
Add "not found" component to UI
7 years ago
Eugen
a1db2a191b
Add link to list of apps
7 years ago
Eugen
67a31454ad
Merge pull request #450 from blackle/master
simplify emojification on public pages with .emojify class
7 years ago
blackle
917cf0bf5d
simplify emojification on public pages with .emojify class
7 years ago
Eugen Rochko
205ba00017
Fix sandboxed iOS login again
7 years ago
Eugen Rochko
5d558c14b4
Merge branch 'blackle-master'
7 years ago
Eugen Rochko
def1f8c5b3
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
7 years ago
Eugen Rochko
d6a456dc71
Merge branch 'blackle-dropdown'
7 years ago
Eugen Rochko
3bddd647e0
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
7 years ago
Eugen Rochko
75f80bef10
Persist UI settings, add missing localizations for German
7 years ago
Eugen Rochko
23ebf60b95
Improve initialState loading
7 years ago
blackle
131bae89fd
Generate key for each input so we can upload the same file even after deleting
7 years ago
blackle
d64c454cfe
Switch to compose view when tapping 'mention' in dropdown on mobile
7 years ago
Eugen Rochko
2e71bb031b
Fix Paperclip timeout setting. Fix bug introduced in #437
7 years ago
Eugen
38bc85e695
Merge pull request #443 from blackle/master
Add call-to developers on getting started page
7 years ago
Eugen
a8e30060ae
Merge pull request #446 from blackle/dropdown2
Expand dropdown leftways on status view
7 years ago
blackle
05e964688d
Expand dropdown leftways on status view
7 years ago
blackle
b4f09bae1d
Add call-to developers on getting started page
7 years ago
Eugen
69643338f6
Merge pull request #437 from krainboltgreene/patch-1
Simplifying followers mappings
7 years ago
Eugen
e8d6f6c8c1
Merge pull request #436 from krainboltgreene/patch-2
Less complicated determination of subscription
7 years ago
Eugen
db8a088502
Update badges
7 years ago
Kurtis Rainbolt-Greene
abe3ae1cc2
Simplifying followers mappings
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
7 years ago
Kurtis Rainbolt-Greene
4a7e3e5082
Less complicated determination
7 years ago
Eugen
6d097d559b
Merge pull request #434 from vjackson725/fix_vagrantfile
Fix Vagrantfile to include yarn
7 years ago