fa5f416270
Add confirmation dialog when posting media without description
...
Fixes #211
2018-08-30 13:20:37 +02:00
900d3e214b
Fix nil host in remotable ( #8508 )
...
Host can be nil in urls like
'https:https://example.com/path/file.png '
2018-08-29 21:13:49 +02:00
08c26ab391
[Glitch] Reduce padding of profile metadata boxes to allow more text
...
Port dad47a60d5
2018-08-29 19:28:59 +02:00
2adac68cc7
Fix CLI interface for removing remote media ( #8506 )
...
* Fix that can't delete media files even if "tootctl media remove" execute when "--background" not attached.
* Revert
This reverts commit 5aa7e09645b27bae38a26030148b23e553ee2662.
* Change to obtain and pass all columns when "--background" option is false.
2018-08-29 18:35:09 +02:00
c1e1e7f515
Update de.json ( #8515 )
...
"was gibt's neues" -> was gibt's Neues
2018-08-29 22:39:34 +09:00
8f33f0f087
Add opt-in feature to have the spoilers field always on ( fixes #634 )
2018-08-29 14:29:36 +02:00
2b5dd39fbb
Merge pull request #690 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-29 14:23:45 +02:00
ac4e67e535
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-29 13:57:56 +02:00
d51ab49ca0
Replace '貼' with '嘟' for 'toot' ( #8421 )
...
Replace '貼' with '嘟' so the web front-end looks more consistent.
2018-08-29 18:05:22 +09:00
4c3c69ff91
Add ffmpeg buildpack for scalingo ( #8500 )
...
* Add ffmpeg buildpack for scalingo.
* Add environment variable to install ffprobe
Note: For existing applications, admins needs to add 'WITH_FFPROBE=true' to environment variable.
2018-08-29 01:21:23 +02:00
45af08148d
formatter spec fixes & clarification ( #8481 )
...
updates some "context" and "it" lines to have clearer explanations
updates "context" lines to properly describe function input, and "it" lines to describe results
2018-08-29 01:20:56 +02:00
dad47a60d5
Reduce padding of profile metadata boxes to allow more text ( #8491 )
2018-08-29 01:20:11 +02:00
816384cf32
Fix followers/follows layout issues from #8418 ( #8505 )
...
* Add alwaysShowScrollbar prop to ScrollableList
* Fix followers/follows layout issues from #8418
2018-08-29 01:19:58 +02:00
a45a6fc459
Delete .gitkeep file since the app/javascript/mastodon directory is no longer empty ( #8510 )
2018-08-29 08:10:04 +09:00
0a841048fa
Fix CSP with S3/SWIFT hosts
2018-08-28 22:10:40 +02:00
11dc01f83e
[Glitch] Add CSS class to replies
...
Port ae562f4d2b
2018-08-28 19:52:47 +02:00
e8e32f8265
[Glitch] Preserve hashtag casing in web UI hashtag history
...
Port 81df5716b9
2018-08-28 19:52:28 +02:00
acdb5b43da
[Glitch] Implement tag auto-completion by history
...
Port bada0436b3
2018-08-28 19:52:28 +02:00
2bd0a71b0c
Preserve hashtag casing in threaded mode
...
Inspired by 81df5716b9
2018-08-28 19:52:28 +02:00
d96ea61a06
Merge pull request #684 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-28 19:51:36 +02:00
faeb568601
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-28 17:24:39 +02:00
2f78bd1b42
Adjust CSP to fix image resizing
2018-08-28 16:58:55 +02:00
f507c9713f
Display pending message on admin relays UI ( #8494 )
...
* Add missing specs for relay accept/reject
* Display pending message on admin relays UI
2018-08-28 05:39:43 +02:00
1295515bd4
[Glitch] Add missing video descriptions
...
Port 5b773a2c9c
2018-08-27 20:21:23 +02:00
2f8583ce4a
[Glitch] Wait until relationship is loaded before showing follow button
...
Port 38f6a43960
2018-08-27 20:21:12 +02:00
bd43a06413
Merge pull request #675 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-27 20:20:49 +02:00
ae562f4d2b
Add CSS class to replies ( #8473 )
2018-08-27 13:07:47 -04:00
4f4908311d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/api/v1/mutes_controller.rb
config/locales/simple_form.pl.yml
2018-08-27 18:09:28 +02:00
077dbaedf3
Include MOV in upload button tooltip. ( #8480 )
2018-08-27 13:05:27 +02:00
c13f14b627
Weblate translations (2018-08-27) ( #8483 )
...
* Translated using Weblate (French)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (Greek)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/
* Translated using Weblate (Danish)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Corsican)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Danish)
Currently translated at 86.1% (589 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (French)
Currently translated at 99.4% (680 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (French)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Czech)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.7% (682 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 98.6% (675 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.8% (683 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Arabic)
Currently translated at 0.1% (1 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Polish)
Currently translated at 98.9% (677 of 684 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Polish)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Polish)
Currently translated at 98.7% (81 of 82 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/
* Translated using Weblate (Persian)
Currently translated at 100.0% (312 of 312 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
2018-08-27 13:03:31 +02:00
9fe24fbf4b
Better singulars of account followers/toots. ( #8471 )
2018-08-26 21:30:53 +02:00
9c11d260e1
Make Api::V1::MutesController paginate properly ( #8472 )
...
Fixes #8463
2018-08-26 21:30:17 +02:00
86d4f4cfa9
Add more hotkeys to legend ( #8469 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-08-26 20:22:16 +02:00
1d319c531e
Add CLI task for rotating keys ( #8466 )
...
* If an Update is signed with known key, skip re-following procedure
Because it means the remote actor did *not* lose their database
* Add CLI method for rotating keys
bin/tootctl accounts rotate [USERNAME]
Generates a new RSA key per account and sends out an Update activity
signed with the old key.
* Key rotation: Space out Update fan-outs every 5 minutes per 1000 accounts
* Skip suspended accounts in key rotation
2018-08-26 20:21:03 +02:00
f9836d593c
Bump interactions count when a follow happens ( #8468 )
2018-08-26 20:02:45 +02:00
97c292e0d1
Add thor to Gemfile directly ( #8467 )
...
It's a common dependency, but just in case
2018-08-26 20:02:32 +02:00
476ba6e4f0
Fix low-hanging rubocop gripes ( #8458 )
...
* rubocop: quit being so picky
* rubocop: miscellany
* rubocop: prefer present to blank
2018-08-26 19:22:46 +02:00
8f38d2bf06
Merge pull request #674 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-26 19:12:07 +02:00
7e6a029f1b
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 18:21:33 +02:00
d370fccf92
Add aria-label to notifications ( #8460 )
...
Fix #8192
2018-08-26 17:53:26 +02:00
ee4af13f51
Fix NUM_DAYS in rake mastodon:media:remove_remote and print warning ( #8462 )
...
Remove old deprecated rake tasks
2018-08-26 17:19:47 +02:00
63859550d3
Delay e-mail notifications by 2 minutes ( #8438 )
...
Fix #8430
2018-08-26 16:53:19 +02:00
7271a40d09
Add CLI interface for importing custom emoji ( #8437 )
...
bin/tootctl emoji import PATH_TO_TAR
Fix #8435
2018-08-26 16:53:06 +02:00
6fae7f6a04
Add messages informing that collections are empty ( fixes #4115 ) ( #8418 )
...
* Add messages informing that collections are empty
Adds empty messages to blocked users, domain blocks, favourited statuses, users
that favourited toot, follow requests, followers of given user, user's being
followed by given user, lists, muted users, toots' boosts.
Switched from using ScrollContainer to ScrollableList and/or added empty
message's text.
Fixes #4115
* Update localization files with strings for #4115
* Fix whitespace issues pointed out by codeclimate
2018-08-26 16:39:37 +02:00
21641e9a82
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-26 14:39:16 +02:00
c0bfd1a830
Update _bio.html.haml ( #8449 )
...
On my local instance (https://ruby.social ) we have a custom emoji for octocat (:octocat:). I would love to be able to use the emoji in the metadata for my profile. Instead of:
| github | https://github.com/phaedryx
It could be:
| :octocat: | https://github.com/phaedryx
(using a single emoji makes it easier to read the urls)
2018-08-26 14:33:59 +02:00
f27c511e1c
Fix regression from #8439 ( #8455 )
...
Missing no-reduce-motion/reduce-motion body class
2018-08-26 14:29:58 +02:00
ae4240d236
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/views/layouts/application.html.haml
Edited:
app/helpers/application_helper.rb
app/views/admin/domain_blocks/new.html.haml
Conflict wasn't really one, just two changes too close to one another.
Edition was to adapt the class names for themes to class names for
skins and flavours.
Also edited app/views/admin/domain_blocks/new.html.haml to strip the
duplicate admin pack inclusion thing.
2018-08-26 14:23:24 +02:00
162e99db0b
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-08-26 13:23:52 +02:00
ec9e959ef9
Add health endpoint to streaming API ( #8441 )
...
GET /api/v1/streaming/health
Answers with OK. Fix #8337
2018-08-26 11:54:25 +02:00
Thibaut Girka
