catstodon

CatCatNya/catstodon

Fork 0

forked from glitch-soc-github-mirror/mastodon

Commit graph

9bde804ba2 Resolve confusion between ColumnBackButton and the slim version that the public timeline has been using Eugen Rochko 2017-01-30 15:22:04 +01:00
b1571b1e1d

Add missing back button to "Follow Requests" Billie Thompson 2017-01-28 23:49:42 +00:00
b12bdd2aea Add 2-FA instructions for non-technical users (#580) James 2017-01-29 10:26:27 -08:00
2165a0ec63 Update some API docs Eugen 2017-01-29 14:40:57 +01:00
a30e669df2 Fix avatar scaling on high-DPI displays (#573) Misty De Meo 2017-01-29 05:26:50 -08:00
ff90a5ff84 Update sample .env Eugen Rochko 2017-01-29 13:06:58 +01:00
aa52d5fd1e Add more links to main docs page Eugen Rochko 2017-01-29 12:59:02 +01:00
ca8a9d5941 Fix JSON formatting in docs Eugen Rochko 2017-01-29 12:55:12 +01:00
fe9306f346 Update docs with information about push notifications Eugen Rochko 2017-01-29 12:53:50 +01:00
e70e721a0d Add tests for new API Eugen Rochko 2017-01-29 12:35:55 +01:00
83ccdeb87a Fix tests Eugen Rochko 2017-01-29 12:25:10 +01:00
3f075c7794 API for apps to register for push notifications Eugen Rochko 2017-01-29 01:30:32 +01:00
1992575d57 Fix #569 - seeds.rb Eugen Rochko 2017-01-29 00:12:27 +01:00
9b2c728251 Fix settings design on mobile Eugen Rochko 2017-01-28 21:57:03 +01:00
23b997ae55 Split 2FA login into two prompts Eugen Rochko 2017-01-28 20:43:38 +01:00
36c57ef8af Add pixel background to modal images Eugen Rochko 2017-01-28 04:04:09 +01:00
f4bc9620a9 Update settings to re-use admin layout, one big navigation tree, improve settings forms Eugen Rochko 2017-01-28 03:56:10 +01:00
04bce0cdf2 Clean up Eugen Rochko 2017-01-27 20:38:35 +01:00
76e970c856 Do not automatically login after password reset, as it would circumvent two-factor auth (if enabled) Do not require e-mail address changes to be re-confirmed, it's only trouble for no real benefit Eugen Rochko 2017-01-27 20:34:22 +01:00
ba192f12e3 Added optional two-factor authentication Eugen Rochko 2017-01-27 20:28:46 +01:00
237cb41ab4 Less ambiguous sensitive content toggle label (#556) Zachary Spector 2017-01-27 13:31:14 -05:00
2a6773d59b Merge pull request #557 from hoodiek/master Eugen 2017-01-27 18:41:05 +01:00
6c37285580 fix button outline showing on clicks for prettiness hoodie 2017-01-27 12:39:36 -05:00
dc3e0529ca Update broken links, add new sponsor Eugen Rochko 2017-01-27 17:01:21 +01:00
450ad43180 Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB, fix ProcessFeedService pushing status into distribution if called a second time while the first is still running (i.e. when a PuSH comes after a Salmon slap), fix not running escape on spoiler text before emojify Eugen Rochko 2017-01-27 16:55:06 +01:00
9f57c7d4a6 Updated translation doc to get working links nicolas 2017-01-27 13:17:33 +01:00
f8bd44a747 Fix font weight Eugen Rochko 2017-01-26 23:34:40 +01:00
87667e371c Merge pull request #549 from ineffyble/docs/add-default-account-to-dev-documentation Eugen 2017-01-26 23:03:41 +01:00
f7aef16668 Merge pull request #548 from PurpleBooth/make-fonts-local Eugen 2017-01-26 23:02:48 +01:00
55fa8e61e2

Move the fonts from Google Fonts to local assets Billie Thompson 2017-01-26 14:06:40 +00:00
6ba302b725 Merge pull request #550 from wchristian/oauth_docs2 Eugen 2017-01-26 20:41:53 +01:00
f6a5977f0b Fix key names in statsd Eugen Rochko 2017-01-26 19:46:52 +01:00
d567f21d4f Improve StatsD instrumentation Eugen Rochko 2017-01-26 19:08:05 +01:00
7329fbd8a4 Fix up timeout, improve contrast on "show more", add responsive style for extremely wide monitors Eugen Rochko 2017-01-26 18:48:56 +01:00
12eddb5cbe document that /oauth/token does not always return json Christian Walde 2017-01-26 16:27:16 +01:00
ae2147d40f Add default account details to developer documentation. Effy Elden 2017-01-27 02:03:13 +11:00
cc5c1e5feb Removed accidental n+1 query from notifications, updated some deps, improved how "show more" link looks Eugen Rochko 2017-01-26 14:52:07 +01:00
2f18c77e44 Merge pull request #526 from wchristian/oauth_docs Eugen 2017-01-26 12:23:47 +01:00
446d6f1643 Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments Eugen 2017-01-26 12:22:32 +01:00
c3a3ce8172 Merge pull request #541 from TrevInc/master Eugen 2017-01-26 11:07:42 +01:00
589837cfc7 Removed line break before spoiler link, changed color of bg for spoiler link Anthony Bellew 2017-01-26 03:07:02 -07:00
ebe5095665 Add Padding to inline styles for spoiler Anthony Bellew 2017-01-26 03:03:26 -07:00
8f18c8f9ad Added inline spoiler button styles Anthony Bellew 2017-01-26 03:02:42 -07:00
d53294b933 Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings Eugen 2017-01-26 10:44:20 +01:00
95b0bf9815 Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments Eugen 2017-01-26 10:43:54 +01:00
94eccbc5de Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant Effy Elden 2017-01-26 19:22:59 +11:00
198ea2522e Seed a default, confirmed, admin account on development environments Effy Elden 2017-01-26 19:22:00 +11:00
07b9a10d4d Add redirect for /admin => /admin/settings Effy Elden 2017-01-26 18:59:35 +11:00
d944946c52 Moved brackets outside of localized strings at Gargron's suggestion Anthony Bellew 2017-01-26 00:24:52 -07:00
baa52984e9 Add brackets to visually distinguish show more / show less text Anthony Bellew 2017-01-25 20:56:33 -07:00
3d890c4073 Merge pull request #3 from tootsuite/master Anthony Bellew 2017-01-25 20:53:57 -07:00
905c829179 Improve infinite scroll on notifications Eugen Rochko 2017-01-26 04:30:40 +01:00
57f7cf8349 Follow request authorizations faster Eugen Rochko 2017-01-26 03:56:26 +01:00
eb62778bec Fix #537 - opengraph description should display spoiler text when present Eugen Rochko 2017-01-26 03:45:14 +01:00
1c507ff172 Fix #538 - Darken buttons to increase contrast Eugen Rochko 2017-01-26 03:32:00 +01:00
3a310e8f63 Fix CSS mistake Eugen Rochko 2017-01-26 03:17:48 +01:00
97d9517b6b Merge pull request #534 from yiskah/patch-2 Eugen 2017-01-26 02:51:27 +01:00
0a391a2872 Merge pull request #536 from blackle/leftclick Eugen 2017-01-26 02:50:55 +01:00
6bba337080 Only open status on left mouse press blackle 2017-01-25 20:43:41 -05:00
33e09cc76b Increase color contrast on getting started text shel 2017-01-25 20:19:37 -05:00
3b6af5245b clarify the intended use of the oauth api call as per this issue: Christian Walde 2017-01-25 18:31:15 +01:00
97da56d02b Fix loading of avatars before drawing them to canvas Eugen Rochko 2017-01-25 17:23:17 +01:00
00fa850bdc Fix #187, address #441 - <Avatar> component now plays gifs only while hovered Eugen Rochko 2017-01-25 17:07:57 +01:00
3beb24ad55 Use <summary> to encode content warnings instead Eugen Rochko 2017-01-25 16:53:30 +01:00
0430f7c0fa Fix spoiler_text not having "not null" constraint Eugen Rochko 2017-01-25 15:24:19 +01:00
51a7047367 Fix order of migrations Eugen Rochko 2017-01-25 15:01:00 +01:00
ca04002c93 Add content warning example to docs Eugen Rochko 2017-01-25 02:54:28 +01:00
ab94ad3504 Add description of Mastodon's current protocol extensions Eugen Rochko 2017-01-25 02:46:16 +01:00
41f5459af5 Merge pull request #524 from blackle/master Eugen 2017-01-25 02:16:36 +01:00
ca13ec04a8 fix up spoilers blackle 2017-01-24 20:14:20 -05:00
10ffd455a8 Fix #522 - prevent blocked users from reblogging Eugen Rochko 2017-01-25 01:48:46 +01:00
ca28d9c2ae Merge branch 'blackle-master' Eugen Rochko 2017-01-25 01:29:40 +01:00
999cde94a6 Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" /> Clean up schema file from accidental development migrations Eugen Rochko 2017-01-25 00:49:08 +01:00
f8da0dd490 Merge branch 'master' into master Eugen 2017-01-24 21:56:06 +01:00
8a880a3d46 Make blocks create entries and unfollows instantly, but do the clean up in the background instead. Should fix delay where blocked person can interact with blocker for a short time before background job gets processed Eugen Rochko 2017-01-24 21:40:41 +01:00
326c75b35b Merge pull request #521 from mistydemeo/fix_invisible_css Eugen 2017-01-24 21:26:18 +01:00
adda642c63 Fix invisible CSS class Misty De Meo 2017-01-24 11:07:46 -08:00
e47b8e778b Fix links in toots opening the toot at first Eugen Rochko 2017-01-24 18:51:09 +01:00
80cefd5b3c Fix #204, fix #515 - URL truncating is now a style so copypasting is not affected, replaced onClick handler with onMouseUp/Down to detect text selection not trigger onClick handler then Eugen Rochko 2017-01-24 17:05:44 +01:00
b06a375ee4 Merge branch 'blackle-boostspin' Eugen Rochko 2017-01-24 14:28:54 +01:00
4f3264d291 Merge branch 'master' into boostspin Eugen 2017-01-24 14:27:13 +01:00
4a146a0d18 Make boost animation an SVG that uses SCSS colours blackle 2017-01-23 21:02:13 -05:00
21c209636d Set isLoading false on timelines when request fails Eugen Rochko 2017-01-24 13:04:12 +01:00
1f5792c834 API now respects ?limit param as long as it's within 2x default limit Eugen Rochko 2017-01-24 04:22:10 +01:00
d9022884c6 Smarter infinite scroll Eugen Rochko 2017-01-24 04:12:10 +01:00
bf0f6eb62d Implement a click-to-view spoiler system blackle 2017-01-12 23:54:26 -05:00
1761d3f9c3 Fix mistake Eugen Rochko 2017-01-23 22:18:08 +01:00
d00189b55a Domains with reject_media? set to true won't download avatars either Eugen Rochko 2017-01-23 21:55:29 +01:00
8aab692034 Less re-rendering Eugen Rochko 2017-01-23 21:40:48 +01:00
434cf8237e Optional domain block attribute that prevents media attachments from being downloaded Eugen Rochko 2017-01-23 21:36:08 +01:00
cca82bf0a2 Move merging/unmerging of timelines into background. Move blocking into background as well since it's a computationally expensive Eugen Rochko 2017-01-23 21:29:34 +01:00
f392030ab8 Add /api/v1/notifications/clear, non-existing link cards for statuses will now return empty hash instead of throwing a 404 error. When following, merge into timeline will filter statuses Eugen Rochko 2017-01-23 21:09:27 +01:00
f2e08ff568 Remove unneeded block check Eugen Rochko 2017-01-23 17:40:23 +01:00
6d98a73180 Domain blocks now have varying severity - auto-suspend vs auto-silence Eugen Rochko 2017-01-23 17:38:38 +01:00
ef2b924679 Forgot to commit Eugen Rochko 2017-01-23 17:18:41 +01:00
f855d645b2 Move all hex colors in SASS to variables and all variations to darken/lighten Eugen Rochko 2017-01-23 16:01:46 +01:00
d4d56b8af0 Fix #365, 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format Eugen Rochko 2017-01-23 14:45:09 +01:00
aa9c51a34c Fix a couple unhandled exceptions Eugen Rochko 2017-01-23 13:56:57 +01:00
a1894786cf Potentially fix notifications issue Eugen Rochko 2017-01-23 13:43:14 +01:00
7c015ece45 Fix oembed controller test Eugen Rochko 2017-01-23 13:36:17 +01:00
6062680dd4 Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking Eugen 2017-01-23 11:34:36 +01:00
33fd8a7d95 Textarea: fix clicking on name suggestions Misty De Meo 2017-01-22 22:57:58 -08:00
1953e3b6ed Fix inflection Eugen 2017-01-22 23:08:51 +01:00
956da43e19 Fix error Eugen 2017-01-22 23:07:31 +01:00
cea9fb31fe Mitigate inconsistent notifications Eugen 2017-01-22 21:50:17 +01:00
61aee0006e Override Rack::Request to use the same trusted proxy settings as Rails Eugen Rochko 2017-01-22 21:01:28 +01:00
67befe5463 Allow to specify trusted proxies through env Eugen Rochko 2017-01-22 20:35:49 +01:00
c66718afff Merge pull request #509 from ineffyble/docs/developer-docs-additions Eugen 2017-01-22 17:07:39 +01:00
f3cac0b93b Update README.md to match new documentation (missed from previous commit) Effy Elden 2017-01-23 00:11:09 +11:00
10fe63d4db Merge pull request #508 from ineffyble/docs/developer-docs-additions Eugen 2017-01-22 11:43:07 +01:00
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 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