nyastodon

Commit Graph

Author	SHA1	Message	Date
Eugen Rochko	a889756dd5	Bump version to 3.1.3 (#13389 )	4 years ago
Thibaut Girka	51d326f852	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
Eugen Rochko	aa8568b7f2	Bump version to 3.1.2 (#13162 )	4 years ago
Thibaut Girka	e037002401	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
Eugen Rochko	b752666e3f	Bump version to 3.1.1 (#13069 )	4 years ago
Thibaut Girka	dae5e446fe	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts.	4 years ago
Eugen Rochko	d2bcef7f6f	Bump version to 3.1.0 (#13053 )	4 years ago
Thibaut Girka	369201a425	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
Eugen Rochko	60e160a02d	Bump version to 3.1.0rc2 (#12999 )	4 years ago
Thibaut Girka	9adeaf2bfc	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system	4 years ago
Eugen Rochko	4bae4e972d	Bump version to 3.1.0rc1 (#12932 )	4 years ago
Thibaut Girka	61631f4751	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md - app/javascript/styles/mastodon/components.scss conflicts caused by image URLs being different - app/models/status.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline - app/views/statuses/_simple_status.html.haml - config/locales/en.yml some strings were changed upstream - spec/models/status_spec.rb as_home_timeline removed, kept glitch-soc-only as_direct_timeline	5 years ago
Eugen Rochko	e6d111f38b	Bump version to 3.0.1 (#12116 )	5 years ago
Thibaut Girka	1bbba0016a	Merge tag 'v3.0.0' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	83d3e7733d	Bump version to 3.0.0 (#12000 )	5 years ago
Thibaut Girka	a84aedb7a7	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.	5 years ago
Eugen Rochko	bae268b2f6	Bump version to 3.0.0rc3 (#12063 )	5 years ago
Thibaut Girka	16ff7c5627	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb	5 years ago
Eugen Rochko	13b06d4b3b	Bump version to 3.0.0rc2 (#11999 )	5 years ago
Eugen Rochko	e87bcaa107	Bump version to 3.0.0rc1 (#11900 )	5 years ago
Eugen Rochko	3c8372fa81	Bump version to 2.9.3 (#11899 )	5 years ago
Thibaut Girka	bca3825c17	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Clar Fon	a6b4440115	Remove pre from version, add extra suffix variable (#11407 )	5 years ago
Thibaut Girka	ddd875ad99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder	5 years ago
Eugen Rochko	b5c772c3d4	Bump version to 2.9.2 (#11152 )	5 years ago
Eugen Rochko	84f945d64c	Bump version to 2.9.1 (#11143 )	5 years ago
Thibaut Girka	60adda7e59	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	c9eeb2e832	Bump version to 2.9.0 (#11074 )	5 years ago
Eugen Rochko	275f09ccab	Bump version to 2.9.0rc2 (#11070 )	5 years ago
Thibaut Girka	1b0ff4cd69	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb	5 years ago
Eugen Rochko	0949c43ab3	Bump version to 2.9.0rc1 (#11004 )	5 years ago
Thibaut Girka	20d01a954e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.	5 years ago
Eugen Rochko	5cdb4c483f	Forward port version bumps to 2.8.3 and 2.8.4 (#10819 ) * Bump version to 2.8.3 * Bump version to 2.8.4	5 years ago
Thibaut Girka	68629f2773	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system	5 years ago
Eugen Rochko	2508370f44	Bump version to 2.8.2 (#10703 )	5 years ago
Thibaut Girka	52a4284fe5	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Ushitora Anqou	56880fa76a	Add SOURCE_TAG to show source repository's tag (#10698 )	5 years ago
Thibaut Girka	33c80e0783	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/media_attachment.rb	5 years ago
Eugen Rochko	5f9f610a23	Bump version to 2.8.1 (#10687 )	5 years ago
Thibaut Girka	a9eaa780f5	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc	5 years ago
Sho Kusano	3e6c7f3617	Configrationable repository url (#10600 ) * config: Add GITHUB_REPOSITORY for repository name * config: Add SOURCE_BASE_URL for repository url * Show source_url and repository name on getting started	5 years ago
Thibaut Girka	f5b4e9a54a	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	6afab2587d	Bump version to 2.8.0 (#10550 )	5 years ago
Thibaut Girka	5085559b15	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.	5 years ago
Eugen Rochko	830c2a9ccb	Bump version to 2.8.0rc3 (#10535 )	5 years ago
Eugen Rochko	c03f926cf3	Bump version to 2.8.0rc2 (#10501 )	5 years ago
Thibaut Girka	4444d8f9b3	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	ac650d7a13	Bump version to 2.8.0rc1 (#10340 ) Update AUTHORS.md Update CHANGELOG.md	5 years ago
Thibaut Girka	f513317ba2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.	5 years ago
Eugen Rochko	7d5e2dda78	Bump version to 2.7.4 (#10179 )	5 years ago
Thibaut Girka	0158937fc2	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - Dockerfile Took upstream version and reverted `f13ebd02c9`. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.	5 years ago
Eugen Rochko	96db7191d8	Bump version to 2.7.3 (#10102 )	5 years ago
Thibaut Girka	ff0576cc2b	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	7853be1f06	Bump version to 2.7.2 (#10067 )	5 years ago
Thibaut Girka	42713b9710	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - README.md: kept our version	5 years ago
Eugen Rochko	28866d329b	Bump version to 2.7.1 (#9932 )	5 years ago
Thibaut Girka	9dfbcf941e	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
Eugen Rochko	7cf85c0133	Bump version to 2.7.0	5 years ago
Thibaut Girka	5e0cf92fd1	Merge branch 'master' into glitch-soc/merge-upstream No conflicts.	5 years ago
Eugen Rochko	57e79eb1c2	Bump to 2.7.0rc3	5 years ago
Eugen Rochko	b59818d4ab	Bump version to 2.7.0rc2 (#9836 )	5 years ago
Thibaut Girka	a2a64ecd3e	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.	5 years ago
Eugen Rochko	15aed1ee6c	Bump version to 2.7.0rc1 (#9718 )	5 years ago
Thibaut Girka	d32d33f408	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	2df5ef18ae	Bump version to 2.6.5 (#9413 )	6 years ago
Thibaut Girka	a07e37cc17	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	c480da375b	Bump version to 2.6.4 (#9402 )	6 years ago
Thibaut Girka	bc8411ec87	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	d037e88277	Bump version to 2.6.3 (#9391 )	6 years ago
Thibaut Girka	55edfd6e0e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	637d0ed838	Bump version to 2.6.2 (#9370 )	6 years ago
Thibaut Girka	75b48dc177	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	ba06a5f485	Bump version to 2.6.1 (#9172 )	6 years ago
Eugen Rochko	50ce347ef9	Bump version to 2.6.0 (#9149 ) * Bump version to 2.6.0 * Update CHANGELOG.md	6 years ago
Thibaut Girka	1c448d6474	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.	6 years ago
Eugen Rochko	66019b0ec4	Bump version to 2.6.0rc4 (#9164 ) * Bump version to 2.6.0rc4 * Update CHANGELOG.md	6 years ago
Thibaut Girka	ee5132a00e	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	e84da282f6	Bump version to 2.6.0rc3 (#9142 ) * Bump version to 2.6.0rc3 * Update CHANGELOG.md	6 years ago
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	6 years ago
Eugen Rochko	2f0797bdbd	Bump version to 2.6.0rc2 (#9087 ) * Bump version to 2.6.0rc2 * Update CHANGELOG.md	6 years ago
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	6 years ago
Eugen Rochko	f468bfb830	Bump version to 2.6.0rc1 (#9025 ) * Bump version to 2.6.0rc1 * Update AUTHORS.md * Update CHANGELOG.md	6 years ago
Eugen Rochko	ef43f1d2ca	Bump version to 2.5.2 (#8960 )	6 years ago
Eugen Rochko	e6c01171de	Bump version to 2.5.1 (#8953 )	6 years ago
Thibaut Girka	3b05eb8002	Add -glitch suffix to version string Fixes #715	6 years ago
Thibaut Girka	6c233a04a0	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: README.md Discarded upstream changes to the README, kept our version.	6 years ago
Eugen Rochko	b65a9b7243	Bump version to 2.5.0	6 years ago
Thibaut Girka	a74a7d5fe3	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	08721170da	Bump version to 2.5.0rc2	6 years ago
Thibaut Girka	246c313d45	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.	6 years ago
Eugen Rochko	23752639b2	Bump version to 2.5.0rc1 (#8356 )	6 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	6 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068 )	6 years ago
Thibaut Girka	6f0f583abe	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	7ac5151b74	Bump version to 2.4.3	6 years ago
Eugen Rochko	89dc0c98ee	Bump version to 2.4.3rc3	6 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	6 years ago
Eugen Rochko	451e585b97	Bump version to 2.4.3rc2	6 years ago
Eugen Rochko	cb36ab9a10	Bump version to 2.4.3rc1	6 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	6 years ago
Eugen Rochko	d017f240f9	Bump version to 2.4.2	6 years ago
Eugen Rochko	86cce466b6	Bump version to 2.4.2rc3	6 years ago
Eugen Rochko	a04dca36a3	Bump version to 2.4.2rc2	6 years ago
Eugen Rochko	3b8023f9f9	Bump version to 2.4.2rc1	6 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
Eugen Rochko	0979d4275a	Bump version to 2.4.1	6 years ago
Eugen Rochko	35ae960122	Bump version to 2.4.1rc4	6 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/models/status.rb The conflict in the Status model was due to `5bf5003384`. It was resolved by accepting tootsuite's changes.	6 years ago
Eugen Rochko	158cd7ee74	Bump version to 2.4.1rc3	6 years ago
Eugen Rochko	fab65fb7e5	Bump version to 2.4.1rc2	6 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
Eugen Rochko	a29f196f95	Bump version to 2.4.1rc1	6 years ago
Thibaut Girka	e0ef89c73f	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
Eugen Rochko	7745a22ec7	Bump version to 2.4.0	6 years ago
Thibaut Girka	a4c9bda771	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: app/javascript/styles/mastodon-light.scss config/locales/en.yml config/locales/fr.yml config/locales/simple_form.pl.yml config/themes.yml Conflicts resolved by deleting config/themes.yml, marking app/javascript/styles/mastodon-light.scss as added, and taking all new translation strings, not removing anything from them.	6 years ago
Eugen Rochko	292c987522	Bump version to 2.4.0rc5	6 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/locales/simple_form.ja.yml	6 years ago
Eugen Rochko	bcbb6aa46f	Bump version to 2.4.0rc4	6 years ago
Jenkins	4c0770d6c8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
MIYAGI Hikaru	919eef3098	User agent for WebFinger (#7531 ) * User agent for WebFinger * local_domain → web_domain * 'http' is away accidentally...	6 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	6 years ago
Eugen Rochko	8756fd1e82	Bump version to 2.4.0rc3	6 years ago
Eugen Rochko	d75b63e4fb	Bump version to 2.4.0rc2	6 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	6 years ago
Eugen Rochko	50ed1e83ac	Bump version to 2.4.0rc1 (#7283 )	6 years ago
Thibaut Girka	88bcfaeb18	Point to glitch-soc source and not tootsuite on the public page (hello AGPLv3)	6 years ago
Eugen Rochko	2a90da1837	Fix UniqueUsernameValidator comparison (#6926 ) Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3	6 years ago
Eugen Rochko	6cc432bbc4	Bump version to 2.3.2	6 years ago
Eugen Rochko	dafae9818d	Bump version to 2.3.2rc5	6 years ago
Eugen Rochko	f64af6473f	Bump version to 2.3.2rc4	6 years ago
Eugen Rochko	74c39fada0	Bump version to 2.3.2rc3	6 years ago
Eugen Rochko	092f1df9d0	Bump version to 2.3.2rc2	6 years ago
Eugen Rochko	cdf8b92fea	Bump version to 2.3.2rc1	6 years ago
Eugen Rochko	2ef1ce1182	Bump version to 2.3.1	6 years ago
Eugen Rochko	79d3a8553f	Bump version to 2.3.1rc3	6 years ago
Eugen Rochko	f89ff65ec7	Bump version to 2.3.1rc2	6 years ago
Eugen Rochko	ab27dccba5	Bump version to 2.3.1rc1	6 years ago
Eugen Rochko	6e309f5e45	Bump version to 2.3.0	6 years ago
Eugen Rochko	bd077ad7d9	Bump version to 2.3.0rc3	6 years ago
Eugen Rochko	4ca60c665e	Bump version to 2.3.0rc2	6 years ago
Eugen Rochko	64f2ada5d4	Bump version to 2.3.0rc1	6 years ago
Eugen Rochko	e14c20582f	Bump version to 2.2.0	6 years ago
Eugen Rochko	e6db3427b7	Bump to 2.2.0rc2	6 years ago
Eugen Rochko	0b7a0d15c7	Bump version to 2.2.0rc1	6 years ago
Eugen Rochko	ff6ca8bdc6	Bump version to 2.1.3	6 years ago
Eugen Rochko	e9822a4e4e	Bump version to 2.1.2	6 years ago
Eugen Rochko	7571c37c99	Bump version to 2.1.1 (#6164 )	6 years ago
Daigo 3 Dango	a434d9c0cc	Remove period from the version number (#6039 ) 2.1.0. -> 2.1.0	7 years ago
Eugen Rochko	a29432f0cd	Bump version to 2.1.0 🎆	7 years ago
Eugen Rochko	098c7d27fe	Bump version to 2.1.0rc6	7 years ago

1 2 3 4 5 ...

287 Commits (1792b688ac6b0eeffa05076327cdf18bc97f5b48)