Matrix/element-desktop
Matrix/element-desktop
1
0
Fork 0
mirror of https://github.com/vector-im/element-desktop.git synced 2024-08-07 14:03:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
347 commits 104 branches 266 tags 97 MiB
Commit graph

347 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
96d272f76b Enable IRC UI labs flag in nightly 
For https://github.com/vector-im/riot-web/pull/13350
 2020-05-19 14:58:46 -06:00
RiotRobot
3e8feef642 Reset matrix-js-sdk back to develop branch 2020-05-19 11:16:19 +01:00
RiotRobot
48ab056785 Merge branch 'master' into develop 2020-05-19 11:15:22 +01:00
RiotRobot
defac64eff v1.6.1 2020-05-19 11:14:58 +01:00
RiotRobot
4069800a92 Prepare changelog for v1.6.1 2020-05-19 11:14:58 +01:00
RiotRobot
89318e403a Upgrade matrix-js-sdk to 6.1.0 2020-05-19 11:11:17 +01:00
Travis Ralston
c3fde65a1b Enable new room list labs flag 
See https://github.com/vector-im/riot-web/pull/13675
 2020-05-14 14:28:43 -06:00
Michael Telatynski
829451c4c4
Merge pull request #86 from vector-im/t3chguy/update_help 
Update help message to fix broken url to electron docs
 2020-05-14 19:28:57 +01:00
RiotRobot
d391ce6202 v1.6.1-rc.1 2020-05-14 16:22:36 +01:00
RiotRobot
d71423181e Prepare changelog for v1.6.1-rc.1 2020-05-14 16:22:36 +01:00
RiotRobot
3f3e0213a7 Upgrade matrix-js-sdk to 6.1.0-rc.1 2020-05-14 16:22:05 +01:00
Michael Telatynski
1cd23edb80 Update help message to fix broken url to electron docs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 11:27:26 +01:00
J. Ryan Stinnett
662aa56b4b
Merge pull request #85 from vector-im/jryans/linter 
Add CI scripts to install and link JS SDK
 2020-05-12 10:55:40 +01:00
J. Ryan Stinnett
18f42311f5
Merge pull request #84 from vector-im/jryans/docker-xenial 
Use Xenial as the build image's base distribution
 2020-05-11 14:20:12 +01:00
J. Ryan Stinnett
7f7357573c Add CI scripts to install and link JS SDK 
This installs and links the JS SDK to access ESLint rules and their deps. These
scripts are copied from the React SDK.

Part of https://github.com/vector-im/riot-web/issues/13584
 2020-05-11 10:33:31 +01:00
J. Ryan Stinnett
70c239f8d8 Merge Seshat deps into a single apt-get 2020-05-07 17:46:19 +01:00
J. Ryan Stinnett
94d8df6c57
Merge pull request #83 from vector-im/jryans/gpg-keys 
Persist GPG keys for Linux builds via Docker
 2020-05-07 17:41:39 +01:00
J. Ryan Stinnett
5bca8b4c83 Remove test.sh 2020-05-07 15:08:01 +01:00
J. Ryan Stinnett
c1be3a760d Attempt libcurl3 2020-05-07 15:05:31 +01:00
J. Ryan Stinnett
933c6ee3e3 Use Xenial as the build image's base distribution 
Since Xenial has the oldest glibc (2.23) of all the active distributions, this
attempts to construct a build image based on that. The Dockerfile here was built
by recursively expanding the `FROM` lines until reaching
`buildpack-deps:bionic-curl` and then changing that to `xenial`. Everything else
is the same.

Part of https://github.com/vector-im/riot-web/issues/13553
 2020-05-07 14:45:29 +01:00
J. Ryan Stinnett
c2896a9caf Persist GPG keys for Linux builds via Docker 
Each build command via Docker for Linux builds creates a separate writable layer
from scratch, so anything shared between commands needs to persist on the host.

This adds the container's GPG keys, so that the riot-web GPG key can be
imported in one step and verified in the next.

Fixes https://github.com/vector-im/riot-web/issues/13545
 2020-05-07 13:55:21 +01:00
Michael Telatynski
eac3b284b1
Merge pull request #81 from vector-im/t3chguy/electron_app 
Update README to mention profile support
 2020-05-07 13:49:04 +01:00
