Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9ab537f115e1
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3784204ba1a
Choose a head ref
  • 5 commits
  • 8 files changed
  • 3 contributors

Commits on Oct 12, 2020

  1. element-web: 1.7.8 -> 1.7.9 

    https://github.com/vector-im/element-web/releases/tag/v1.7.9
(cherry picked from commit 50394ce)
    @Ma27
    Ma27 committed Oct 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b601cd5 View commit details

  2. element-desktop: 1.7.8 -> 1.7.9 

    https://github.com/vector-im/element-desktop/releases/tag/v1.7.9
(cherry picked from commit 7db09ea)
    @Ma27
    Ma27 committed Oct 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    53c37f9 View commit details

  3. graylog: 3.3.7 -> 3.3.8 

    Bumps Graylog and integration plugins to version 3.3.8.

(cherry picked from commit 26c66d0)
    @fadenb
    fadenb committed Oct 12, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5854ffb View commit details

Commits on Oct 13, 2020

  1. Merge pull request #100361 from fadenb/graylog_3.3.8_20.03 

    [20.03] graylog: 3.3.7 -> 3.3.8
    @Ma27
    Ma27 authored Oct 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2d6c3c3 View commit details

  2. podman: Add patch for CVE-2020-14370 

    This backports the changes from upstream[1] to version 1.8.0.

Fixes #99829

[1]: https://github.com/containers/podman/commit/a7e864e6e7de894d4edde4fff00e53dc6a0b5074.patch
    @avdv @zowoq
    avdv authored and zowoq committed Oct 13, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d378420 View commit details
7 changes: 4 additions & 3 deletions pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.8",
"version": "1.7.9",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -34,7 +34,8 @@
"electron-store": "^2.0.0",
"electron-window-state": "^4.1.0",
"minimist": "^1.2.3",
"png-to-ico": "^1.0.2"
"png-to-ico": "^2.1.0",
"request": "^2.88.2"
},
"devDependencies": {
"asar": "^2.0.1",
@@ -56,7 +57,7 @@
"tar": "^6.0.1"
},
"hakDependencies": {
"matrix-seshat": "^2.1.1",
"matrix-seshat": "^2.2.1",
"keytar": "^5.6.0"
},
"build": {
Loading