about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-06-10Add DM conversations mode similar to upstreamThibaut Girka
2019-06-09Fix old migrations failing because of new version of `strong_migrations`Thibaut Girka
Fixes #1099
2019-06-07Merge pull request #1097 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-07[Glitch] Fix not being able to directly switch between list timelines in web UIEugen Rochko
Port 5bfd802c571a2793bb59ba4540407a6147e82f88 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07[Glitch] Fix “mark as sensitive” not being used in delete & redraftThibG
Port 2657765d2a6804f34ce65bfdab7ec96f07d99732 to glitch-soc
2019-06-07[Glitch] Scroll to compose form when focusJeong Arm
Port 8f3c32e29cf13a84b2f0a58da0ab0c99a88caad5 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07[Glitch] Fix refreshing featured toots when the new collection is emptyThibaut Girka
Port d34a3a2cc72c12ae5119150a8ac18dd8fb7a4e6b to glitch-soc
2019-06-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
2019-06-07Fix display of alt-text when a media attachment is not availableThibaut Girka
2019-06-07Add waiting time to list of pending accounts in admin UI (#10985)Eugen Rochko
2019-06-06Fix sass-lint config (#10982)Yamagishi Kazutoshi
2019-06-06Change e-mail contact for CoC enforcementThibG
2019-06-06Fix overlap of emoji button on search popup (#10978)Wenceslao Páez Chávez
2019-06-06Fix CW field automatically getting the focus when it is always enabledThibaut Girka
2019-06-06Fix not being able to directly switch between list timelines in web UI (#10973)Eugen Rochko
2019-06-06Fix “mark as sensitive” not being used in delete & redraft (#10980)ThibG
2019-06-06require rubocop-rails in .rubocop.yml (#10974)Yamagishi Kazutoshi
* Revert "Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)" This reverts commit 121d19d7fa239c52ce86352d3fdae0649c892a20. * Disable Rails/HelperInstanceVariable
2019-06-06Fix emoji picker being always displayed (#10979)Takeshi Umeda
* Fix emoji picker being always displayed * Remove duplicate content with other pull-requests
2019-06-05Scroll to compose form when focus (#10970)Jeong Arm
* Scroll to compose form when focus * Get rid of constructor
2019-06-05Cleanup various controllers (#10972)ThibG
* Remove skip_session! as it is not supported in Rails 5 * Minor cleanup in StreamEntriesController * Remove redundant mark_cacheable! calls
2019-06-05Fix potential private status leak (#10969)ThibG
2019-06-05Fix refreshing featured toots when the new collection is empty (#10971)ThibG
Fixes #10945
2019-06-05Merge pull request #1093 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-04Do not misattribute inlined boosts if `attributedTo` isn't present (#10967)ThibG
* Do not misattribute inlined boosts if `attributedTo` isn't present Fixes #10950 * Fix tests
2019-06-04Fix margins on profile metadata in single column mode (#10961)Eugen Rochko
2019-06-04Change reblogs counter to be updated when boosted privately (#10964)Eugen Rochko
2019-06-04Refactor all ActivityPub deliveries to be serialized and signed through one ↵Eugen Rochko
concern (#10966)
2019-06-04Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-04Fix poll API not requiring authentication on non-public polls (#10960)Eugen Rochko
* Fix poll API not requiring authentication on non-public polls That API does not reveal the content of the status, i.e. the question itself, nor who the author is, nor which status it belongs to, but it does reveal the poll options and how many answers they got Fix #10959 * Add test
2019-06-04Add profile directory link to single column navigation panel (#10963)Eugen Rochko
2019-06-04Revert #10957 (rubocop-rails) which is incompatible with CodeClimate (#10965)Yamagishi Kazutoshi
2019-06-04Add missing Korean translations (#10962)Jeong Arm
And change some word.
2019-06-05Bump intersection-observer from 0.5.1 to 0.7.0 (#10953)dependabot-preview[bot]
Bumps [intersection-observer](https://github.com/w3c/IntersectionObserver) from 0.5.1 to 0.7.0. - [Release notes](https://github.com/w3c/IntersectionObserver/releases) - [Commits](https://github.com/w3c/IntersectionObserver/commits)
2019-06-04Replace from scss-lint to sass-lint (#10958)Yamagishi Kazutoshi
2019-06-04Merge pull request #1079 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-06-04Use rubocop-rails (#10957)Yamagishi Kazutoshi
2019-06-04Replace from uglifyjs to terser (#10956)Yamagishi Kazutoshi
2019-06-04Bump babel-plugin-react-intl from 3.1.0 to 3.1.3 (#10944)dependabot-preview[bot]
Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.1.0 to 3.1.3. - [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases) - [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)
2019-06-04Bump webpacker from 4.0.6 to 4.0.7 (#10948)dependabot-preview[bot]
Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.6 to 4.0.7. - [Release notes](https://github.com/rails/webpacker/releases) - [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md) - [Commits](https://github.com/rails/webpacker/compare/v4.0.6...v4.0.7)
2019-06-04Bump react-swipeable-views from 0.13.0 to 0.13.3 (#10952)dependabot-preview[bot]
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views) from 0.13.0 to 0.13.3. - [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases) - [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md) - [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.0...v0.13.3)
2019-06-04Change dependabot update schedule from live to weekly (#10949)Eugen Rochko
2019-06-04Bump fuubar from 2.3.2 to 2.4.0 (#10947)dependabot-preview[bot]
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.3.2 to 2.4.0. - [Release notes](https://github.com/thekompanee/fuubar/releases) - [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md) - [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.3.2...releases/v2.4.0)
2019-06-04Bump @babel/* from 7.3.4 to 7.4.5 (#10936)dependabot-preview[bot]
* Bump @babel/plugin-proposal-object-rest-spread from 7.3.4 to 7.4.4 Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.3.4 to 7.4.4. - [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.3.4...v7.4.4) * Bump @babel/core from 7.3.4 to 7.4.5 * Bump @babel/plugin-proposal-class-properties from 7.3.4 to 7.4.4 * Bump @babel/plugin-proposal-decorators from 7.3.0 to 7.4.4 * Bump @babel/preset-env from 7.3.4 to 7.4.5 * Bump @babel/runtime from 7.3.4 to 7.4.5
2019-06-04Bump react from 16.7.0 to 16.8.6 (#10935)dependabot-preview[bot]
* Bump react from 16.7.0 to 16.8.6 Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.7.0 to 16.8.6. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.8.6/packages/react) * Bump react-dom from 16.7.0 to 16.8.6 * Bump react-test-renderer from 16.7.0 to 16.8.6
2019-06-03[Glitch] Fix profile picture previewJeong Arm
Port e13e4b28db7e066d1f6f21e306aa95b97c3ccd99 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-03Handle blank poll options more gracefully (#10946)ThibG
Pleroma currently allows (erroneously imho) empty poll options, that is, options with an empty (but existing) `name`.
2019-06-04Bump sass from 1.20.1 to 1.20.3 (#10941)dependabot-preview[bot]
Bumps [sass](https://github.com/sass/dart-sass) from 1.20.1 to 1.20.3. - [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.20.1...1.20.3)
2019-06-04Bump react-intl from 2.7.2 to 2.9.0 (#10940)dependabot-preview[bot]
Bumps [react-intl](https://github.com/yahoo/react-intl) from 2.7.2 to 2.9.0. - [Release notes](https://github.com/yahoo/react-intl/releases) - [Commits](https://github.com/yahoo/react-intl/compare/v2.7.2...v2.9.0)
2019-06-03Add audio length var to env sampleLady Lumb
Added MAX_AUDIO_LENGTH var and documented in .env.production.sample
2019-06-03Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock