treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
7,361 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

7361 Commits (2fbebd89fb39bfead6b1d99f75f35526e1314eb7)

Author SHA1 Message Date
Thibaut Girka 2fbebd89fb Allow text inputs in local settings dialog 2018-08-31 18:35:03 +02:00
Thibaut Girka 02c32ad7af Add a setting to automatically unfold all content warnings 2018-08-31 18:35:03 +02:00
Thibaut Girka a3afd0791d [Glitch] Show compose form on delete & redraft when in mobile layout 
Port 97a2958ba1 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka f485e2ced3 Fix search results on compose box 2018-08-31 18:33:46 +02:00
Thibaut Girka 923a7f3f11 Fix account header showing on search page 2018-08-31 18:33:46 +02:00
Thibaut Girka deb14b957a [Glitch] On the mobile UI, move the search column to the right 
Port 5f0b9c5d36 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 89b50796ba [Glitch] Hide search from Compose on mobile devices 
Port f48902e6e6 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka fb195f37bb [Glitch] Add search item to tab bar for mobile devices 
Port 0e5e60a84b to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 042b5212cd [Glitch] Use withRouter for TabsBar 
Port 2040094568 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka e88fe59712 [Glitch] Move "compose" on mobile to floating action button 
Port 1237c34997 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 000b9f7b03 [Glitch] When search enabled, display hint in search popout 
Port a91ef56e80 to glitch-soc
 2018-08-31 18:33:46 +02:00
Thibaut Girka 253dd5fb12 Add bookmarks to archive takeout 2018-08-30 16:29:47 +02:00
Thibaut Girka 9ca7d1c7c8 Restrict querySelectorAll to the upload form component 2018-08-30 13:20:37 +02:00
Thibaut Girka fa5f416270 Add confirmation dialog when posting media without description 
Fixes #211
 2018-08-30 13:20:37 +02:00
Thibaut Girka 08c26ab391 [Glitch] Reduce padding of profile metadata boxes to allow more text 
Port dad47a60d5 to glitch-soc
 2018-08-29 19:28:59 +02:00
Thibaut Girka 8f33f0f087 Add opt-in feature to have the spoilers field always on (fixes #634) 2018-08-29 14:29:36 +02:00
ThibG 2b5dd39fbb Merge pull request #690 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-29 14:23:45 +02:00
Thibaut Girka ac4e67e535 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-29 13:57:56 +02:00
caasi Huang d51ab49ca0 Replace '貼' with '嘟' for 'toot' (#8421) 
Replace '貼' with '嘟' so the web front-end looks more consistent.
 2018-08-29 18:05:22 +09:00
Satsuki Yanagi 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
sundevour 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
Mélanie Chauvel (ariasuni) dad47a60d5 Reduce padding of profile metadata boxes to allow more text (#8491) 2018-08-29 01:20:11 +02:00
Jakub Mendyk 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
Drew Schuster a45a6fc459 Delete .gitkeep file since the app/javascript/mastodon directory is no longer empty (#8510) 2018-08-29 08:10:04 +09:00
Thibaut Girka 0a841048fa Fix CSP with S3/SWIFT hosts 2018-08-28 22:10:40 +02:00
Thibaut Girka 11dc01f83e [Glitch] Add CSS class to replies 
Port ae562f4d2b to glitch-soc
 2018-08-28 19:52:47 +02:00
Thibaut Girka e8e32f8265 [Glitch] Preserve hashtag casing in web UI hashtag history 
Port 81df5716b9 to glitch-soc
 2018-08-28 19:52:28 +02:00
Thibaut Girka acdb5b43da [Glitch] Implement tag auto-completion by history 
Port bada0436b3 to glitch-soc
 2018-08-28 19:52:28 +02:00
Thibaut Girka 2bd0a71b0c Preserve hashtag casing in threaded mode 
Inspired by 81df5716b9
 2018-08-28 19:52:28 +02:00
ThibG d96ea61a06 Merge pull request #684 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-28 19:51:36 +02:00
Thibaut Girka faeb568601 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-28 17:24:39 +02:00
Thibaut Girka 2f78bd1b42 Adjust CSP to fix image resizing 2018-08-28 16:58:55 +02:00
Eugen Rochko 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
Thibaut Girka 1295515bd4 [Glitch] Add missing video descriptions 
Port 5b773a2c9c to glitch-soc
 2018-08-27 20:21:23 +02:00
Thibaut Girka 2f8583ce4a [Glitch] Wait until relationship is loaded before showing follow button 
Port 38f6a43960 to glitch-soc
 2018-08-27 20:21:12 +02:00
ThibG bd43a06413 Merge pull request #675 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-27 20:20:49 +02:00
Maciek Baron ae562f4d2b Add CSS class to replies (#8473) 2018-08-27 13:07:47 -04:00
Thibaut Girka 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
M Somerville 077dbaedf3 Include MOV in upload button tooltip. (#8480) 2018-08-27 13:05:27 +02:00
Renato "Lond" Cerqueira 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
M Somerville 9fe24fbf4b Better singulars of account followers/toots. (#8471) 2018-08-26 21:30:53 +02:00
Jakub Mendyk 9c11d260e1 Make Api::V1::MutesController paginate properly (#8472) 
Fixes #8463
 2018-08-26 21:30:17 +02:00
Marcin Mikołajczak 86d4f4cfa9 Add more hotkeys to legend (#8469) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-08-26 20:22:16 +02:00
Eugen Rochko 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
Eugen Rochko f9836d593c Bump interactions count when a follow happens (#8468) 2018-08-26 20:02:45 +02:00
Eugen Rochko 97c292e0d1 Add thor to Gemfile directly (#8467) 
It's a common dependency, but just in case
 2018-08-26 20:02:32 +02:00
Quint Guvernator 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
ThibG 8f38d2bf06 Merge pull request #674 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-26 19:12:07 +02:00
Thibaut Girka 7e6a029f1b Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 18:21:33 +02:00
Eugen Rochko d370fccf92 Add aria-label to notifications (#8460) 
Fix #8192
 2018-08-26 17:53:26 +02:00