metu.life

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	aae60a2366	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict due to glitch-soc's theming system. Ported upstream changes.	5 years ago
Eugen Rochko	bb9ca8a587	Fix audio/video/images/cards not reacting to window resizes in web UI (#14130 ) * Fix audio/video/images/cards not reacting to window resizes in web UI * Update app/javascript/mastodon/features/audio/index.js Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	5 years ago
ThibG	d469247083	Fix very wide media attachments resulting in too thin a thumbnail (#14127 ) Fixes #14094	5 years ago
ThibG	01a99f7ec7	Fix crash in MergeWorker (#14129 ) Similarly to #12324, the code is passing an Account object where an id is expected.	5 years ago
Thibaut Girka	5d12b63e79	Simplify filtering condition	5 years ago
ash lea	c1377049c6	never filter own posts from timeline	5 years ago
ThibG	791402af7c	never filter own posts from timeline (#14128 ) Signed-off-by: Thibaut Girka <thib@sitedethib.com> Co-authored-by: ash lea <example@thisismyactual.email>	5 years ago
Eugen Rochko	419ad6248b	Change volume control and download buttons in web UI (#14122 ) * Fix audio download button not starting download in web UI * Fix volume controls on audio and video players in web UI * Remove download button from video player in web UI	5 years ago
ThibG	aaf91abffa	Fix audio player not working when media files are hosted on a different domain (#14118 )	5 years ago
ThibG	c6904c0d37	Fix unique username constraint for local users not being enforced in database (#14099 ) This should not be an issue in practice because of the Rails-level uniqueness check, but local accounts having a NULL domain means the uniqueness constraint did not apply to them (since no two NULL values are considered equal).	5 years ago
Eugen Rochko	75a2b8f815	Change design of audio players in web UI (#14095 )	5 years ago
dependabot[bot]	f111b71d1c	Bump eslint-import-resolver-node from 0.3.3 to 0.3.4 (#14081 ) Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import) from 0.3.3 to 0.3.4. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/resolvers/node/v0.3.3...resolvers/node/v0.3.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	975c943432	Bump fast-glob from 3.2.2 to 3.2.4 (#14079 ) Bumps [fast-glob](https://github.com/mrmlnc/fast-glob) from 3.2.2 to 3.2.4. - [Release notes](https://github.com/mrmlnc/fast-glob/releases) - [Commits](https://github.com/mrmlnc/fast-glob/compare/3.2.2...3.2.4) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	1b29574a54	Bump sass from 1.26.5 to 1.26.8 (#14078 ) Bumps [sass](https://github.com/sass/dart-sass) from 1.26.5 to 1.26.8. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/dart-sass/compare/1.26.5...1.26.8) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	25cd4998fe	Bump aws-sdk-core from 3.99.2 to 3.100.0 (#14072 ) Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.99.2 to 3.100.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	02fc97928c	Bump nearley from 2.19.3 to 2.19.4 (#14075 ) Bumps [nearley](https://github.com/hardmath123/nearley) from 2.19.3 to 2.19.4. - [Release notes](https://github.com/hardmath123/nearley/releases) - [Commits](https://github.com/hardmath123/nearley/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	3bf3b4cb22	Bump electron-to-chromium from 1.3.448 to 1.3.475 (#14068 ) Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.448 to 1.3.475. - [Release notes](https://github.com/kilian/electron-to-chromium/releases) - [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md) - [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.448...v1.3.475) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	d22931454e	Bump caniuse-lite from 1.0.30001078 to 1.0.30001084 (#14083 ) Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001078 to 1.0.30001084. - [Release notes](https://github.com/ben-eb/caniuse-lite/releases) - [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md) - [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001078...v1.0.30001084) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
Takeshi Umeda	434a6d0b15	Fix modifier key to keep the EmojiPicker on macOS (#14096 )	5 years ago
fuyu	cb3c6d1780	Fix unnecessary gap under of video modal (#14098 )	5 years ago
fuyu	a279acc730	Fix not working I18n on 2FA and Sign in token page (#14087 )	5 years ago
ThibG	ac8a788370	Fix functional user requirements in whitelist mode (#14093 ) Fixes #14092	5 years ago
ThibG	c7da2cc5a1	Merge pull request #1358 from ThibG/glitch-soc/merge-upstream Merge upstream changes	5 years ago
Eugen Rochko	9a641a5a0e	[Glitch] Add hints about incomplete remote content to web UI Port `3e9dc4044b` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	65a9b788fc	[Glitch] Fix initial audio volume not corresponding to what's displayed Port `755e8c76ab` to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
fuyu	45fbba2742	[Glitch] Fixed emoji detection problem to append border Port `b1484cf3ce` to glitch-soc Co-authored-by: ThibG <thib@sitedethib.com> Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	59e92004b3	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - `Gemfile.lock`: not a real conflict, upstream update too close to a glitch-soc-specific dependency	5 years ago
dependabot[bot]	b1d492f30a	Bump parallel from 1.19.1 to 1.19.2 (#14069 ) Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2. - [Release notes](https://github.com/grosser/parallel/releases) - [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
mayaeh	f56129a947	Suppress Redis#exists(key) warning (#14067 )	5 years ago
dependabot[bot]	f5e6cbacf3	Bump capistrano from 3.14.0 to 3.14.1 (#14037 ) * Bump capistrano from 3.14.0 to 3.14.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1) Signed-off-by: dependabot[bot] <support@github.com> * Bump capistrano from 3.14.0 to 3.14.1 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>	5 years ago
mayaeh	437cdf89e0	[Security] Bump rack from 2.2.2 to 2.2.3 (#14064 )	5 years ago
dependabot[bot]	ee3e709e74	Bump sanitize from 5.2.0 to 5.2.1 (#14063 ) Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1. - [Release notes](https://github.com/rgrove/sanitize/releases) - [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md) - [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	06262afeb2	Bump parallel_tests from 2.32.0 to 3.0.0 (#14044 ) Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.32.0...v3.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	a26f9cc0b1	Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034 ) Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1. - [Release notes](https://github.com/postmodern/bundler-audit/releases) - [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md) - [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	764fc04957	Bump jest from 25.4.0 to 26.0.1 (#14056 ) Bumps [jest](https://github.com/facebook/jest) from 25.4.0 to 26.0.1. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v25.4.0...v26.0.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
ThibG	755e8c76ab	Fix initial audio volume not corresponding to what's displayed (#14057 )	5 years ago
dependabot[bot]	df30002df8	Bump excon from 0.73.0 to 0.74.0 (#14046 ) Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.0. - [Release notes](https://github.com/excon/excon/releases) - [Changelog](https://github.com/excon/excon/blob/master/changelog.txt) - [Commits](https://github.com/excon/excon/compare/v0.73.0...v0.74.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	e009dcd1ab	Bump eslint-plugin-import from 2.20.2 to 2.21.2 (#14054 ) Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.2 to 2.21.2. - [Release notes](https://github.com/benmosher/eslint-plugin-import/releases) - [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md) - [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.20.2...v2.21.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	0d5570b631	Bump css-loader from 3.5.3 to 3.6.0 (#14041 ) Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.3...v3.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	a3a68445f1	Bump devise from 4.7.1 to 4.7.2 (#14045 ) Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.7.1...v4.7.2) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	36f3f874c8	Bump net-ssh from 6.0.2 to 6.1.0 (#14050 ) Bumps [net-ssh](https://github.com/net-ssh/net-ssh) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/net-ssh/net-ssh/releases) - [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt) - [Commits](https://github.com/net-ssh/net-ssh/compare/v6.0.2...v6.1.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	175befd398	Bump rubocop-rails from 2.5.2 to 2.6.0 (#14047 ) Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.2 to 2.6.0. - [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases) - [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.2...v2.6.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	3aa33948cd	Bump @babel/plugin-transform-react-inline-elements from 7.9.0 to 7.10.1 (#14048 ) Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.9.0 to 7.10.1. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-react-inline-elements) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	ee86d9f235	Bump httplog from 1.4.2 to 1.4.3 (#14043 ) Bumps [httplog](https://github.com/trusche/httplog) from 1.4.2 to 1.4.3. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/compare/v1.4.2...v1.4.3) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	cd3f069e85	Bump merge2 from 1.3.0 to 1.4.1 (#14052 ) Bumps [merge2](https://github.com/teambition/merge2) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/teambition/merge2/releases) - [Commits](https://github.com/teambition/merge2/compare/v1.3.0...v1.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	1357cc7a12	Bump jsx-ast-utils from 2.3.0 to 2.4.1 (#14040 ) Bumps [jsx-ast-utils](https://github.com/evcohen/jsx-ast-utils) from 2.3.0 to 2.4.1. - [Release notes](https://github.com/evcohen/jsx-ast-utils/releases) - [Changelog](https://github.com/jsx-eslint/jsx-ast-utils/blob/master/CHANGELOG.md) - [Commits](https://github.com/evcohen/jsx-ast-utils/compare/2.3.0...v2.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	d2e7813c62	Bump node-releases from 1.1.57 to 1.1.58 (#14053 ) Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.57 to 1.1.58. - [Release notes](https://github.com/chicoxyzzy/node-releases/releases) - [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.57...v1.1.58) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	153e8c281c	Bump opencollective-postinstall from 2.0.2 to 2.0.3 (#14042 ) Bumps [opencollective-postinstall](https://github.com/opencollective/opencollective-postinstall) from 2.0.2 to 2.0.3. - [Release notes](https://github.com/opencollective/opencollective-postinstall/releases) - [Commits](https://github.com/opencollective/opencollective-postinstall/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	e872197d55	Bump redis from 4.1.4 to 4.2.1 (#14038 ) Bumps [redis](https://github.com/redis/redis-rb) from 4.1.4 to 4.2.1. - [Release notes](https://github.com/redis/redis-rb/releases) - [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/redis-rb/compare/v4.1.4...v4.2.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago
dependabot[bot]	10857f4177	Bump regenerate from 1.4.0 to 1.4.1 (#14051 ) Bumps [regenerate](https://github.com/mathiasbynens/regenerate) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/mathiasbynens/regenerate/releases) - [Commits](https://github.com/mathiasbynens/regenerate/compare/v1.4.0...v1.4.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	5 years ago

1 2 3 4 5 ...

12171 Commits (9b3677d5097fb50f90a6abdce9d722e81d2db469) All Branches Search

12171 Commits (9b3677d5097fb50f90a6abdce9d722e81d2db469)

All Branches