mastodon

vbatts/mastodon

Fork 0

Commit graph

92a98f73aa Add separate sections for Heroku and Vagrant deployments. Add guide for instance administration. Move 'Contribution guide' to 'Development guide'. Effy Elden 2017-01-22 19:50:40 +11:00
536cde4e99 Rename main docs page so it renders in github Eugen Rochko 2017-01-21 22:54:49 +01:00
2baf0fabb4 Improve API docs formatting Eugen Rochko 2017-01-21 22:53:02 +01:00
e92a1cf436 Add wiki contents to docs/ instead Eugen Rochko 2017-01-21 22:49:08 +01:00
500278eb4c Merge branch 'ineffyble-fix/error-pages' Eugen Rochko 2017-01-21 22:31:19 +01:00
e22a56183a Improve error page layouting. 500 page has to stay static because it's used from nginx when Rails fails. Eugen Rochko 2017-01-21 22:30:47 +01:00
b4a4eb73ae Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages Eugen Rochko 2017-01-21 22:20:01 +01:00
f036c6440b Merge branch 'ineffyble-master' Eugen Rochko 2017-01-21 22:19:27 +01:00
e028406db4 Fix code style Eugen Rochko 2017-01-21 22:19:13 +01:00
d72dd38c13 Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master Eugen Rochko 2017-01-21 22:15:22 +01:00
3a4b5961be Method to fetch a single notification Eugen Rochko 2017-01-21 22:14:13 +01:00
deedf133d3 Merge pull request #506 from ineffyble/fix/issue-492-add-missing-header-image Eugen 2017-01-21 20:56:11 +01:00
77746240aa Change missing.png header to 1x1 transparent PNG Effy Elden 2017-01-22 06:42:42 +11:00
106dd1a484 Add a default missing.png header image - fixes #492 Effy Elden 2017-01-22 05:19:31 +11:00
6b666db112 Merge pull request #505 from ineffyble/fix/issue-503 Eugen 2017-01-21 12:37:51 +01:00
8f21f5522f Call uniq on the string version of mb_chars tags Effy Elden 2017-01-21 21:02:42 +11:00
5fef55c11a Set remote dev environments to use letter_opener_web, add default .env.vagrant variables Effy Elden 2017-01-21 20:22:49 +11:00
1aae0cfc2c Fix #475 - add space after autocomplete Eugen Rochko 2017-01-20 21:39:41 +01:00
9bd3b11cfb Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain Eugen Rochko 2017-01-20 20:14:02 +01:00
05abd977c1 Fix preview cards layout, do preview card crawling for remote statuses Eugen Rochko 2017-01-20 18:31:49 +01:00
f4e28785f1 Merge pull request #502 from blackle/vistoggle Eugen 2017-01-20 13:27:20 +01:00
7f63edd820 Show visibility toggle on videos, show regardless of sensitivity blackle 2017-01-19 21:24:30 -05:00
c8e4b9c663 No loading bars for cards, no failure if it 404s (that's expected) Eugen Rochko 2017-01-20 01:07:53 +01:00
f0de621e76 Fix #463 - Fetch and display previews of URLs using OpenGraph tags Eugen Rochko 2017-01-20 01:00:14 +01:00
8d0284f8d9 Hide more non-essential loading bars Eugen Rochko 2017-01-19 11:23:24 +01:00
98560b232a Don't show loading bar when re-loading already loaded status. Don't even try to fetch ancestors from DB when in_reply_to_id is nil Eugen Rochko 2017-01-19 11:06:06 +01:00
9b0941182f Don't show loading bar when checking account timeline for newer stuff Eugen Rochko 2017-01-19 11:01:01 +01:00
46be4631ae Fix #222 - Update followers count when following/unfollowing Eugen Rochko 2017-01-19 10:54:18 +01:00
f051c2e813 Fix statsd null backend not being initialized properly v0.9.9 Eugen Rochko 2017-01-19 09:37:07 +01:00
8b9206f7d9 Try to avoid any potential loops Eugen 2017-01-19 02:14:57 +01:00
306eb6e9c9 Add optional StatsD performance tracking Eugen Rochko 2017-01-18 23:44:29 +01:00
7cfd5b680a Fix forgotten change of settings Eugen Rochko 2017-01-17 20:37:54 +01:00
c468446f4c Fix boops? Eugen Rochko 2017-01-17 20:28:32 +01:00
cde0476ca2 Fix #487 Eugen Rochko 2017-01-17 20:11:16 +01:00
fcb5a85cdd Add sounds for notifications. Boop by @jk@mastodon.social Eugen Rochko 2017-01-17 20:09:03 +01:00
d7a7baa9a7 Merge pull request #489 from ineffyble/master Eugen 2017-01-17 18:46:53 +01:00
ab4f5f5da5 Add Heroku deployment support Effy Elden 2017-01-17 22:00:03 +11:00
6cf44ca92c Improve how the list entry Account component looks when target is blocked/follow is requested Eugen Rochko 2017-01-16 19:36:32 +01:00
99fe89026c Merge pull request #486 from blackle/replytimeline Eugen 2017-01-16 16:38:08 +01:00
889709a2a6 Show 'do not display in public timeline' when replying to self blackle 2017-01-16 10:23:45 -05:00
1a33e4042e Fix upload file input being re-rendered needlessly Eugen Rochko 2017-01-16 14:21:55 +01:00
7d53ee73f3 Fix #238 - Add "favourites" column Eugen Rochko 2017-01-16 13:27:58 +01:00
da5d366230 Fix #414 - Improve lightbox, add loading indicator Eugen Rochko 2017-01-16 12:04:02 +01:00
a78148f763 Merge branch 'blackle-sensitive' Eugen Rochko 2017-01-16 11:37:35 +01:00
2ae0fb4419 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive Eugen Rochko 2017-01-16 11:36:02 +01:00
0439c7d58b Move follow requests link above logout link in getting started column Eugen Rochko 2017-01-16 11:35:32 +01:00
144402ec7e Show visibility toggle on media gallery for sensitive images blackle 2017-01-15 20:26:03 -05:00
3778355454 Merge pull request #478 from blackle/backflip Eugen 2017-01-15 18:45:53 +01:00
383114add3 Change boost sprite to look like fa-retweet blackle 2017-01-15 10:55:31 -05:00
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 +01:00
7d7a11250c Fix #427 - don't suggest hashtag if the search value contains a space Eugen Rochko 2017-01-15 14:45:43 +01:00
1d5cbfa356 Fix #449 - don't do relationships fetch for empty array of IDs Eugen Rochko 2017-01-15 14:41:49 +01:00
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 +01:00
16f9490d33 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Eugen 2017-01-15 14:29:47 +01:00
bfec9aaee0 Merge branch 'ineffyble-feature/toot-app-source' Eugen Rochko 2017-01-15 14:04:56 +01:00
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 +01:00
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 +01:00
1f7c0ad8d3 Merge pull request #464 from blackle/backflip Eugen 2017-01-15 13:19:15 +01:00
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 +11:00
777f527d86 Merge pull request #474 from ineffyble/add-back-link-to-settings Eugen 2017-01-15 02:15:37 +01:00
e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages Effy Elden 2017-01-15 11:03:35 +11:00
ed41f9f0b1 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:30:23 +11:00
3f84816b24 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:27:54 +11:00
a67ffcbf56 Make boost button arrows spin around blackle 2017-01-13 23:32:27 -05:00
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 +11:00
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 +11:00
65122798b2 Fix typo in rel Effy Elden 2017-01-15 09:04:14 +11:00
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 +11:00
88801f7554 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies Eugen 2017-01-14 20:33:10 +01:00
32d756fb22 Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +11:00
f63f0c4625 Fix too late return Eugen 2017-01-14 02:22:16 +01:00
7cde08e30b Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +01:00
c01dd089ff Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +01:00
e25170f960 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +01:00
2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +01:00
ca50ceeaf0 Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +01:00
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 +01:00
babc6a1528 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +01:00
91dc21c469 fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +11:00
8f54a8851a Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +01:00
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 +01:00
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 +01:00
10739df458 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +01:00
3ad0496ccb Better animations Eugen Rochko 2017-01-11 04:21:49 +01:00
f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +11:00
4292cf60ae Fix env variable name Eugen 2017-01-10 22:01:13 +01:00
18b11100e7 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +01:00
312c51b5c8 Home column filters Eugen Rochko 2017-01-10 17:25:10 +01:00
1e9d2c4b1e Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +01:00
a1db2a191b Add link to list of apps Eugen 2017-01-10 12:23:30 +01:00
67a31454ad Merge pull request #450 from blackle/master Eugen 2017-01-10 12:21:06 +01:00
917cf0bf5d simplify emojification on public pages with .emojify class blackle 2017-01-09 22:40:45 -05:00
205ba00017 Fix sandboxed iOS login again Eugen Rochko 2017-01-09 19:43:53 +01:00
5d558c14b4 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +01:00
def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +01:00
d6a456dc71 Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +01:00
3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +01:00
75f80bef10 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +01:00
23ebf60b95 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +01:00
131bae89fd Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -05:00