Commit graph

39694 commits

Author SHA1 Message Date
Eugen Rochko
45c9f16f71
Improve load gap styling in web UI (#7100) 2018-04-10 17:12:10 +02:00
Eugen Rochko
dbf7f62cea Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
Fix #3565 (oops)
2018-04-10 16:08:28 +02:00
Eugen Rochko
49bbef1202
Use RAILS_LOG_LEVEL to set log level of Sidekiq, too (#7079)
Fix #3565 (oops)
2018-04-10 16:08:28 +02:00
Paul Woolcock
ed21e48ad6 Change custom emoji search to ILIKE instead of = (#7099) 2018-04-10 15:46:27 +02:00
Paul Woolcock
8f800ad691 Change custom emoji search to ILIKE instead of = (#7099) 2018-04-10 15:46:27 +02:00
Emelia Smith
765bfd0cf5 Feature: Allow staff to change user emails (#7074)
* Admin: Show unconfirmed email address on account page

* Admin: Allow staff to change user email addresses

* ActionLog: On change_email, log current email address and new unconfirmed email address
2018-04-10 09:16:06 +02:00
Emelia Smith
219a4423d8 Feature: Allow staff to change user emails (#7074)
* Admin: Show unconfirmed email address on account page

* Admin: Allow staff to change user email addresses

* ActionLog: On change_email, log current email address and new unconfirmed email address
2018-04-10 09:16:06 +02:00
MIYAGI Hikaru
62c6b71866 Fix GIFV encoding params (#7098)
- Explicitly specify video codec.
  When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec.
- Swap avarage bitrate and max bitrate.
2018-04-10 09:11:55 +02:00
MIYAGI Hikaru
e6e93ecd8a Fix GIFV encoding params (#7098)
- Explicitly specify video codec.
  When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec.
- Swap avarage bitrate and max bitrate.
2018-04-10 09:11:55 +02:00
Eugen Rochko
8af5b4ed4b Log rate limit hits (#7096)
Fix #7095
2018-04-10 01:20:18 +02:00
Eugen Rochko
80a944c882
Log rate limit hits (#7096)
Fix #7095
2018-04-10 01:20:18 +02:00
Renato "Lond" Cerqueira
ddbc1572f2 When creating status, if no sensitive status is given, use default (#7057)
Clients using the API that do not provide the sensitive flag are always
posting with false sensitive option.
2018-04-09 23:02:42 +02:00
Renato "Lond" Cerqueira
0c52654b52 When creating status, if no sensitive status is given, use default (#7057)
Clients using the API that do not provide the sensitive flag are always
posting with false sensitive option.
2018-04-09 23:02:42 +02:00
Emelia Smith
7a06bd7085 Feature: Direct message from Statuses (#7089)
* Fix: Switching between composing direct message and mention from menus

Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that.

* Fix: Add missing proptype check for onMention in Status component

* Add the ability to send a direct message to a user from the menu on Statuses

* Add space between "Embed" and "Mention" on expanded statuses menu
2018-04-09 17:09:11 +02:00
Emelia Smith
904a2479dd Feature: Direct message from Statuses (#7089)
* Fix: Switching between composing direct message and mention from menus

Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that.

* Fix: Add missing proptype check for onMention in Status component

* Add the ability to send a direct message to a user from the menu on Statuses

* Add space between "Embed" and "Mention" on expanded statuses menu
2018-04-09 17:09:11 +02:00
Una
dca7183dfb Optimize public/headers/missing.png (#7084) 2018-04-09 11:34:48 +02:00
Una
e057c0e525 Optimize public/headers/missing.png (#7084) 2018-04-09 11:34:48 +02:00
Marcin Mikołajczak
33671bcc50 i18n: Update Polish translation (#7085)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-09 17:28:53 +09:00
Marcin Mikołajczak
07d90b0414 i18n: Update Polish translation (#7085)
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-09 17:28:53 +09:00
Akihiko Odaki
31e1667933 Exclude status itself from context query (#7083)
ancestor_statuses and descendant_statuses used to include the root status
itself, but the behavior is confusing because the root status is not
an ancestor nor descendant.
2018-04-09 09:58:53 +02:00
Akihiko Odaki
498327b2e3 Exclude status itself from context query (#7083)
ancestor_statuses and descendant_statuses used to include the root status
itself, but the behavior is confusing because the root status is not
an ancestor nor descendant.
2018-04-09 09:58:53 +02:00
David Yip
337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
David Yip
67e77f230e
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
2018-04-08 19:05:02 -05:00
David Yip
6ef8db90be Merge pull request #414 from ThibG/glitch-soc/fixes/fix-video-playback
Fix video playback in glitch-soc detailed statuses
2018-04-08 18:18:41 -05:00
David Yip
695b53b796
Merge pull request #414 from ThibG/glitch-soc/fixes/fix-video-playback
Fix video playback in glitch-soc detailed statuses
2018-04-08 18:18:41 -05:00
David Yip
8c906efad0 Merge pull request #415 from ThibG/glitch-soc/fixes/source-url
Point to glitch-soc source and not tootsuite on the public page
2018-04-08 18:18:00 -05:00
David Yip
8a082d8735
Merge pull request #415 from ThibG/glitch-soc/fixes/source-url
Point to glitch-soc source and not tootsuite on the public page
2018-04-08 18:18:00 -05:00
Thibaut Girka
d8dea31e0c [Glitch] Fix video player height
Port 5eea3f9877 to glitch-soc
2018-04-09 01:08:51 +02:00
Thibaut Girka
9073687f66 [Glitch] Fix video player height
Port 31e7b73084 to glitch-soc
2018-04-09 01:08:51 +02:00
Thibaut Girka
c2b7080a6e [Glitch] Refactor scss
Port 480131a376 to glitch-soc
2018-04-09 01:08:50 +02:00
Thibaut Girka
101e6564fd [Glitch] Refactor scss
Port f691afaae9 to glitch-soc
2018-04-09 01:08:50 +02:00
Thibaut Girka
27ad9247a3 Fix video modal 2018-04-09 00:11:10 +02:00
Thibaut Girka
0fb5ea5d15 Fix video modal 2018-04-09 00:11:10 +02:00
Thibaut Girka
9a5a49f17c [Glitch] Avoid using JS to set height in MediaModal
Port 010c71f19c to glitch-soc
2018-04-08 23:18:24 +02:00
Thibaut Girka
a4fa8c9064 [Glitch] Avoid using JS to set height in MediaModal
Port fa5c867e0e to glitch-soc
2018-04-08 23:18:24 +02:00
Thibaut Girka
89f5ae00a5 [Glitch] Improved media modal
Port d6e88e29e2 to glitch-soc
2018-04-08 23:15:25 +02:00
Thibaut Girka
87071d9e81 [Glitch] Improved media modal
Port 4e929b2d17 to glitch-soc
2018-04-08 23:15:25 +02:00
Thibaut Girka
a5a305feb5 [Glitch] Allow to open a modal for embedded photo
Port 16a49799cf to glitch-soc
2018-04-08 23:06:33 +02:00
Thibaut Girka
0b86ec4e7f [Glitch] Allow to open a modal for embedded photo
Port bf7757cbbc to glitch-soc
2018-04-08 23:06:33 +02:00
Emelia Smith
f48902e6e6 Hide search from Compose on mobile devices (#7077)
* Hide search from Compose on mobile devices

We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile.

* Don't "showSearch" on mobile if we're not currently searching (isSearchPage)
2018-04-08 18:25:08 +02:00
Emelia Smith
0893b16695 Hide search from Compose on mobile devices (#7077)
* Hide search from Compose on mobile devices

We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile.

* Don't "showSearch" on mobile if we're not currently searching (isSearchPage)
2018-04-08 18:25:08 +02:00
Thibaut Girka
f8c7031f23 Point to glitch-soc source and not tootsuite on the public page
(hello AGPLv3)
2018-04-08 15:43:26 +02:00
Thibaut Girka
88bcfaeb18 Point to glitch-soc source and not tootsuite on the public page
(hello AGPLv3)
2018-04-08 15:43:26 +02:00
Emelia Smith
0e5e60a84b Add search item to tab bar for mobile devices (#7072)
* Add search item to tab bar for mobile devices

* Fix missing prop validation
2018-04-08 14:26:58 +02:00
Emelia Smith
c9cbb8de70 Add search item to tab bar for mobile devices (#7072)
* Add search item to tab bar for mobile devices

* Fix missing prop validation
2018-04-08 14:26:58 +02:00
Levi Bard
6828abc1d7 Enable updating additional account information from user preferences via rest api (#6789)
* Enable updating additional account information from user preferences via rest api
Resolves #6553

* Pacify rubocop

* Decoerce incoming settings in UserSettingsDecorator

* Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters

* Clean up user preferences update

* Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence
2018-04-08 13:43:10 +02:00
Levi Bard
cd0eaa349c Enable updating additional account information from user preferences via rest api (#6789)
* Enable updating additional account information from user preferences via rest api
Resolves #6553

* Pacify rubocop

* Decoerce incoming settings in UserSettingsDecorator

* Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters

* Clean up user preferences update

* Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence
2018-04-08 13:43:10 +02:00
ThibG
a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
* Fix follow/unfollow buttons on public profile

- Present non-logged users with web+mastodon:// URLs for remote accounts
- Present logged-in users with appropriate links (authorize_follows and
  remote_unfollows) for remote accounts

* Do not cache rendered cards if user is logged in
2018-04-08 13:40:22 +02:00
ThibG
1364e9e4ae Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
* Fix follow/unfollow buttons on public profile

- Present non-logged users with web+mastodon:// URLs for remote accounts
- Present logged-in users with appropriate links (authorize_follows and
  remote_unfollows) for remote accounts

* Do not cache rendered cards if user is logged in
2018-04-08 13:40:22 +02:00
Akihiko Odaki
fb8768a469 Free stroage if it is exceeding disk quota (#7061) 2018-04-08 13:32:39 +02:00