about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-11-27Merge branch 'glitch'pluralcafe-docker
2018-11-25Update MediaGallery and Video props when folding/unfolding CWs in detailed ↵Thibaut Girka
statuses
2018-11-25Render placeholder when inline video container width isn't knownThibaut Girka
2018-11-25Render placeholder instead of image when MediaGallery container width isn't ↵Thibaut Girka
known
2018-11-19Move URLs to backend in their own fileThibaut Girka
2018-11-16Fix composer not displaying on iPadThibaut Girka
2018-11-15In detailed status view, take displayMedia setting into account when ↵Thibaut Girka
changing media Fixes #819
2018-11-13Only stream local-only toots to logged-in usersThibaut Girka
2018-11-13Add field to serialized local-only statusesThibaut Girka
2018-11-13Exclude local-only toots from atom feedsThibaut Girka
2018-11-13Merge pull request #817 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-13[Glitch] Fix race condition when interacting with deleted tootsThibaut Girka
Port c875f19673e923e7a6e3c2b6656e96b863ca5915 to glitch-soc
2018-11-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-13[Glitch] Prepend account header even when status list is emptyThibaut Girka
Partially port 90b64c006998ec3bae365007781c61e8a79eeeef
2018-11-13[Glitch] Fix loading indicator inconsistencyThibaut Girka
Port 3cecf3e5b995f5035b17fd9572c17ba1ede9346b to glitch-soc
2018-11-13[Glitch] Use local instead of global loading indicator for timelines, ↵Thibaut Girka
account timelines Port dd00cd19d2536ce70442d74d72986721427691a5 to glitch-soc
2018-11-13Fix race condition causing shallow status with only a "favourited" attribute ↵ThibG
(#9272) Fixes #9231
2018-11-12Fix null error introduced in #9270 (#9275)Eugen Rochko
2018-11-12Perform deep comparison for card data when receiving new props (#9270)ThibG
Fixes #9226
2018-11-12Merge pull request #813 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-12Tighten CSP a bitThibaut Girka
2018-11-12Bump parallel_tests from 2.26.2 to 2.27.0 (#9263)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12Bump thor from 0.20.0 to 0.20.3 (#9266)dependabot[bot]
Bumps [thor](https://github.com/wycats/thor) from 0.20.0 to 0.20.3. - [Release notes](https://github.com/wycats/thor/releases) - [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md) - [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12Bump oj from 3.7.0 to 3.7.1 (#9265)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.0...v3.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-12Bump bullet from 5.8.1 to 5.9.0 (#9264)dependabot[bot]
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.0. - [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/5.8.1...5.9.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-11Only consider mouse move in scrolling on item insertion (#9262)Les Orchard
Fixes #9259
2018-11-11i18n: Add ja translations (#9261)mayaeh
* Run yarn manage:translations * Add Japanese translations.
2018-11-10Fix emoji update date processing (#9255)ThibG
2018-11-10Check that twitter:player is valid before using it (#9254)ThibG
Fixes #9251
2018-11-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-10Fix loading indicator inconsistency (#9252)Eugen Rochko
* Use global loading indicator when loading more items * Use local loading indicator for notifications And remove global loading indicator for initial custom emojis load
2018-11-09Merge pull request #806 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-09[Glitch] Remove unused computation of reblog references from updateTimelineThibaut Girka
2018-11-09[Glitch] Don't remove originals of boosted toots from timelineThibaut Girka
Port 2b51b4094c18c56fe8252d90db2b62ef69913fac to glitch-soc
2018-11-09Identify manual scrolling to cancel scroll to top reset on mouse idle (#9245)Les Orchard
2018-11-09Fix drawer waves being displayed in the list editorThibaut Girka
2018-11-09Remove unused computation of reblog references from updateTimeline (#9244)ThibG
2018-11-09[Glitch] Fix form validation flash message color and input bordersThibaut Girka
Port ccbdf689e824f93bc9a950bb29a4f1ce58e0f1c9 to glitch-soc
2018-11-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-09[Glitch] Implement adding a user to a list from their profileThibaut Girka
Port bb5558de627ca9bc26949570025f6193cd7cbd98 to glitch-soc
2018-11-09Improve ActiveRecord connection in on_worker_boot (#9238)Eugen Rochko
This is how it looks in the example in the Puma README
2018-11-09Bump tty-prompt from 0.17.1 to 0.17.2 (#9243)dependabot[bot]
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.17.1 to 0.17.2. - [Release notes](https://github.com/piotrmurach/tty-prompt/releases) - [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md) - [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.17.1...v0.17.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-09Bump sidekiq from 5.2.2 to 5.2.3 (#9241)dependabot[bot]
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/master/Changes.md) - [Commits](https://github.com/mperham/sidekiq/compare/v5.2.2...v5.2.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-09Bump pry-rails from 0.3.6 to 0.3.7 (#9242)dependabot[bot]
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.6 to 0.3.7. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.6...v0.3.7) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-09Bump hiredis from 0.6.1 to 0.6.3 (#9240)dependabot[bot]
Bumps [hiredis](https://github.com/redis/hiredis-rb) from 0.6.1 to 0.6.3. - [Release notes](https://github.com/redis/hiredis-rb/releases) - [Changelog](https://github.com/redis/hiredis-rb/blob/master/CHANGELOG.md) - [Commits](https://github.com/redis/hiredis-rb/compare/v0.6.1...v0.6.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08Fix nil error regression from #9229 in tootctl media remove (#9239)Eugen Rochko
Fix #9237
2018-11-08Reduce connect timeout limit and limit signature failures by source IP (#9236)Eugen Rochko
* Reduce connect timeout from 10s to 1s * Limit failing signature verifications per source IP
2018-11-08Use local instead of global loading indicator for timelines, account ↵Eugen Rochko
timelines (#9224) So that opening a profile feels faster. Also, pinned toots are not shown before other toots have loaded. Also, if no toots are loaded, added empty message
2018-11-08Bump bullet from 5.7.6 to 5.8.1 (#9156)dependabot[bot]
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.7.6 to 5.8.1. - [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/5.7.6...5.8.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-08Bump parallel_tests from 2.26.0 to 2.26.2 (#9154)dependabot[bot]
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.0 to 2.26.2. - [Release notes](https://github.com/grosser/parallel_tests/releases) - [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.0...v2.26.2) Signed-off-by: dependabot[bot] <support@dependabot.com>