tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Commit Graph

  • 306eb6e9c9 Add optional StatsD performance tracking Eugen Rochko 2017-01-18 23:44:29 +0100
  • 7cfd5b680a Fix forgotten change of settings Eugen Rochko 2017-01-17 20:37:54 +0100
  • c468446f4c Fix boops? Eugen Rochko 2017-01-17 20:28:32 +0100
  • cde0476ca2 Fix #487 Eugen Rochko 2017-01-17 20:11:16 +0100
  • fcb5a85cdd Add sounds for notifications. Boop by @jk@mastodon.social Eugen Rochko 2017-01-17 20:09:03 +0100
  • d7a7baa9a7 Merge pull request #489 from ineffyble/master Eugen 2017-01-17 18:46:53 +0100
  • ab4f5f5da5 Add Heroku deployment support Effy Elden 2017-01-17 22:00:03 +1100
  • 6cf44ca92c Improve how the list entry Account component looks when target is blocked/follow is requested Eugen Rochko 2017-01-16 19:36:32 +0100
  • 99fe89026c Merge pull request #486 from blackle/replytimeline Eugen 2017-01-16 16:38:08 +0100
  • 889709a2a6 Show 'do not display in public timeline' when replying to self blackle 2017-01-16 10:23:45 -0500
  • 1a33e4042e Fix upload file input being re-rendered needlessly Eugen Rochko 2017-01-16 14:21:55 +0100
  • 7d53ee73f3 Fix #238 - Add "favourites" column Eugen Rochko 2017-01-16 13:27:58 +0100
  • da5d366230 Fix #414 - Improve lightbox, add loading indicator Eugen Rochko 2017-01-16 12:04:02 +0100
  • a78148f763 Merge branch 'blackle-sensitive' Eugen Rochko 2017-01-16 11:37:35 +0100
  • 2ae0fb4419 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive Eugen Rochko 2017-01-16 11:36:02 +0100
  • 0439c7d58b Move follow requests link above logout link in getting started column Eugen Rochko 2017-01-16 11:35:32 +0100
  • 144402ec7e Show visibility toggle on media gallery for sensitive images blackle 2017-01-15 20:26:03 -0500
  • 3778355454 Merge pull request #478 from blackle/backflip Eugen 2017-01-15 18:45:53 +0100
  • 383114add3 Change boost sprite to look like fa-retweet blackle 2017-01-15 10:55:31 -0500
  • 926459fc0a Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse Eugen Rochko 2017-01-15 14:59:25 +0100
  • 7d7a11250c Fix #427 - don't suggest hashtag if the search value contains a space Eugen Rochko 2017-01-15 14:45:43 +0100
  • 1d5cbfa356 Fix #449 - don't do relationships fetch for empty array of IDs Eugen Rochko 2017-01-15 14:41:49 +0100
  • cc1eccc8bc Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up Eugen Rochko 2017-01-15 14:38:59 +0100
  • 16f9490d33 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Eugen 2017-01-15 14:29:47 +0100
  • bfec9aaee0 Merge branch 'ineffyble-feature/toot-app-source' Eugen Rochko 2017-01-15 14:04:56 +0100
  • e9737c2235 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 Eugen Rochko 2017-01-15 14:01:33 +0100
  • ab165547fd Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source Eugen Rochko 2017-01-15 13:23:47 +0100
  • 1f7c0ad8d3 Merge pull request #464 from blackle/backflip Eugen 2017-01-15 13:19:15 +0100
  • a097dd489b Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read' Effy Elden 2017-01-15 20:58:46 +1100
  • 777f527d86 Merge pull request #474 from ineffyble/add-back-link-to-settings Eugen 2017-01-15 02:15:37 +0100
  • e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages Effy Elden 2017-01-15 11:03:35 +1100
  • ed41f9f0b1 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:30:23 +1100
  • 3f84816b24 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:27:54 +1100
  • a67ffcbf56 Make boost button arrows spin around blackle 2017-01-13 23:32:27 -0500
  • f81dc7a33a Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source Effy Elden 2017-01-15 09:12:11 +1100
  • 6c002cf615 Test for presence of Application in haml before trying to render details, to fix errors identified by CI Effy Elden 2017-01-15 09:10:44 +1100
  • 65122798b2 Fix typo in rel Effy Elden 2017-01-15 09:04:14 +1100
  • 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 Effy Elden 2017-01-15 08:58:50 +1100
  • 88801f7554 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies Eugen 2017-01-14 20:33:10 +0100
  • 32d756fb22 Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +1100
  • f63f0c4625 Fix too late return Eugen 2017-01-14 02:22:16 +0100
  • 7cde08e30b Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +0100
  • c01dd089ff Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +0100
  • e25170f960 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +0100
  • 2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +0100
  • ca50ceeaf0 Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +0100
  • 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 Eugen Rochko 2017-01-12 20:46:24 +0100
  • babc6a1528 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +0100
  • 91dc21c469 fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +1100
  • 8f54a8851a Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +0100
  • 4a2ee43e80 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) Eugen Rochko 2017-01-12 03:54:50 +0100
  • 7951e7ffd5 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service Eugen Rochko 2017-01-11 15:39:31 +0100
  • 10739df458 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +0100
  • 3ad0496ccb Better animations Eugen Rochko 2017-01-11 04:21:49 +0100
  • f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +1100
  • 4292cf60ae Fix env variable name Eugen 2017-01-10 22:01:13 +0100
  • 18b11100e7 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +0100
  • 312c51b5c8 Home column filters Eugen Rochko 2017-01-10 17:25:10 +0100
  • 1e9d2c4b1e Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +0100
  • a1db2a191b Add link to list of apps Eugen 2017-01-10 12:23:30 +0100
  • 67a31454ad Merge pull request #450 from blackle/master Eugen 2017-01-10 12:21:06 +0100
  • 917cf0bf5d simplify emojification on public pages with .emojify class blackle 2017-01-09 22:40:45 -0500
  • 205ba00017 Fix sandboxed iOS login again Eugen Rochko 2017-01-09 19:43:53 +0100
  • 5d558c14b4 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +0100
  • def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +0100
  • d6a456dc71 Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +0100
  • 3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +0100
  • 75f80bef10 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +0100
  • 23ebf60b95 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +0100
  • 131bae89fd Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -0500
  • d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile blackle 2017-01-08 05:04:01 -0500
  • 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in #437 Eugen Rochko 2017-01-08 19:12:54 +0100
  • 38bc85e695 Merge pull request #443 from blackle/master Eugen 2017-01-08 13:36:02 +0100
  • a8e30060ae Merge pull request #446 from blackle/dropdown2 Eugen 2017-01-08 13:34:27 +0100
  • 05e964688d Expand dropdown leftways on status view blackle 2017-01-08 06:32:37 -0500
  • b4f09bae1d Add call-to developers on getting started page blackle 2017-01-08 00:23:22 -0500
  • 69643338f6 Merge pull request #437 from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +0100
  • e8d6f6c8c1 Merge pull request #436 from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +0100
  • db8a088502 Update badges Eugen 2017-01-08 03:47:33 +0100
  • abe3ae1cc2 Simplifying followers mappings Kurtis Rainbolt-Greene 2017-01-07 18:09:00 -0800
  • 4a7e3e5082 Less complicated determination Kurtis Rainbolt-Greene 2017-01-07 17:59:51 -0800
  • 6d097d559b Merge pull request #434 from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +0100
  • 4447c4c7c8 Merge pull request #435 from krainboltgreene/patch-1 Eugen 2017-01-08 02:58:19 +0100
  • e5d9009d71 Using "rails style" order arguments Kurtis Rainbolt-Greene 2017-01-07 17:55:40 -0800
  • db3d5d811c Fix Vagrantfile to include yarn vjackson725 2017-01-08 12:38:04 +1100
  • 7a0a13ab53 Merge pull request #432 from blackle/volume-icon Eugen 2017-01-08 02:36:12 +0100
  • 8a571158c9 Show correct volume icons on video player blackle 2017-01-07 20:21:50 -0500
  • cec7e69827 Merge pull request #430 from blackle/logout_mobile Eugen 2017-01-08 01:24:06 +0100
  • e1ca354956 Show logout button on getting started so it's available on mobile blackle 2017-01-07 18:41:57 -0500
  • 679aa35e15 Merge pull request #429 from blackle/emojify_usernames Eugen 2017-01-08 00:19:24 +0100
  • 57ff221c0f Emojify display names in notifcations blackle 2017-01-07 18:16:14 -0500
  • 165df323ae Merge pull request #428 from blackle/contrast Eugen 2017-01-07 22:51:15 +0100
  • 61211b509c Improve contrast of bio and username text in account info blackle 2017-01-07 16:39:30 -0500
  • 2fbb38e4b2 Merge pull request #425 from ineffyble/vagrant Eugen 2017-01-07 18:31:59 +0100
  • be6ae3546f Replace getting started icon on desktop nav bar with asterisk instead of hamburger Eugen Rochko 2017-01-07 15:46:39 +0100
  • 5c7add2176 Fix #147 - Unreblogging will leave original status in feeds Eugen Rochko 2017-01-07 15:44:22 +0100
  • 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images Eugen Rochko 2017-01-07 15:43:56 +0100
  • 11ea7336e9 Tweak Vagrant info in README Effy Elden 2017-01-08 01:30:48 +1100
  • 46fb634c79 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 Effy Elden 2017-01-08 01:28:49 +1100
  • f1289ca3c0 Add Vagrant development environment support Effy Elden 2017-01-07 23:22:24 +1100