Michael Telatynski
4c623dc55a
s/riot-web/riot-desktop/ 2020-05-07 13:25:52 +01:00
J. Ryan Stinnett
e8b4ae90c4
Merge pull request #82 from vector-im/jryans/debian-upgrade-path 
Remove Conflicts from riot-desktop
 2020-05-07 11:41:34 +01:00
J. Ryan Stinnett
a0c3295eed Remove Conflicts from riot-desktop 
Some early testing suggests removing this will allow the install of the riot-web
transitional package to proceed.

Part of https://github.com/vector-im/riot-web/issues/13509
 2020-05-07 11:29:38 +01:00
Michael Telatynski
69b8cfe353 Update README 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-06 11:19:08 +01:00
RiotRobot
f9e126cb16 Merge branch 'master' into develop 2020-05-05 11:09:22 +01:00
RiotRobot
8681dce16f Merge branch 'release-v1.6.0' 2020-05-05 11:08:43 +01:00
RiotRobot
d88cbeaae0 v1.6.0 2020-05-05 11:06:57 +01:00
RiotRobot
75d83578c0 Prepare changelog for v1.6.0 2020-05-05 11:06:57 +01:00
RiotRobot
3354f15b2c Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:05:35 +01:00
RiotRobot
491cf680e9 v1.6.0-rc.6 2020-05-01 16:24:41 +01:00
RiotRobot
e90fe40054 Prepare changelog for v1.6.0-rc.6 2020-05-01 16:24:41 +01:00
RiotRobot
f01c25d01d Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:23:45 +01:00
RiotRobot
63f30c57e4 v1.6.0-rc.5 2020-04-30 11:25:21 +01:00
RiotRobot
929638ad64 Prepare changelog for v1.6.0-rc.5 2020-04-30 11:25:20 +01:00
RiotRobot
d621c32230 Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:24:49 +01:00
J. Ryan Stinnett
ee12d02d57
Merge pull request #79 from vector-im/jryans/add-default-distro 
Add a default Linux distribution
 2020-04-28 17:40:42 +01:00
J. Ryan Stinnett
d229c4a727 Add a default Linux distribution 
This adds a default Linux distribution which we'll suggest everyone uses going
forward to simplify packaging since the bytes are all the same anyway.

Part of https://github.com/vector-im/riot-web/issues/13367
 2020-04-28 11:49:29 +01:00
Travis Ralston
c014db42f1
Merge pull request #78 from vector-im/travis/release/labs-remove-padlocks 
Remove feature flag docs from docs on release
 2020-04-24 10:48:56 -06:00
Travis Ralston
09608b8ee6
Merge pull request #77 from vector-im/travis/labs-remove-padlocks 
Remove invite only padlocks feature flag config
 2020-04-24 10:45:14 -06:00
Travis Ralston
ea9f097d1c Remove cross-signing feature flag because it's not a feature 
It's a setting, but we don't want to disable it.
 2020-04-24 10:19:33 -06:00
Travis Ralston
fafde4aec7 Remove cross-signing feature flag because it's not a feature 
It's a setting, but we don't want to disable it.
 2020-04-24 10:18:11 -06:00
Travis Ralston
2f2fa4b76c Remove invite only padlocks feature flag config 
See https://github.com/matrix-org/matrix-react-sdk/pull/4487
 2020-04-24 10:12:39 -06:00
Travis Ralston
0d67869f43 Remove encrypted message search feature flag 
See https://github.com/matrix-org/matrix-react-sdk/pull/4467
 2020-04-24 10:12:35 -06:00
Travis Ralston
0fffeda85f Remove invite only padlocks feature flag config 
See https://github.com/matrix-org/matrix-react-sdk/pull/4487
 2020-04-24 10:04:05 -06:00
poljar
0a599c137c
Merge pull request #76 from vector-im/poljar/seshat-1.3.3-bump-release 
package.json: Bump the Seshat dep.
 2020-04-24 12:11:09 +02:00
Damir Jelić
ee8d7aaeec package.json: Bump the Seshat dep. 2020-04-24 12:05:26 +02:00
Damir Jelić
bd471d9ebe package.json: Unbump the seshat dep. 
The bump was accidentally merged to master, this doesn't belong here
yet.
 2020-04-24 12:01:32 +02:00
Damir Jelić
64f079581b package.json: Bump the Seshat dep. 2020-04-24 11:15:31 +02:00