Commit Graph

Select branches

Hide Pull Requests

4.1.18

features/4.1.9

features/4.3alpha

features/emoji

features/main

features/material-theme

features/quote

features/v4.1.12

features/v4.1.13

features/v4.1.14

features/v4.1.15

main

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

origin/v4.1.1

v0.1.0

v0.1.1

v0.1.2

v0.6

v0.7

v0.8

v0.9

v0.9.9

v1.0

v1.1

v1.1.1

v1.1.2

v1.2

v1.2.1

v1.2.2

v1.3

v1.3.1

v1.3.2

v1.3.3

v1.4.1

v1.4.2

v1.4.3

v1.4.4

v1.4.5

v1.4.6

v1.4.7

v1.4rc1

v1.4rc2

v1.4rc3

v1.4rc4

v1.4rc5

v1.4rc6

v1.5.0

v1.5.0rc1

v1.5.0rc2

v1.5.0rc3

v1.5.1

v1.6.0

v1.6.0rc1

v1.6.0rc2

v1.6.0rc3

v1.6.0rc4

v1.6.0rc5

v1.6.1

v2.0.0

v2.0.0rc1

v2.0.0rc2

v2.0.0rc3

v2.0.0rc4

v2.1.0

v2.1.0rc1

v2.1.0rc2

v2.1.0rc3

v2.1.0rc4

v2.1.0rc5

v2.1.0rc6

v2.1.1

v2.1.2

v2.1.3

v2.2.0

v2.2.0rc1

v2.3.0

v2.3.0rc1

v2.3.0rc2

v2.3.0rc3

v2.3.1

v2.3.1rc1

v2.3.1rc3

v2.3.2

v2.3.3

v2.4.0

v2.4.0rc4

v2.4.0rc5

v2.4.1

v2.4.1rc2

v2.4.1rc3

v2.4.1rc4

v2.4.2

v2.4.2rc3

v2.4.3

v2.5.0

v2.5.0rc2

v2.5.1

v2.6.0

v2.6.0rc1

v2.6.0rc2

v2.6.1

v2.6.4

v2.6.5

v2.7.0rc1

v2.7.0rc3

v2.7.1

v3.0.0rc2

v3.0.1

v3.1.0

v3.1.0rc2

v3.1.1

v3.1.2

v3.1.3

v3.1.5

v3.2.1

v3.3.0

v3.4.0

v3.4.0rc1

v3.4.0rc2

v3.4.1

v3.4.2

v3.4.3

v3.4.4

v3.4.5

v3.4.6

v3.4.7

v3.5.0

v3.5.0rc1

v3.5.1

v3.5.3

v4.0.2

v4.1.1

v4.1.12

v4.1.13

v4.1.14

v4.1.15

v4.1.18

v4.1.2

v4.1.3

v4.1.4

Mono Color

• 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 EugenandGitHub 2017-01-26 12:23:47 +01:00
• 446d6f1643 Merge pull request #543 from ineffyble/tweak/seed-default-admin-account-on-dev-environments EugenandGitHub 2017-01-26 12:22:32 +01:00
• c3a3ce8172 Merge pull request #541 from TrevInc/master EugenandGitHub 2017-01-26 11:07:42 +01:00
• 589837cfc7 Removed line break before spoiler link, changed color of bg for spoiler link Anthony BellewandGitHub 2017-01-26 03:07:02 -07:00
• ebe5095665 Add Padding to inline styles for spoiler Anthony BellewandGitHub 2017-01-26 03:03:26 -07:00
• 8f18c8f9ad Added inline spoiler button styles Anthony BellewandGitHub 2017-01-26 03:02:42 -07:00
• d53294b933 Merge pull request #542 from ineffyble/tweak/redirect-admin-path-to-admin-settings EugenandGitHub 2017-01-26 10:44:20 +01:00
• 95b0bf9815 Merge pull request #544 from ineffyble/tweak/add-default-local-domain-for-vagrant-environments EugenandGitHub 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 BellewandGitHub 2017-01-26 00:24:52 -07:00
• baa52984e9 Add brackets to visually distinguish show more / show less text Anthony BellewandGitHub 2017-01-25 20:56:33 -07:00
• 3d890c4073 Merge pull request #3 from tootsuite/master Anthony BellewandGitHub 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 EugenandGitHub 2017-01-26 02:51:27 +01:00
• 0a391a2872 Merge pull request #536 from blackle/leftclick EugenandGitHub 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 shelandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 2017-01-22 23:08:51 +01:00
• 956da43e19 Fix error EugenandGitHub 2017-01-22 23:07:31 +01:00
• cea9fb31fe Mitigate inconsistent notifications EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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 EugenandGitHub 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