Commit graph

38628 commits

Author SHA1 Message Date
Eugen
8b9206f7d9 Try to avoid any potential loops 2017-01-19 02:14:57 +01:00
Eugen Rochko
86264a950c Add optional StatsD performance tracking 2017-01-18 23:44:29 +01:00
Eugen Rochko
306eb6e9c9 Add optional StatsD performance tracking 2017-01-18 23:44:29 +01:00
Eugen Rochko
0022b0cb2e Fix forgotten change of settings 2017-01-17 20:37:54 +01:00
Eugen Rochko
7cfd5b680a Fix forgotten change of settings 2017-01-17 20:37:54 +01:00
Eugen Rochko
40a5094434 Fix boops? 2017-01-17 20:28:32 +01:00
Eugen Rochko
c468446f4c Fix boops? 2017-01-17 20:28:32 +01:00
Eugen Rochko
a6bf7b4777 Fix #487 2017-01-17 20:11:16 +01:00
Eugen Rochko
cde0476ca2 Fix #487 2017-01-17 20:11:16 +01:00
Eugen Rochko
7865ce28e5 Add sounds for notifications. Boop by @jk@mastodon.social 2017-01-17 20:09:03 +01:00
Eugen Rochko
fcb5a85cdd Add sounds for notifications. Boop by @jk@mastodon.social 2017-01-17 20:09:03 +01:00
Eugen
7970f1dd38 Merge pull request #489 from ineffyble/master
Add Heroku deployment support
2017-01-17 18:46:53 +01:00
Eugen
d7a7baa9a7 Merge pull request #489 from ineffyble/master
Add Heroku deployment support
2017-01-17 18:46:53 +01:00
Effy Elden
a898072d76 Add Heroku deployment support 2017-01-17 22:00:03 +11:00
Effy Elden
ab4f5f5da5 Add Heroku deployment support 2017-01-17 22:00:03 +11:00
Eugen Rochko
3f30e91462 Improve how the list entry Account component looks when target is blocked/follow is requested 2017-01-16 19:36:32 +01:00
Eugen Rochko
6cf44ca92c Improve how the list entry Account component looks when target is blocked/follow is requested 2017-01-16 19:36:32 +01:00
Eugen
0e71cb2916 Merge pull request #486 from blackle/replytimeline
Show 'do not display in public timeline' when replying to self
2017-01-16 16:38:08 +01:00
Eugen
99fe89026c Merge pull request #486 from blackle/replytimeline
Show 'do not display in public timeline' when replying to self
2017-01-16 16:38:08 +01:00
blackle
94cedabbe3 Show 'do not display in public timeline' when replying to self 2017-01-16 10:26:44 -05:00
blackle
889709a2a6 Show 'do not display in public timeline' when replying to self 2017-01-16 10:26:44 -05:00
Eugen Rochko
89740d69ec Fix upload file input being re-rendered needlessly 2017-01-16 14:21:55 +01:00
Eugen Rochko
1a33e4042e Fix upload file input being re-rendered needlessly 2017-01-16 14:21:55 +01:00
Eugen Rochko
f4d7f4c687 Fix #238 - Add "favourites" column 2017-01-16 13:28:25 +01:00
Eugen Rochko
7d53ee73f3 Fix #238 - Add "favourites" column 2017-01-16 13:28:25 +01:00
Eugen Rochko
81db795253 Fix #414 - Improve lightbox, add loading indicator 2017-01-16 12:04:02 +01:00
Eugen Rochko
da5d366230 Fix #414 - Improve lightbox, add loading indicator 2017-01-16 12:04:02 +01:00
Eugen Rochko
1ed33af06c Merge branch 'blackle-sensitive' 2017-01-16 11:37:35 +01:00
Eugen Rochko
a78148f763 Merge branch 'blackle-sensitive' 2017-01-16 11:37:35 +01:00
Eugen Rochko
780df33037 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive 2017-01-16 11:36:02 +01:00
Eugen Rochko
2ae0fb4419 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive 2017-01-16 11:36:02 +01:00
Eugen Rochko
972fb80de6 Move follow requests link above logout link in getting started column 2017-01-16 11:35:32 +01:00
Eugen Rochko
0439c7d58b Move follow requests link above logout link in getting started column 2017-01-16 11:35:32 +01:00
blackle
9ac182d831 Show visibility toggle on media gallery for sensitive images 2017-01-15 20:27:08 -05:00
blackle
144402ec7e Show visibility toggle on media gallery for sensitive images 2017-01-15 20:27:08 -05:00
Eugen
b1075ccb86 Merge pull request #478 from blackle/backflip
Change boost sprite to look like fa-retweet
2017-01-15 18:45:53 +01:00
Eugen
3778355454 Merge pull request #478 from blackle/backflip
Change boost sprite to look like fa-retweet
2017-01-15 18:45:53 +01:00
blackle
5c3c7c545c Change boost sprite to look like fa-retweet 2017-01-15 11:40:05 -05:00
blackle
383114add3 Change boost sprite to look like fa-retweet 2017-01-15 11:40:05 -05:00
Eugen Rochko
7e46083338 Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse 2017-01-15 14:59:25 +01:00
Eugen Rochko
926459fc0a Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse 2017-01-15 14:59:25 +01:00
Eugen Rochko
73e217d9d7 Fix #427 - don't suggest hashtag if the search value contains a space 2017-01-15 14:47:39 +01:00
Eugen Rochko
7d7a11250c Fix #427 - don't suggest hashtag if the search value contains a space 2017-01-15 14:47:39 +01:00
Eugen Rochko
58b0fe2f28 Fix #449 - don't do relationships fetch for empty array of IDs 2017-01-15 14:47:39 +01:00
Eugen Rochko
1d5cbfa356 Fix #449 - don't do relationships fetch for empty array of IDs 2017-01-15 14:47:39 +01:00
Eugen Rochko
11117f5aec Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up 2017-01-15 14:47:39 +01:00
Eugen Rochko
cc1eccc8bc Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up 2017-01-15 14:47:39 +01:00
Eugen
3471b9acb1 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
Fix S3 default settings
2017-01-15 14:29:47 +01:00
Eugen
16f9490d33 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
Fix S3 default settings
2017-01-15 14:29:47 +01:00
Eugen Rochko
cd8e2f8ac8 Merge branch 'ineffyble-feature/toot-app-source' 2017-01-15 14:04:56 +01:00