about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-08-30Merge pull request #1208 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-29Revert bcrypt to 3.1.12, again (#11693)ThibG
Same reasons as in #11555
2019-08-29Fix clicking on the new audioplayer opening the toot in detailed viewThibaut Girka
2019-08-29[Glitch] Change window resize handler to switch to/from mobile layout as ↵ThibG
soon as needed Port bd4099d976b52f7ec00e00b23cfe6e2766ff1e4d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Fix more visual issues with the audio playerEugen Rochko
Port 2e99e3cab349db6102505736e3b4b94abe776b80 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Fix public page crash due to audio player, fix unpause in audio playerEugen Rochko
Port e72bac7576263445630926dd9992004ece7b73c4 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Add audio playerEugen Rochko
Port 4190e31626907059aebf32b1be66715dacb989a9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Add special alert for throttled requestsThibG
Port 81f864d4dac349dd7cd516149d00e1cffe063edc to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29[Glitch] Add confirmation modal when logging out from the web appThibG
Port fd3d45d38f289815bed0adc7eaa3b15894ddb8fb to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-08-29Remove sign out link from getting started columns, as it is already in the ↵Thibaut Girka
footer
2019-08-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.
2019-08-29Fix crashes from favico.js crashing the entire web appThibaut Girka
2019-08-29Refactor the Columns Area code to be closer to upstreamThibaut Girka
2019-08-29Add option to rewrite mentions to mentioned user's username or acctThibaut Girka
Fixes #666
2019-08-28[Security] Bump mixin-deep from 1.3.1 to 1.3.2 (#11683)dependabot-preview[bot]
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2. **This update includes a security fix.** - [Release notes](https://github.com/jonschlinkert/mixin-deep/releases) - [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-27Add special alert for throttled requests (#11677)ThibG
* Add special alert for throttled requests * Use an extra attribute instead of an array
2019-08-27[Security] Bump eslint-utils from 1.3.1 to 1.4.2 (#11675)dependabot-preview[bot]
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.3.1 to 1.4.2. **This update includes a security fix.** - [Release notes](https://github.com/mysticatea/eslint-utils/releases) - [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.3.1...v1.4.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26Add confirmation modal when logging out from the web app (#11671)ThibG
* [WiP] Add a confirmation modal before logging out from the web interface * Add confirmation to logout link in getting started footer * Please CodeClimate
2019-08-26Bump bullet from 6.0.1 to 6.0.2 (#11666)dependabot-preview[bot]
Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/flyerhzm/bullet/releases) - [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/6.0.1...6.0.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26Bump devise from 4.6.2 to 4.7.0 (#11667)dependabot-preview[bot]
Bumps [devise](https://github.com/plataformatec/devise) from 4.6.2 to 4.7.0. - [Release notes](https://github.com/plataformatec/devise/releases) - [Changelog](https://github.com/plataformatec/devise/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/devise/compare/v4.6.2...v4.7.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26Bump rubocop-rails from 2.3.0 to 2.3.1 (#11665)dependabot-preview[bot]
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.3.0 to 2.3.1. - [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.3.0...v2.3.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26Bump webpack-cli from 3.3.6 to 3.3.7 (#11663)dependabot-preview[bot]
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.6 to 3.3.7. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/v3.3.7/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.6...v3.3.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26Bump @babel/plugin-proposal-class-properties from 7.5.0 to 7.5.5 (#11661)dependabot-preview[bot]
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.5.0 to 7.5.5. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.5.0...v7.5.5) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-26Bump react-redux from 7.1.0 to 7.1.1 (#11664)dependabot-preview[bot]
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 7.1.0 to 7.1.1. - [Release notes](https://github.com/reduxjs/react-redux/releases) - [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md) - [Commits](https://github.com/reduxjs/react-redux/compare/v7.1.0...v7.1.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-25Add translation target for hashtag (#11657)mayaeh
* Add translation target for hashtag. * run `yarn manage:translations en`
2019-08-25Fix crash when switching back/from mobile layout (#11655)ThibG
Fixes #11630
2019-08-25Change window resize handler to switch to/from mobile layout as soon as ↵ThibG
needed (#11656)
2019-08-25Fix more visual issues with the audio player (#11654)Eugen Rochko
* Fix more visual issues with the audio player - Add horizontal baseline in the middle of waveform - Fix audio player colors in light theme - Use audio element instead of web audio API - Do not render any bars until the file is loaded - Do not allow interactions with waveform until the file is loaded * Fix code style issue
2019-08-25Fix public page crash due to audio player, fix unpause in audio player (#11652)Eugen Rochko
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)
generated by cgit-pink (git 2.37.1) at 2024-12-18 20:55:41 +0000