Eugen Rochko
7c015ece45
Fix oembed controller test
2017-01-23 13:36:17 +01:00
Eugen
6062680dd4
Merge pull request #513 from mistydemeo/fix_textarea_selection_clicking
...
Textarea: fix clicking on name suggestions
2017-01-23 11:34:36 +01:00
Eugen
1953e3b6ed
Fix inflection
2017-01-22 23:08:51 +01:00
Eugen
956da43e19
Fix error
2017-01-22 23:07:31 +01:00
Eugen
cea9fb31fe
Mitigate inconsistent notifications
2017-01-22 21:50:17 +01:00
Eugen Rochko
61aee0006e
Override Rack::Request to use the same trusted proxy settings as Rails
2017-01-22 21:01:28 +01:00
Eugen Rochko
67befe5463
Allow to specify trusted proxies through env
2017-01-22 20:35:49 +01:00
Eugen
c66718afff
Merge pull request #509 from ineffyble/docs/developer-docs-additions
...
Update README.md to match new documentation (missed from previous commit)
2017-01-22 17:07:39 +01:00
Eugen
10fe63d4db
Merge pull request #508 from ineffyble/docs/developer-docs-additions
...
Documentation tweaks
2017-01-22 11:43:07 +01:00
Eugen Rochko
536cde4e99
Rename main docs page so it renders in github
2017-01-21 22:54:49 +01:00
Eugen Rochko
2baf0fabb4
Improve API docs formatting
2017-01-21 22:53:02 +01:00
Eugen Rochko
e92a1cf436
Add wiki contents to docs/ instead
2017-01-21 22:51:02 +01:00
Eugen Rochko
500278eb4c
Merge branch 'ineffyble-fix/error-pages'
2017-01-21 22:31:19 +01:00
Eugen Rochko
e22a56183a
Improve error page layouting. 500 page has to stay static because it's
...
used from nginx when Rails fails.
2017-01-21 22:30:47 +01:00
Eugen Rochko
b4a4eb73ae
Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages
2017-01-21 22:20:01 +01:00
Eugen Rochko
f036c6440b
Merge branch 'ineffyble-master'
2017-01-21 22:19:27 +01:00
Eugen Rochko
e028406db4
Fix code style
2017-01-21 22:19:13 +01:00
Eugen Rochko
d72dd38c13
Merge branch 'master' of https://github.com/ineffyble/mastodon into ineffyble-master
2017-01-21 22:15:22 +01:00
Eugen Rochko
3a4b5961be
Method to fetch a single notification
2017-01-21 22:14:13 +01:00
Eugen
deedf133d3
Merge pull request #506 from ineffyble/fix/issue-492-add-missing-header-image
...
Add a default missing.png header image - fixes #492
2017-01-21 20:56:11 +01:00
Eugen
6b666db112
Merge pull request #505 from ineffyble/fix/issue-503
...
Call uniq on the string version of mb_chars tags - fixes #503
2017-01-21 12:37:51 +01:00
Eugen Rochko
1aae0cfc2c
Fix #475 - add space after autocomplete
2017-01-20 21:39:41 +01:00
Eugen Rochko
9bd3b11cfb
Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain
2017-01-20 20:14:02 +01:00
Eugen Rochko
05abd977c1
Fix preview cards layout, do preview card crawling for remote statuses
2017-01-20 18:31:49 +01:00
Eugen
f4e28785f1
Merge pull request #502 from blackle/vistoggle
...
Show visibility toggle on videos, show regardless of sensitivity
2017-01-20 13:27:20 +01:00
Eugen Rochko
c8e4b9c663
No loading bars for cards, no failure if it 404s (that's expected)
2017-01-20 01:07:53 +01:00
Eugen Rochko
f0de621e76
Fix #463 - Fetch and display previews of URLs using OpenGraph tags
2017-01-20 01:00:14 +01:00
Eugen Rochko
8d0284f8d9
Hide more non-essential loading bars
2017-01-19 11:23:24 +01:00
Eugen Rochko
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
2017-01-19 11:06:06 +01:00
Eugen Rochko
9b0941182f
Don't show loading bar when checking account timeline for newer stuff
2017-01-19 11:01:01 +01:00
Eugen Rochko
46be4631ae
Fix #222 - Update followers count when following/unfollowing
...
Also, since the root component connects to the stream that updates home/notification columns,
there is pretty much no case for refreshing those columns beyond initial load. So, move the
loading of those columns into the root component, to prevent unneccessary reloads when switching tabs
on mobile or resizing desktop window between mobile/desktop layouts
2017-01-19 10:54:18 +01:00
Eugen Rochko
f051c2e813
Fix statsd null backend not being initialized properly
2017-01-19 09:37:07 +01:00
Eugen
8b9206f7d9
Try to avoid any potential loops
2017-01-19 02:14:57 +01:00
Eugen Rochko
306eb6e9c9
Add optional StatsD performance tracking
2017-01-18 23:44:29 +01:00
Eugen Rochko
7cfd5b680a
Fix forgotten change of settings
2017-01-17 20:37:54 +01:00
Eugen Rochko
c468446f4c
Fix boops?
2017-01-17 20:28:32 +01:00
Eugen Rochko
cde0476ca2
Fix #487
2017-01-17 20:11:16 +01:00
Eugen Rochko
fcb5a85cdd
Add sounds for notifications. Boop by @jk@mastodon.social
2017-01-17 20:09:03 +01:00
Eugen
d7a7baa9a7
Merge pull request #489 from ineffyble/master
...
Add Heroku deployment support
2017-01-17 18:46:53 +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
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
Eugen Rochko
1a33e4042e
Fix upload file input being re-rendered needlessly
2017-01-16 14:21:55 +01:00
Eugen Rochko
7d53ee73f3
Fix #238 - Add "favourites" column
2017-01-16 13:28:25 +01:00
Eugen Rochko
da5d366230
Fix #414 - Improve lightbox, add loading indicator
2017-01-16 12:04:02 +01:00
Eugen Rochko
a78148f763
Merge branch 'blackle-sensitive'
2017-01-16 11:37:35 +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
0439c7d58b
Move follow requests link above logout link in getting started column
2017-01-16 11:35:32 +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
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
7d7a11250c
Fix #427 - don't suggest hashtag if the search value contains a space
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
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
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
bfec9aaee0
Merge branch 'ineffyble-feature/toot-app-source'
2017-01-15 14:04:56 +01:00
Eugen Rochko
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
2017-01-15 14:01:33 +01:00
Eugen Rochko
ab165547fd
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
2017-01-15 13:23:47 +01:00
Eugen
1f7c0ad8d3
Merge pull request #464 from blackle/backflip
...
Make boost button spin around
2017-01-15 13:19:15 +01:00
Eugen
777f527d86
Merge pull request #474 from ineffyble/add-back-link-to-settings
...
Add a 'Back to Mastodon' link to footer of settings pages
2017-01-15 02:15:37 +01:00
Eugen
88801f7554
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
...
Hide 'Do not display on public timeline' for reply toots
2017-01-14 20:33:10 +01:00
Eugen
f63f0c4625
Fix too late return
2017-01-14 02:22:16 +01:00
Eugen Rochko
7cde08e30b
Improve extended about page layout
2017-01-13 20:27:02 +01:00
Eugen Rochko
c01dd089ff
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
Eugen Rochko
e25170f960
Add extended about page stub
2017-01-13 03:24:41 +01:00
Eugen Rochko
2939e9898b
Extend rails-settings-cached to merge db-saved hash values with defaults
2017-01-13 02:42:22 +01:00
Eugen Rochko
ca50ceeaf0
Add settings for contact information
2017-01-12 20:54:14 +01:00
Eugen Rochko
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
2017-01-12 20:46:24 +01:00
Eugen
babc6a1528
Merge pull request #461 from vjackson725/master
...
fix Vagrantfile so that the correct ruby is installed
2017-01-12 13:50:17 +01:00
Eugen Rochko
8f54a8851a
Add rake task for clearing out media from silenced accounts
2017-01-12 04:19:04 +01:00
Eugen Rochko
4a2ee43e80
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
2017-01-12 03:54:50 +01:00
Eugen Rochko
7951e7ffd5
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
...
fix bug in process feed service
2017-01-11 15:39:31 +01:00
Eugen
10739df458
Merge pull request #456 from ineffyble/fix-repo-url
...
Fix repo URL
2017-01-11 14:19:19 +01:00
Eugen Rochko
3ad0496ccb
Better animations
2017-01-11 04:21:49 +01:00
Eugen
4292cf60ae
Fix env variable name
2017-01-10 22:01:13 +01:00
Eugen Rochko
18b11100e7
Fix issue when settings are not defined for column type
2017-01-10 17:33:32 +01:00
Eugen Rochko
312c51b5c8
Home column filters
2017-01-10 17:25:10 +01:00
Eugen Rochko
1e9d2c4b1e
Add "not found" component to UI
2017-01-10 13:50:59 +01:00
Eugen
a1db2a191b
Add link to list of apps
2017-01-10 12:23:30 +01:00
Eugen
67a31454ad
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
Eugen Rochko
205ba00017
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
Eugen Rochko
5d558c14b4
Merge branch 'blackle-master'
2017-01-09 14:13:46 +01:00
Eugen Rochko
def1f8c5b3
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-01-09 14:12:40 +01:00
Eugen Rochko
d6a456dc71
Merge branch 'blackle-dropdown'
2017-01-09 14:12:00 +01:00
Eugen Rochko
3bddd647e0
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
2017-01-09 14:10:32 +01:00
Eugen Rochko
75f80bef10
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
Eugen Rochko
23ebf60b95
Improve initialState loading
2017-01-09 12:37:53 +01:00
Eugen Rochko
2e71bb031b
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
Eugen
38bc85e695
Merge pull request #443 from blackle/master
...
Add call-to developers on getting started page
2017-01-08 13:36:02 +01:00
Eugen
a8e30060ae
Merge pull request #446 from blackle/dropdown2
...
Expand dropdown leftways on status view
2017-01-08 13:34:27 +01:00
Eugen
69643338f6
Merge pull request #437 from krainboltgreene/patch-1
...
Simplifying followers mappings
2017-01-08 04:14:54 +01:00
Eugen
e8d6f6c8c1
Merge pull request #436 from krainboltgreene/patch-2
...
Less complicated determination of subscription
2017-01-08 04:00:22 +01:00
Eugen
db8a088502
Update badges
2017-01-08 03:47:33 +01:00
Eugen
6d097d559b
Merge pull request #434 from vjackson725/fix_vagrantfile
...
Fix Vagrantfile to include yarn
2017-01-08 02:58:43 +01:00
Eugen
4447c4c7c8
Merge pull request #435 from krainboltgreene/patch-1
...
Using "rails style" order arguments
2017-01-08 02:58:19 +01:00
Eugen
7a0a13ab53
Merge pull request #432 from blackle/volume-icon
...
Show correct volume icons on video player
2017-01-08 02:36:12 +01:00
Eugen
cec7e69827
Merge pull request #430 from blackle/logout_mobile
...
Show logout button on getting started so it's available on mobile
2017-01-08 01:24:06 +01:00
Eugen
679aa35e15
Merge pull request #429 from blackle/emojify_usernames
...
Emojify display names in notifcations
2017-01-08 00:19:24 +01:00
Eugen
165df323ae
Merge pull request #428 from blackle/contrast
...
Improve contrast of bio and username text in account info
2017-01-07 22:51:15 +01:00
Eugen
2fbb38e4b2
Merge pull request #425 from ineffyble/vagrant
...
Add Vagrant support for easy development environments
2017-01-07 18:31:59 +01:00
Eugen Rochko
be6ae3546f
Replace getting started icon on desktop nav bar with asterisk instead of hamburger
2017-01-07 15:46:39 +01:00
Eugen Rochko
5c7add2176
Fix #147 - Unreblogging will leave original status in feeds
2017-01-07 15:44:22 +01:00
Eugen Rochko