Neil Alexander
e3e79fdfe1
New macOS icon
2020-07-15 15:52:31 +01:00
David Baker
764835a43c
Merge pull request #115 from vector-im/dbkr/update_more_icons
...
More icon updates
2020-07-15 13:57:56 +01:00
David Baker
769d4cf647
Merge remote-tracking branch 'old-origin/develop' into dbkr/update_more_icons
2020-07-15 13:53:04 +01:00
David Baker
b06bba2c69
More icon updates
2020-07-15 13:50:00 +01:00
David Baker
80746c1f22
Merge pull request #114 from vector-im/dbkr/yarn_install
...
Don't forget to yarn install
2020-07-15 13:28:51 +01:00
David Baker
c2a39a4a8e
Merge remote-tracking branch 'old-origin/develop' into dbkr/yarn_install
2020-07-15 12:55:58 +01:00
David Baker
e7190e3168
Don't forget to yarn install
2020-07-15 12:53:50 +01:00
RiotRobot
78a601fbeb
Reset matrix-js-sdk back to develop branch
2020-07-15 12:12:12 +01:00
RiotRobot
6c3edb9a13
v1.7.0
2020-07-15 12:11:21 +01:00
RiotRobot
def85eef19
Prepare changelog for v1.7.0
2020-07-15 12:11:20 +01:00
RiotRobot
b25479093b
Upgrade matrix-js-sdk to 7.1.0
2020-07-15 12:08:07 +01:00
David Baker
b839264d9f
Merge pull request #113 from vector-im/dbkr/move_function_for_linter
...
Fix lint error
2020-07-15 11:43:54 +01:00
David Baker
5f01bbd9e0
Fix lint error
2020-07-15 11:41:30 +01:00
J. Ryan Stinnett
71c8ea417d
Merge remote-tracking branch 'origin/develop' into element-develop
2020-07-15 10:44:25 +01:00
J. Ryan Stinnett
c2cfed72df
Merge branch 'jryans/update-packages' into 'develop'
...
Update nightly transitional package
See merge request new-vector/element/element-desktop!8
2020-07-15 08:32:28 +00:00
J. Ryan Stinnett
da58f1d3d1
Update nightly transitional package
2020-07-15 09:25:00 +01:00
Jorik Schellekens
735ba9ce75
Merge pull request #112 from vector-im/joriks/delabs-font-scaling
...
Delabs font-scaling
2020-07-14 22:01:17 +01:00
David Baker
ed9a0a60de
Merge branch 'dbkr/windows_rebrand' into 'develop'
...
Some terribleness to make updating work on windows
See merge request new-vector/element/element-desktop!7
2020-07-14 18:20:01 +00:00
David Baker
3a253fe742
Some terribleness to make updating work on windows
...
Squirrel doesn't handle the executable changing name, as hopefully
explained in comments
2020-07-14 19:05:28 +01:00
J. Ryan Stinnett
a00d98a95a
Merge branch 'jryans/update-brand' into 'develop'
...
Update brand name in config
See merge request new-vector/element/element-desktop!6
2020-07-13 20:44:27 +00:00
Jorik Schellekens
2cc25f699b
Delabs font-scaling
2020-07-13 19:10:59 +01:00
J. Ryan Stinnett
0978a5042c
Update brand name in config
2020-07-13 18:40:21 +01:00
David Baker
3e80cdedd8
Merge branch 'dbkr/rebrand_icons' into 'develop'
...
New icons (expect install spinner)
See merge request new-vector/element/element-desktop!5
2020-07-13 16:12:59 +00:00
David Baker
358fe6f878
New install spinner
2020-07-13 17:10:31 +01:00
David Baker
8c9352dff0
colour profile on 512x512 icon
2020-07-13 16:59:04 +01:00
David Baker
483860fb00
add back the 512x512 icon
2020-07-13 15:57:14 +01:00
David Baker
7f6a2c6a50
Change mac icons to display p3 colourspace
...
so the logo is the right colour (on wide gamut displays)
2020-07-13 15:15:23 +01:00
Travis Ralston
94b2ac703a
Merge pull request #109 from vector-im/travis/room-list/enable
...
Remove room list labs flag from config
2020-07-13 06:56:19 -06:00
David Baker
332d52cfdc
New icons (expect install spinner)
2020-07-13 13:21:21 +01:00
Travis Ralston
e88ef97b87
Merge branch 'develop' into travis/room-list/enable
2020-07-10 21:35:47 -06:00
Jorik Schellekens
c7683d70b4
Merge pull request #111 from vector-im/joriks/delabs-irc-layout
...
Remove the irc layout setting from labs
2020-07-09 16:20:41 +01:00
Jorik Schellekens
53950e69ad
Remove the irc layout setting from labs
2020-07-09 15:59:16 +01:00
David Baker
9d650eacbb
Merge branch 'dbkr/add_brackets' into 'develop'
...
Add old app name in brackets
See merge request new-vector/element/element-desktop!4
2020-07-08 11:01:25 +00:00
Travis Ralston
d9047d7960
Merge pull request #108 from vector-im/travis/update-npm
...
Update npm to ^6.14.6
2020-07-07 14:49:35 -06:00
Travis Ralston
5e2876649d
Update npm to ^6.14.6
2020-07-07 14:48:36 -06:00
Travis Ralston
bed2eb2c41
Remove labs flag from config
2020-07-07 13:58:33 -06:00
David Baker
4a488c9ab2
Add old app name in brackets
...
And fix user data path to be non-bracketed version always.
2020-07-07 18:57:29 +01:00
David Baker
6cc225059a
Merge branch 'dbkr/debian_package_rename' into 'develop'
...
Rename riot package
See merge request new-vector/element/element-desktop!3
2020-07-03 16:29:14 +00:00
David Baker
2862870bb5
Remove transitional packages from the main control file
...
because this generated a broken package
2020-07-03 16:14:41 +01:00
RiotRobot
4f844d9a64
Reset matrix-js-sdk back to develop branch
2020-07-03 13:23:36 +01:00
RiotRobot
d91034a938
v1.6.8
2020-07-03 13:23:00 +01:00
RiotRobot
46d5e0508b
Prepare changelog for v1.6.8
2020-07-03 13:23:00 +01:00
RiotRobot
ed3a07e61b
Upgrade matrix-js-sdk to 7.1.0
2020-07-03 13:22:09 +01:00
David Baker
197f1dc451
Rename riot package
...
Add a transitional package which hopefully does the upgrade in the
right way (following https://wiki.debian.org/RenamingPackages
except that adding the transitional package to the new package's
control file make a package that reprepro rejects...)
The transitional packages can be built with:
```
dpkg -b riot-desktop_1.7.0_all
```
The nightly transitional package is named / versioned assuming a
release on Monday the 13th and will need to be edited & renamed
as approriate (it just needs to be greater than whatever the latest
nightly is at that point).
2020-07-03 12:30:01 +01:00
David Baker
fdb02b93e5
Merge branch 'dbkr/rebrand_step_2' into 'develop'
...
Rebrand step 2
See merge request new-vector/element/element-desktop!2
2020-07-02 14:01:17 +00:00
David Baker
c048dff4de
Apply 1 suggestion(s) to 1 file(s)
2020-07-02 13:42:45 +00:00
David Baker
85dd2504db
Rebrand step 2
...
* Continue to use Riot user data directory if it exists and the new
one doesn't, so users stay logged in.
* Move the auto-launcher over to new name.
* Look for keytar password under both names.
2020-07-02 13:30:11 +01:00
David Baker
6d5ada7e3f
Merge branch 'dbkr/rebrand_step_1' into 'develop'
...
Rebrand step 1: s/riot/element/ in the places where it's reasonably simple
See merge request new-vector/element/element-desktop!1
2020-07-01 16:49:46 +00:00
David Baker
72c88c8c87
change domain for fetching key
2020-07-01 17:46:17 +01:00
David Baker
ff84841b52
Apply suggestion to README.md
2020-07-01 16:42:50 +00:00
