tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
7,036 Commits 20 Branches 113 Tags 222 MiB
d2244c86de
Commit Graph

7036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
d2244c86de Goodbye Travis CI, hello Circle CI? (fixes #559) 2018-07-18 21:20:30 +02:00
Thibaut Girka
552b4d9a5f Disable threaded mode when canceling a reply (fixes #583) 2018-07-18 16:42:00 +02:00
ThibG
c44579c42d
Merge pull request #585 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-07-18 09:17:20 +02:00
Thibaut Girka
7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-17 22:05:25 +02:00
Thibaut Girka
1fb78602c5 Do not cause an error if domain_lists.blocks.next is undefined (fixes #572) 
Port d0d23b8f0a to glitch-soc
 2018-07-17 21:54:54 +02:00
Thibaut Girka
8501ad5c5c Process statuses on COMPOSE_SUBMIT_SUCCESS (fixes #579) 2018-07-17 21:54:36 +02:00
ThibG
012ca4c68d
Merge pull request #578 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-07-17 21:54:12 +02:00
Eugen Rochko
6277a6db2a
Hide "A look inside" in mobile layout on frontpage (#8044) 2018-07-17 21:44:11 +02:00
Eugen Rochko
f6910fba02
Ensure container of React components has full width (#8043) 
Fix #8018
 2018-07-17 18:54:07 +02:00
abcang
3c3cf7e208 Update supported Node.js version (#8041) 2018-07-17 15:29:33 +02:00
Eugen Rochko
2bcdfcdee3 Add missing translation for admin dashboard trends section (#8040) 2018-07-17 07:15:17 +09:00
Eugen Rochko
69c34f3438
Fix number of results returned from TrendingTags.get 2018-07-16 19:54:14 +02:00
Eugen Rochko
8241f162df
Fix tag usage display on admin dashboard 2018-07-16 19:51:16 +02:00
Eugen Rochko
0d13e30ad2
Display trending hashtags on admin dashboard (#8038) 2018-07-16 19:21:27 +02:00
Eugen Rochko
7e2678f7f6
Fix ActivityPub::UpdateDistributionWorker regression (#8039) 
Regression from #7998 let to profile updates not sending
 2018-07-16 18:43:22 +02:00
Eugen Rochko
a23ac107e4
Fix activity:interactions counter to count all interactions (#8037) 2018-07-16 18:35:43 +02:00
Thibaut Girka
bcf157a1a9 Avoid loading rails-ujs twice on vanilla flavour 2018-07-16 16:42:52 +02:00
Eugen Rochko
8f64b17d98 Whitelist dat/ipfs/gopher links in sanitizer (#8034) 
Fix #7994
 2018-07-16 22:17:43 +09:00
Thibaut Girka
f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	Dockerfile
	app/javascript/packs/common.js
	config/webpack/loaders/sass.js
	config/webpack/shared.js
	db/schema.rb
	package.json
	yarn.lock

A lot of the conflicts come from updating webpack.

Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.

Ported glitch changes to webpack 4.x
 2018-07-16 14:50:42 +02:00
Marcin Mikołajczak
daacf15d72 i18n: Update Polish translation (#8032) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-07-16 19:23:27 +09:00
Eugen Rochko
04587116bd
Fix typo in Admin::DashboardController#index 2018-07-16 01:58:10 +02:00
Eugen Rochko
2354b10eb5
Add admin dashboard (#8029) 2018-07-16 01:11:53 +02:00
Akihiko Odaki
7a68608237 Fix index detection a migration to revert index change (#8026) 2018-07-15 14:56:00 +02:00
THE BOSS ♨
dc62195a06 Upgrade Node.js to v8.x on nvmrc (#8023) 2018-07-15 12:29:17 +09:00
Kevin Liu
68cccb00ef Dockerfile: run asset precompilation as a build step (#7780) 
* Dockerfile: run asset precompilation as a build step

* Replace OTP_SECRET and SECRET_KEY_BASE with placeholders
 2018-07-15 01:19:09 +02:00
ThibG
955d5d36e8 Use LoadingBar instead of blur to indicate that an image is loading (fixes #4060) (#7562) 2018-07-15 01:18:09 +02:00
Yamagishi Kazutoshi
af161e849d Downgrade react-swipeable-views to v0.12.13 from v0.12.14 (#8022) 2018-07-15 01:01:01 +02:00
ThibG
d0d23b8f0a Do not cause an error if domain_lists.blocks.next is undefined (#8021) 
A valid URL is always truthy, so we can simplify this check
 2018-07-14 23:28:29 +02:00
Yamagishi Kazutoshi
0eacf2b419 Upgrade Node.js to v8.x on Docker image (#8019) 2018-07-14 15:12:27 +02:00
Jeong Arm
0f0576ea06 Add missing Korean translations (#8017) 2018-07-14 18:27:27 +09:00
Eugen Rochko
2a176514be
Display full acct on public status pages, always (#8011) 2018-07-14 04:07:47 +02:00
Eugen Rochko
38e9662d78
Disable language detection for texts shorter than 140 characters (#8010) 
If the input text is blank after preparation (only mention, or
only URL, or empty as in a media post), then use nil as language,
since it's OK to show to everyone.

Otherwise, always fall back to the server's default locale
 2018-07-14 04:05:36 +02:00
Eugen Rochko
0180037dfb
Fix streaming API still using filtered instead of chosen languages (#8009) 2018-07-14 03:59:31 +02:00
Eugen Rochko
5a6645c922
Fix static GIFs being saved as empty files when using local storage (#8012) 
Fix #7997
Fix #6237
 2018-07-14 03:56:52 +02:00
Yamagishi Kazutoshi
e9b322d0a6 Upgrade webpack to version v4.x (#6655) 2018-07-14 03:56:41 +02:00
Eugen Rochko
e709107463
Display Mastodon version in footer of web UI (#8013) 
Fix #7846
 2018-07-14 03:56:34 +02:00
Eugen Rochko
9b75dee316 Weblate translations (2018-07-14) (#8016) 
* Translated using Weblate (Slovak)

Currently translated at 97.7% (622 of 636 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (636 of 636 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Czech)

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Japanese)

Currently translated at 99.8% (635 of 636 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 93.5% (73 of 78 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/

* Translated using Weblate (Greek)

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Occitan)

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (German)

Currently translated at 100.0% (78 of 78 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

Eine Option ist "nie", also muss es das Ablaufdatum sein, nicht das Datum bis wann es gültig ist

* Translated using Weblate (Japanese)

Currently translated at 99.6% (305 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Japanese)

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/

* Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/

* Translated using Weblate (Greek)

Currently translated at 100.0% (80 of 80 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/

* Translated using Weblate (Slovak)

Currently translated at 98.7% (79 of 80 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 97.7% (622 of 636 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Danish)

Currently translated at 100.0% (80 of 80 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/

* Translated using Weblate (Galician)

Currently translated at 100.0% (643 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Galician)

Currently translated at 100.0% (82 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Persian)

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Persian)

Currently translated at 100.0% (82 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/

* Translated using Weblate (Japanese)

Currently translated at 93.9% (77 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.2% (638 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Japanese)

Currently translated at 99.3% (639 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Danish)

Currently translated at 77.2% (497 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/

* Translated using Weblate (Greek)

Currently translated at 100.0% (82 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/el/

* Translated using Weblate (Greek)

Currently translated at 99.8% (642 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (82 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (306 of 306 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (643 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Slovak)

Currently translated at 98.7% (81 of 82 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 97.0% (624 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Czech)

Currently translated at 5.2% (34 of 643 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* i18n-tasks normalize && yarn manage:translations
 2018-07-14 10:54:11 +09:00
Eugen Rochko
47c59591e0 Do not count self in potential friendships (#8014) 2018-07-14 10:44:23 +09:00
Jeong Arm
c8c25ea7eb Add dependencies for uWebSockets (#7466) 
UWS needs openssl and zlib https://github.com/uNetworking/uWebSockets/wiki/Misc.-details#dependencies
 2018-07-14 01:47:10 +02:00
Petko Bordjukov
37d428dfaf Update uws dependency to 10.148.0 (#7448) 
This release fixes issues with open events, adds Node 10 support
and drops Node 4, 5, 6 and 7.

Changes: 6152fb6787...689c15c59e
 2018-07-14 01:46:27 +02:00
Eugen Rochko
e55dce3176
Add federation relay support (#7998) 
* Add federation relay support

* Add admin UI for managing relays

* Include actor on relay-related activities

* Fix i18n
 2018-07-13 02:16:06 +02:00
ThibG
8e8491e1da
Merge pull request #575 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-07-12 21:41:40 +02:00
Thibaut Girka
ddfcedcfe4 Merge branch 'master' into glitch-soc/merge-upstream 2018-07-12 19:26:20 +02:00
Thibaut Girka
57f31b361f Add an option restricting secondary toot privacy to that of the toot being replied to 2018-07-12 19:15:44 +02:00
mayaeh
401559c376 Fix whole-word selection and i18n: Add Japanese translation for Whole-word (#8004) 
* Add Japanese translation for "Whole word" and add it's description.

* Fix to enable "Whole-word" selection.
 2018-07-12 17:58:26 +02:00
Thibaut Girka
d8b13b46f7 Move privacyPreference to utils 2018-07-12 15:31:42 +02:00
Thibaut Girka
cd05378b59 [Glitch] Refactor privacyPrefence() to use priority list 
Port f2d9a3c239 to glitch-soc
 2018-07-12 15:31:42 +02:00
Thibaut Girka
d67cb13d84 Use options rather than a boolean 
This prepares for a third option that would restrict privacy to
privacyPreference(replyPrivacy, sideArmBasePrivacy)
 2018-07-12 11:22:34 +02:00
Thibaut Girka
8c8707771d Do not store duplicate reply_privacy 2018-07-12 11:22:34 +02:00
Ash Levy
6f06d16b1e add option to enable auto visibility on secondary toot button 2018-07-12 11:22:34 +02:00