about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-08-24Fix slow local timeline query (#11648)Eugen Rochko
Fix #11643
2019-08-23Add audio player (#11644)Eugen Rochko
2019-08-23Add option to include reported statuses in warning e-mail (#11639)Eugen Rochko
2019-08-23Fix items in StatusContent render list not all having a key (#11645)ThibG
2019-08-23Add header to trends section and change refresh rate to 15 minutes (#11641)Eugen Rochko
2019-08-22Add soft delete for statuses for instant deletes through API (#11623)Eugen Rochko
* 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
2019-08-22Restore hashtag suggestions from local tag history (#11632)ThibG
* 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
2019-08-22Fix remote and staff-removed statuses leaving media behind for a day (#11638)Eugen Rochko
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
2019-08-21Fix the whitelist mode display not being enabled in the admin dashboard (#11634)mayaeh
2019-08-21Fix trending hashtags being fetched every 36 seconds instead of every hour ↵ThibG
(#11631)
2019-08-20Fix typoThibG
2019-08-20Add support for <sup> formatting elementHaelwenn (lanodan) Monnier
This is based of 3e095cab83f3e88c5f5f4ca9d7029379ed5b5b56 Related: https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-20Merge pull request #1200 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-20[Glitch] Fix handling of audio files in account media galleryThibG
Port b48c7ee059d0e08fff4bdf7fe7b0e09565288252 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-20Fix handling of audio files in account media gallery (#11629)ThibG
Fixes #11627
2019-08-20Merge pull request #1199 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-20Add button to edit media description from missing description confirmation ↵Thibaut Girka
dialog
2019-08-20Remove code for giving focus to first media without descriptionThibaut Girka
Since the textarea is in a modal, now…
2019-08-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/initializers/content_security_policy.rb (took our version)
2019-08-20Revert "Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)" (#11625)ThibG
This reverts commit 2e44b81166cab3511fe505b11b8a90cadd773a05.
2019-08-19Fix composer options colors in glitch-soc light themeThibaut Girka
2019-08-19Fix connect-src policy for TesseractThibaut Girka
2019-08-19Use public pack in about controller to handle blockpage JSThibaut Girka
2019-08-19Move character counter to the options box to match upstream stylingThibaut Girka
2019-08-19[Glitch] Fix hidden statuses losing focusThibaut Girka
Port 0d13a9cd13def44e10652275fed86d6d6d8e1a99 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Improve focal point modal on mobileThibG
Port 2ca6b2bb6c9e811ad98e3df23e70efbf22882e42 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Allow clicking behind previewThibG
Port d37126fd03e47c32eaf532937dfc843b952d0d5a to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Fix edit media modal on small screens, touch eventsEugen Rochko
Port 1bea3181975f377bbccfe92691e2cd281b298ec6 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Fix tesseract.js being part of the common chunkEugen Rochko
Port dfe60598899738250fc707db91048b871ab09282 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Add OCR tool to media editing modalEugen Rochko
Port 28636f43e4b0c04befa243b847c38e81c90f1289 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19Refactor character counter to match upstreamThibaut Girka
2019-08-19[Glitch] Add media editing modalEugen Rochko
Port 23f7afa562c49b24e979505680463bc712b11d94 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Add explanation to featured hashtags page and profileEugen Rochko
Port SCSS changes from b348c9b0dbd72f2a9930f9fcbbe72cd1c6b3efd8 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Add public blocks to /about/blocksThibG
Port SCSS changes from 9b6a5ed109e1986149c1f15a41d4f442ae8ae39c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Fix client-side resizing of image uploadsThibG
Port f178a01c11a4af077926dd035a0c4c44f6b3985c to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19[Glitch] Fix short number formatting for numbers above million in web UIEugen Rochko
Port 0e9668051e58b2ff4e48b82fa7cc17d385c7a5c9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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
2019-08-19Fix CSP needlessly allowing blob URLs in script-src (#11620)ThibG
2019-08-19Fix ignoring whole status because of one invalid hashtag (#11621)Eugen Rochko
Fix #11618
2019-08-19New Crowdin translations (#11596)Eugen Rochko
* 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
2019-08-19Fix hidden statuses losing focus (#11208)ThibG
Fixes #10991
2019-08-20Bump pkg-config from 1.3.7 to 1.3.8 (#11616)dependabot-preview[bot]
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>
2019-08-20Bump simple-navigation from 4.0.5 to 4.1.0 (#11617)dependabot-preview[bot]
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>
2019-08-19Bump pghero from 2.2.1 to 2.3.0 (#11615)dependabot-preview[bot]
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>
2019-08-19Bump pundit from 2.0.1 to 2.1.0 (#11613)dependabot-preview[bot]
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>
2019-08-19Bump rubocop-rails from 2.2.1 to 2.3.0 (#11612)dependabot-preview[bot]
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>
2019-08-19Bump oj from 3.8.1 to 3.9.0 (#11611)dependabot-preview[bot]
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>
2019-08-19Bump react-redux-loading-bar from 4.0.8 to 4.4.0 (#11609)dependabot-preview[bot]
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>
2019-08-19Bump redux from 4.0.1 to 4.0.4 (#11608)dependabot-preview[bot]
Bumps [redux](https://github.com/reduxjs/redux) from 4.0.1 to 4.0.4. - [Release notes](https://github.com/reduxjs/redux/releases) - [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/redux/compare/v4.0.1...v4.0.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>