2925 Commits (e34c5db19ea5d576796ad60c234e14ded35cc4e2)

Author	SHA1	Message	Date
Eugen Rochko	e34c5db19e	Fix hashtag column not subscribing to stream on mount (#10040) ... Fix #9895	6 years ago
Thibaut Girka	2bf47542f3	Fix video player width not being updated to fit container width	6 years ago
Thibaut Girka	389ca4605e	Fix CW fold/unfold in remote interaction dialog	6 years ago
Ben Lubar	9ad1ca9a2b	Allow multi-line image descriptions. (Glitch)	6 years ago
Thibaut Girka	e8ae6b050b	[Glitch] Fix crash on public hashtag pages when streaming fails ... Port 3547e3e59e to glitch-soc	6 years ago
Thibaut Girka	09c6d1c534	[Glitch] Change buttons on timeline preview to open the interaction dialog ... Port 6534acc019 to glitch-soc	6 years ago
Thibaut Girka	9b89a7b2f2	Port upstream's javascript to the error page	6 years ago
Thibaut Girka	da24c6aced	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/serializers/rest/instance_serializer.rb - app/views/layouts/error.html.haml - public/oops.png Took our version (same as upstream but without the things that only make sense in an animation). Additional changes: - app/javascript/flavours/vanilla/theme.yml Include upstream's javascript in error pages.	6 years ago
ThibG	3547e3e59e	Fix crash on public hashtag pages when streaming fails (#10061)	6 years ago
Eugen Rochko	8ff757ed6a	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) ... Regression from #9581	6 years ago
Eugen Rochko	66758328ba	Change error graphic to hover-to-play (#10055) ... Fix #6060	6 years ago
Eugen Rochko	6534acc019	Change buttons on timeline preview to open the interaction dialog (#10054) ... Fix #9922	6 years ago
Eugen Rochko	85ef358a0a	Fix style regressions on landing page (#10030)	6 years ago
Thibaut Girka	f29b69c08b	[Glitch] Fix hashtags select styling in default and high contrast skins ... Port bc9930f59d to glitch-soc	6 years ago
Eugen Rochko	74d84d2109	Fix color of static page links in high contrast theme (#10028)	6 years ago
Thibaut Girka	c8086b6efb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Thibaut Girka	dabbbe1e71	[Glitch] Fix occasional crash in detailed toot view ... Port f9a338b473 to glitch-soc	6 years ago
Eugen Rochko	4b9df07eac	Change conversations to always show names of other participants (#10047) ... Fix #9190	6 years ago
rinsuki	1a12ef6099	Fix breaks when opening a reply tree in WebUI (#10046) ... fix #10045	6 years ago
Eugen Rochko	dae31d8799	Fix hashtag column not subscribing to stream on mount (#10040) ... Fix #9895	6 years ago
Ben Lubar	a679867d38	Improve image description user experience (#10036) ... * Add image descriptions to searchable post content. * Allow multi-line image descriptions. * Request image descriptions in the same query as posts when creating the search index. (see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)	6 years ago
ThibG	793946fadb	Add list title editing (#9748) ... * Add list title editing Port changes made by ash for glitch-soc * Code style fixes	6 years ago
Eugen Rochko	72190529d0	Fix style regressions on landing page (#10030)	6 years ago
Eugen Rochko	bc9930f59d	Fix hashtags select styling in default and high contrast themes (#10029)	6 years ago
ThibG	bf0c9d7dfa	Disable box shadows for featured hashtags in light theme (#10034) ... Fixes #9990	6 years ago
Thibaut Girka	04d7200ba4	[Glitch] Add "copy link" item to status action bars ... Port 12cb694634 to glitch-soc	6 years ago
Eugen Rochko	a90bbe9bc1	Fix color of static page links in high contrast theme (#10028)	6 years ago
Thibaut Girka	53cc85871d	[Glitch] Don't focus spoiler input when disabled spoiler ... Inspired by 6866739387	6 years ago
Thibaut Girka	de60ff3809	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ThibG	1767bb542c	Merge pull request #913 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	6 years ago
Hinaloe	6866739387	Don't focus spiler input when disabled spoiler (#10017)	6 years ago
ThibG	98642fef2a	Fix timeline jumps (#10001) ... * Avoid two-step rendering of statuses as much as possible Cache width shared by Video player, MediaGallery and Cards at the ScrollableList level, pass it down through StatusList and Notifications. * Adjust scroll when new preview cards appear * Adjust scroll when statuses above the current scroll position are deleted	6 years ago
Eugen Rochko	87a5991846	Weblate translations (2019-02-11) (#10007) ... * Translated using Weblate (Galician) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Basque) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Arabic) Currently translated at 94.8% (716 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Basque) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (German) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Slovenian) Currently translated at 21.7% (164 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Corsican) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Welsh) Currently translated at 86.9% (93 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 94.6% (714 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Added translation using Weblate (Irish) * Translated using Weblate (Irish) Currently translated at 0.1% (1 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ga/ * Translated using Weblate (Telugu) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Indonesian) Currently translated at 38.4% (290 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Welsh) Currently translated at 94.6% (714 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Korean) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Welsh) Currently translated at 93.5% (100 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 98.0% (349 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Serbian) Currently translated at 95.8% (723 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Greek) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Occitan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Welsh) Currently translated at 98.0% (740 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Italian) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 84.0% (634 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovenian) Currently translated at 29.0% (219 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovenian) Currently translated at 34.4% (260 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Latvian) Currently translated at 40.7% (145 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/ * Translated using Weblate (Japanese) Currently translated at 91.0% (687 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Serbian) Currently translated at 95.8% (723 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Latvian) Currently translated at 48.3% (172 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Czech) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Greek) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ Rename "instance" to "server" * Translated using Weblate (Czech) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ rename from "instance" to "server" * Translated using Weblate (Czech) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ rename from "instance" to "server" * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ rename from "instance" to "server" * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Added translation using Weblate (Lithuanian) * Translated using Weblate (Japanese) Currently translated at 99.2% (353 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Lithuanian) Currently translated at 20.1% (152 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/lt/ * Added translation using Weblate (Albanian) * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Translated using Weblate (Albanian) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sq/ * Translated using Weblate (Albanian) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sq/ * Translated using Weblate (Albanian) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sq/ * Translated using Weblate (Albanian) Currently translated at 64.5% (487 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sq/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovenian) Currently translated at 40.0% (302 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovenian) Currently translated at 74.8% (80 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Slovenian) Currently translated at 45.2% (161 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * i18n-tasks normalize * yarn manage:translations * Fix inconsistent interpolations and unused keys * Fix missing plural forms	6 years ago
Eugen Rochko	12cb694634	Add "copy link" item to status action bars (#9983) ... Fix #6848	6 years ago
Thibaut Girka	d486152092	Handle deletion of filtered toots	6 years ago
Thibaut Girka	eb6dfe4d8b	Minor fix to timeline jump avoiding behavior	6 years ago
Thibaut Girka	7b23d3c657	Adjust scroll when statuses above the current scroll position are deleted	6 years ago
Thibaut Girka	f24bd9d629	Adjust scroll if previewCard appeared	6 years ago
Thibaut Girka	3d5ef5c497	Avoid two-step rendering of statuses as much as possible ... Cache width shared by Video player, MediaGallery and Cards at the ScrollableList level, pass it down through StatusList and Notifications.	6 years ago
Thibaut Girka	b05cda87f8	Refactor intersection observer article code	6 years ago
Thibaut Girka	18a540da9f	Cleanup redundant markup for hidden statuses	6 years ago
Thibaut Girka	f2b7ab4523	Hide items rendered out-of-frame (once they have been rendered at least once)	6 years ago
Thibaut Girka	d96df46a63	[Glitch] Rename from instance to server. ... Port f308fb56ab to glitch-soc	6 years ago
Thibaut Girka	75187f908a	[Glitch] Fix not showing custom emojis in share page emoji picker ... Port b037f6cec5 to glitch-soc	6 years ago
Thibaut Girka	b3fc70d13e	[Glitch] Add featured hashtags to profiles ... Port SCSS changes from d2d4d38f22	6 years ago
Thibaut Girka	07f0cf8573	[Glitch] Allow multiple files upload through web UI, including drag & drop ... Port 640966f3fc to glitch-soc	6 years ago
Thibaut Girka	5946d76d0a	[Glitch] Add missing rejection handling for Promises ... Port missing parts from d88504ec84 to glitch-soc	6 years ago
Thibaut Girka	538bae9f53	[Glitch] Add WebP support ... Port bcf34e31bd to glitch-soc	6 years ago
Thibaut Girka	1c37ad108c	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.	6 years ago
mayaeh	5e94fb5386	i18n: add Japanese translations (#10000) ... * Add Japanese translations. * Probably change to more general "統合" than "マージ" .	6 years ago