10590 Commits (e0b973c5d3a778f3bf43815423541f790c20cf1a)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	c8df53b75f	Fix public page crash due to audio player, fix unpause in audio player (#11652)	5 years ago
Eugen Rochko	9c65b122fc	Fix slow local timeline query (#11648) ... Fix #11643	5 years ago
Eugen Rochko	f13761d84b	Add audio player (#11644)	5 years ago
Eugen Rochko	9959cdc79f	Add option to include reported statuses in warning e-mail (#11639)	5 years ago
ThibG	0b19014089	Fix items in StatusContent render list not all having a key (#11645)	5 years ago
Eugen Rochko	cf56532ced	Add header to trends section and change refresh rate to 15 minutes (#11641)	5 years ago
Eugen Rochko	32c781ec6b	Add soft delete for statuses for instant deletes through API (#11623) ... * Add soft delete for statuses to allow them to appear instant * Allow reporting soft-deleted statuses and show them in the admin UI * Change index for getting an account's statuses	5 years ago
ThibG	d94a4763f6	Restore hashtag suggestions from local tag history (#11632) ... * Restore hashtag suggestions from local tag history * Append local hashtag suggestions instead of prepending them * Do not display inaccurate usage statistics for hashtags not retrieved from API * Fixup	5 years ago
Eugen Rochko	e4605bbb4a	Fix remote and staff-removed statuses leaving media behind for a day (#11638) ... The reason for unattaching media instead of removing it is to support delete & redraft functionality, but remote or staff-removed statuses will never be redrafted, so the media should be deleted immediately	5 years ago
mayaeh	2a49f9f5f5	Fix the whitelist mode display not being enabled in the admin dashboard (#11634)	5 years ago
ThibG	db5c84ce4b	Fix trending hashtags being fetched every 36 seconds instead of every hour (#11631)	5 years ago
ThibG	e9106c361f	Fix typo	5 years ago
Haelwenn (lanodan) Monnier	64aa99b3a2	Add support for <sup> formatting element ... This is based of 81c9377c7d Related: https://git.pleroma.social/pleroma/pleroma/issues/1191	5 years ago
ThibG	efc72fc80d	Merge pull request #1200 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	5 years ago
ThibG	c36ee7b85f	[Glitch] Fix handling of audio files in account media gallery ... Port 73b23ef7be to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	0f22699c02	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
ThibG	73b23ef7be	Fix handling of audio files in account media gallery (#11629) ... Fixes #11627	5 years ago
ThibG	a8ffa84a40	Merge pull request #1199 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	5 years ago
Thibaut Girka	c2ecfa969b	Add button to edit media description from missing description confirmation dialog	5 years ago
Thibaut Girka	cec23a0de6	Remove code for giving focus to first media without description ... Since the textarea is in a modal, now…	5 years ago
Thibaut Girka	f065048070	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/initializers/content_security_policy.rb (took our version)	5 years ago
ThibG	101b2695c6	Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)" (#11625) ... This reverts commit 5c310a43ef.	5 years ago
Thibaut Girka	e81a8dcd85	Fix composer options colors in glitch-soc light theme	5 years ago
Thibaut Girka	f82b1bb158	Fix connect-src policy for Tesseract	5 years ago
Thibaut Girka	031fe56133	Use public pack in about controller to handle blockpage JS	5 years ago
Thibaut Girka	2d84897916	Move character counter to the options box to match upstream styling	5 years ago
Thibaut Girka	558aa2bcfd	[Glitch] Fix hidden statuses losing focus ... Port d8153b99b3 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	ec9ae03ad7	[Glitch] Improve focal point modal on mobile ... Port dc83169865 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	e27d8efacf	[Glitch] Allow clicking behind preview ... Port a886bf3808 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	6f3f392e8a	[Glitch] Fix edit media modal on small screens, touch events ... Port 375f2f3864 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	66af3222be	[Glitch] Fix tesseract.js being part of the common chunk ... Port fe52fca65c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	b3f63b601a	[Glitch] Add OCR tool to media editing modal ... Port 41b188dce6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	f20d417448	Refactor character counter to match upstream	5 years ago
Eugen Rochko	4982885bfa	[Glitch] Add media editing modal ... Port da208e7d9b to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	199d7ce136	[Glitch] Add explanation to featured hashtags page and profile ... Port SCSS changes from 8e76c759c1 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	98df5f8fc2	[Glitch] Add public blocks to /about/blocks ... Port SCSS changes from 867b9f3e9c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
ThibG	150d3f7104	[Glitch] Fix client-side resizing of image uploads ... Port 0fd7f8315f to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Eugen Rochko	1d666bf95b	[Glitch] Fix short number formatting for numbers above million in web UI ... Port 954840740e to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	5 years ago
Thibaut Girka	c060523dc2	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/home_controller.rb - app/controllers/shares_controller.rb - app/javascript/packs/public.js - app/models/status.rb - app/serializers/initial_state_serializer.rb - app/views/home/index.html.haml - app/views/layouts/public.html.haml - app/views/public_timelines/show.html.haml - app/views/shares/show.html.haml - app/views/tags/show.html.haml - config/initializers/content_security_policy.rb - config/locales/en.yml - config/webpack/shared.js - package.json	5 years ago
ThibG	5a122f1450	Fix CSP needlessly allowing blob URLs in script-src (#11620)	5 years ago
Eugen Rochko	123ffd0a45	Fix ignoring whole status because of one invalid hashtag (#11621) ... Fix #11618	5 years ago
Eugen Rochko	cc34509d65	New Crowdin translations (#11596) ... * New translations en.yml (Czech) [ci skip] * New translations simple_form.en.yml (Arabic) [ci skip] * New translations simple_form.en.yml (Croatian) [ci skip] * New translations simple_form.en.yml (Corsican) [ci skip] * New translations simple_form.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations simple_form.en.yml (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Catalan) [ci skip] * New translations simple_form.en.yml (Bulgarian) [ci skip] * New translations simple_form.en.yml (Basque) [ci skip] * New translations simple_form.en.yml (Asturian) [ci skip] * New translations simple_form.en.yml (Albanian) [ci skip] * New translations en.yml (Croatian) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Albanian) [ci skip] * New translations en.yml (Arabic) [ci skip] * New translations en.yml (Armenian) [ci skip] * New translations en.yml (Asturian) [ci skip] * New translations en.yml (Basque) [ci skip] * New translations en.yml (Bulgarian) [ci skip] * New translations en.yml (Catalan) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Chinese Traditional) [ci skip] * New translations en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations en.yml (Bengali) [ci skip] * New translations en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Indonesian) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Ido) [ci skip] * New translations simple_form.en.yml (Occitan) [ci skip] * New translations simple_form.en.yml (Hungarian) [ci skip] * New translations simple_form.en.yml (Hebrew) [ci skip] * New translations simple_form.en.yml (Greek) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations simple_form.en.yml (Georgian) [ci skip] * New translations simple_form.en.yml (Galician) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations simple_form.en.yml (Finnish) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Persian) [ci skip] * New translations simple_form.en.yml (Dutch) [ci skip] * New translations simple_form.en.yml (Swedish) [ci skip] * New translations en.yml (Estonian) [ci skip] * New translations simple_form.en.yml (Welsh) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Turkish) [ci skip] * New translations simple_form.en.yml (Thai) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Slovenian) [ci skip] * New translations simple_form.en.yml (Slovak) [ci skip] * New translations simple_form.en.yml (Serbian (Latin)) [ci skip] * New translations simple_form.en.yml (Serbian (Cyrillic)) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Romanian) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Portuguese) [ci skip] * New translations simple_form.en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (Danish) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Polish) [ci skip] * New translations en.yml (Slovak) [ci skip] * New translations en.yml (Serbian (Latin)) [ci skip] * New translations en.yml (Serbian (Cyrillic)) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.yml (Romanian) [ci skip] * New translations en.yml (Portuguese, Brazilian) [ci skip] * New translations en.yml (Portuguese) [ci skip] * New translations en.yml (Persian) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Occitan) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Malay) [ci skip] * New translations en.yml (Lithuanian) [ci skip] * New translations en.yml (Latvian) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Kazakh) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.yml (Slovenian) [ci skip] * New translations en.yml (Swedish) [ci skip] * New translations en.yml (Dutch) [ci skip] * New translations en.yml (Greek) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations en.yml (Finnish) [ci skip] * New translations en.yml (French) [ci skip] * New translations en.yml (Galician) [ci skip] * New translations en.yml (Danish) [ci skip] * New translations en.yml (Georgian) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Hebrew) [ci skip] * New translations en.yml (Tamil) [ci skip] * New translations en.yml (Hungarian) [ci skip] * New translations en.yml (Ido) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations en.yml (Welsh) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Turkish) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.yml (Telugu) [ci skip] * New translations simple_form.en.yml (Estonian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations simple_form.en.yml (Japanese) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations en.json (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Russian) [ci skip] * New translations simple_form.en.yml (Russian) [ci skip] * New translations en.yml (Thai) [ci skip] * New translations en.json (Czech) [ci skip] * New translations doorkeeper.en.yml (Albanian) [ci skip] * New translations doorkeeper.en.yml (Arabic) [ci skip] * New translations doorkeeper.en.yml (Asturian) [ci skip] * New translations doorkeeper.en.yml (Basque) [ci skip] * New translations doorkeeper.en.yml (Slovak) [ci skip] * New translations doorkeeper.en.yml (Norwegian) [ci skip] * New translations doorkeeper.en.yml (Occitan) [ci skip] * New translations doorkeeper.en.yml (Persian) [ci skip] * New translations doorkeeper.en.yml (Polish) [ci skip] * New translations doorkeeper.en.yml (Portuguese) [ci skip] * New translations doorkeeper.en.yml (Portuguese, Brazilian) [ci skip] * New translations doorkeeper.en.yml (Russian) [ci skip] * New translations doorkeeper.en.yml (Serbian (Cyrillic)) [ci skip] * New translations doorkeeper.en.yml (Serbian (Latin)) [ci skip] * New translations doorkeeper.en.yml (Slovenian) [ci skip] * New translations doorkeeper.en.yml (Spanish) [ci skip] * New translations doorkeeper.en.yml (Swedish) [ci skip] * New translations doorkeeper.en.yml (Thai) [ci skip] * New translations doorkeeper.en.yml (Turkish) [ci skip] * New translations doorkeeper.en.yml (Ukrainian) [ci skip] * New translations doorkeeper.en.yml (Welsh) [ci skip] * New translations en.json (Estonian) [ci skip] * New translations doorkeeper.en.yml (Finnish) [ci skip] * New translations doorkeeper.en.yml (Bulgarian) [ci skip] * New translations doorkeeper.en.yml (Catalan) [ci skip] * New translations doorkeeper.en.yml (Chinese Simplified) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional) [ci skip] * New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong) [ci skip] * New translations doorkeeper.en.yml (Corsican) [ci skip] * New translations doorkeeper.en.yml (Croatian) [ci skip] * New translations doorkeeper.en.yml (Czech) [ci skip] * New translations doorkeeper.en.yml (Danish) [ci skip] * New translations doorkeeper.en.yml (Dutch) [ci skip] * New translations doorkeeper.en.yml (Esperanto) [ci skip] * New translations doorkeeper.en.yml (French) [ci skip] * New translations doorkeeper.en.yml (Korean) [ci skip] * New translations doorkeeper.en.yml (Galician) [ci skip] * New translations doorkeeper.en.yml (Georgian) [ci skip] * New translations doorkeeper.en.yml (German) [ci skip] * New translations doorkeeper.en.yml (Greek) [ci skip] * New translations doorkeeper.en.yml (Hebrew) [ci skip] * New translations doorkeeper.en.yml (Hungarian) [ci skip] * New translations doorkeeper.en.yml (Ido) [ci skip] * New translations doorkeeper.en.yml (Indonesian) [ci skip] * New translations doorkeeper.en.yml (Italian) [ci skip] * New translations doorkeeper.en.yml (Japanese) [ci skip] * New translations doorkeeper.en.yml (Kazakh) [ci skip] * New translations en.json (Portuguese) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Latvian) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Malay) [ci skip] * New translations en.json (Norwegian) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Indonesian) [ci skip] * New translations en.json (Romanian) [ci skip] * New translations en.json (Serbian (Cyrillic)) [ci skip] * New translations en.json (Serbian (Latin)) [ci skip] * New translations en.json (Slovenian) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Swedish) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (Thai) [ci skip] * New translations en.json (Italian) [ci skip] * New translations en.json (Ido) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Traditional, Hong Kong) [ci skip] * New translations en.json (Albanian) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Armenian) [ci skip] * New translations en.json (Asturian) [ci skip] * New translations en.json (Basque) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Bulgarian) [ci skip] * New translations en.json (Catalan) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Hungarian) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Danish) [ci skip] * New translations en.json (Dutch) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Finnish) [ci skip] * New translations en.json (French) [ci skip] * New translations en.json (Galician) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Greek) [ci skip] * New translations en.json (Hebrew) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Welsh) [ci skip] * New translations doorkeeper.en.yml (Estonian) [ci skip] * New translations en.yml (Japanese) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.json (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.json (German) [ci skip] * New translations en.yml (German) [ci skip] * New translations en.yml (Korean) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.json (Slovak) [ci skip] * New translations en.yml (Corsican) [ci skip] * New translations en.yml (Slovak) [ci skip] * i18n-tasks normalize * yarn manage:translations	5 years ago
ThibG	d8153b99b3	Fix hidden statuses losing focus (#11208) ... Fixes #10991	5 years ago
dependabot-preview[bot]	e849d13fba	Bump pkg-config from 1.3.7 to 1.3.8 (#11616) ... Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config) from 1.3.7 to 1.3.8. - [Release notes](https://github.com/ruby-gnome2/pkg-config/releases) - [Changelog](https://github.com/ruby-gnome/pkg-config/blob/master/NEWS) - [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.7...1.3.8) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	07fbf5d1d8	Bump simple-navigation from 4.0.5 to 4.1.0 (#11617) ... Bumps [simple-navigation](https://github.com/codeplant/simple-navigation) from 4.0.5 to 4.1.0. - [Release notes](https://github.com/codeplant/simple-navigation/releases) - [Changelog](https://github.com/codeplant/simple-navigation/blob/master/CHANGELOG.md) - [Commits](https://github.com/codeplant/simple-navigation/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	83e00255d2	Bump pghero from 2.2.1 to 2.3.0 (#11615) ... Bumps [pghero](https://github.com/ankane/pghero) from 2.2.1 to 2.3.0. - [Release notes](https://github.com/ankane/pghero/releases) - [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md) - [Commits](https://github.com/ankane/pghero/compare/v2.2.1...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	7b04ef05c3	Bump pundit from 2.0.1 to 2.1.0 (#11613) ... Bumps [pundit](https://github.com/varvet/pundit) from 2.0.1 to 2.1.0. - [Release notes](https://github.com/varvet/pundit/releases) - [Changelog](https://github.com/varvet/pundit/blob/master/CHANGELOG.md) - [Commits](https://github.com/varvet/pundit/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	05588491a3	Bump rubocop-rails from 2.2.1 to 2.3.0 (#11612) ... Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.2.1 to 2.3.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.2.1...v2.3.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	eab02d822e	Bump oj from 3.8.1 to 3.9.0 (#11611) ... Bumps [oj](https://github.com/ohler55/oj) from 3.8.1 to 3.9.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.8.1...v3.9.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago
dependabot-preview[bot]	5c310a43ef	Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609) ... Bumps [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar) from 4.0.8 to 4.4.0. - [Release notes](https://github.com/mironov/react-redux-loading-bar/releases) - [Changelog](https://github.com/mironov/react-redux-loading-bar/blob/master/CHANGELOG.md) - [Commits](https://github.com/mironov/react-redux-loading-bar/commits) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>	5 years ago