Commits · ed41f9f0b1d49e651c93cc9df90c21daca3f96a5 · Pierre Boudes / mastodon

Jan 14, 2017
- Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether · ed41f9f0
  Effy Elden authored 8 years ago
  
  ed41f9f0
- Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether · 3f84816b
  Effy Elden authored 8 years ago
  
  3f84816b
- Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies · 88801f75
  Eugen authored 8 years ago
  
  Hide 'Do not display on public timeline' for reply toots
  88801f75
- Hide 'Do not display on public timeline' for reply toots. Fixes #412. · 32d756fb
  Effy Elden authored 8 years ago
  
  32d756fb
- Fix too late return · f63f0c46
  Eugen authored 8 years ago
  
  f63f0c46
Jan 13, 2017
- Improve extended about page layout · 7cde08e3
  Eugen Rochko authored 8 years ago
  
  7cde08e3
- Adding about/more page with extended information that can be set up by an admin · c01dd089
  Eugen Rochko authored 8 years ago
  
  c01dd089
- Add extended about page stub · e25170f9
  Eugen Rochko authored 8 years ago
  
  e25170f9
- Extend rails-settings-cached to merge db-saved hash values with defaults · 2939e989
  Eugen Rochko authored 8 years ago
  
  2939e989
Jan 12, 2017
- Add settings for contact information · ca50ceea
  Eugen Rochko authored 8 years ago
  
  ca50ceea
- Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings · b11fdc3a
  Eugen Rochko authored 8 years ago
  
  with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage
  b11fdc3a
- Merge pull request #461 from vjackson725/master · babc6a15
  Eugen authored 8 years ago
  
  fix Vagrantfile so that the correct ruby is installed
  babc6a15
- fix Vagrantfile so that the correct ruby is installed · 91dc21c4
  vjackson725 authored 8 years ago
  
  Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit 7951e7ff, this no longer works. Change the provision scrip so that 2.3.1 is installed via rbenv. Note this drastically increases provision time.
  91dc21c4
- Add rake task for clearing out media from silenced accounts · 8f54a885
  Eugen Rochko authored 8 years ago
  
  8f54a885
- Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to... · 4a2ee43e
  Eugen Rochko authored 8 years ago
  
  Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
  4a2ee43e
Jan 11, 2017
- Add ruby version to Gemfile, move devDependencies in package.json to dependencies, · 7951e7ff
  Eugen Rochko authored 8 years ago
  
  fix bug in process feed service
  7951e7ff
- Merge pull request #456 from ineffyble/fix-repo-url · 10739df4
  Eugen authored 8 years ago
  
  Fix repo URL
  10739df4
- Better animations · 3ad0496c
  Eugen Rochko authored 8 years ago
  
  3ad0496c
- Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places · f876a868
  Effy Elden authored 8 years ago
  
  f876a868
Jan 10, 2017
- Fix env variable name · 4292cf60
  Eugen authored 8 years ago
  
  4292cf60
- Fix issue when settings are not defined for column type · 18b11100
  Eugen Rochko authored 8 years ago
  
  18b11100
- Home column filters · 312c51b5
  Eugen Rochko authored 8 years ago
  
  312c51b5
- Add "not found" component to UI · 1e9d2c4b
  Eugen Rochko authored 8 years ago
  
  1e9d2c4b
- Add link to list of apps · a1db2a19
  Eugen authored 8 years ago
  
  a1db2a19
- Merge pull request #450 from blackle/master · 67a31454
  Eugen authored 8 years ago
  
  simplify emojification on public pages with .emojify class
  67a31454
- simplify emojification on public pages with .emojify class · 917cf0bf
  blackle authored 8 years ago
  
  917cf0bf
Jan 09, 2017
- Fix sandboxed iOS login again · 205ba000
  Eugen Rochko authored 8 years ago
  
  205ba000
- Merge branch 'blackle-master' · 5d558c14
  Eugen Rochko authored 8 years ago
  
  5d558c14
- Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master · def1f8c5
  Eugen Rochko authored 8 years ago
  
  def1f8c5
- Merge branch 'blackle-dropdown' · d6a456dc
  Eugen Rochko authored 8 years ago
  
  d6a456dc
- Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown · 3bddd647
  Eugen Rochko authored 8 years ago
  
  3bddd647
- Persist UI settings, add missing localizations for German · 75f80bef
  Eugen Rochko authored 8 years ago
  
  75f80bef
- Improve initialState loading · 23ebf60b
  Eugen Rochko authored 8 years ago
  
  23ebf60b
- Generate key for each input so we can upload the same file even after deleting · 131bae89
  blackle authored 8 years ago
  
  131bae89
Jan 08, 2017
- Switch to compose view when tapping 'mention' in dropdown on mobile · d64c454c
  blackle authored 8 years ago
  
  d64c454c
- Fix Paperclip timeout setting. Fix bug introduced in #437 · 2e71bb03
  Eugen Rochko authored 8 years ago
  
  2e71bb03
- Merge pull request #443 from blackle/master · 38bc85e6
  Eugen authored 8 years ago
  
  Add call-to developers on getting started page
  38bc85e6
- Merge pull request #446 from blackle/dropdown2 · a8e30060
  Eugen authored 8 years ago
  
  Expand dropdown leftways on status view
  a8e30060
- Expand dropdown leftways on status view · 05e96468
  blackle authored 8 years ago
  
  05e96468
- Add call-to developers on getting started page · b4f09bae
  blackle authored 8 years ago
  
  b4f09bae