David Baker
|
47493fa7d9
|
Merge branch 'master' into develop
|
2018-10-18 18:43:58 +01:00 |
|
David Baker
|
ecfafc613f
|
Merge branch 'release-v0.17.0'
|
2018-10-18 18:43:29 +01:00 |
|
David Baker
|
a7ea51fc3e
|
v0.17.1
|
2018-10-18 18:39:58 +01:00 |
|
David Baker
|
35147c6514
|
Prepare changelog for v0.17.1
|
2018-10-18 18:39:58 +01:00 |
|
David Baker
|
2518976326
|
v0.17.1
|
2018-10-18 18:38:54 +01:00 |
|
David Baker
|
40cb46de46
|
Merge pull request #7517 from vector-im/dbkr/stop_electron_crashing
Stop electron crashing
|
2018-10-18 18:35:38 +01:00 |
|
David Baker
|
bb907d49c9
|
Typo
|
2018-10-18 18:35:01 +01:00 |
|
David Baker
|
231ca253f2
|
Stop electron crashing
Workaround temporarily by not closing notifs on win32 as per
comment.
Fixes https://github.com/vector-im/riot-web/issues/7512
|
2018-10-18 18:31:06 +01:00 |
|
Bruno Windels
|
9d33255850
|
remove foo file to trigger jenkins
|
2018-10-17 11:29:04 +02:00 |
|
Bruno Windels
|
c5d6fc387c
|
Merge branch 'bwindels/redesign' into experimental
|
2018-10-17 11:25:03 +02:00 |
|
Bruno Windels
|
4a03e6d307
|
Merge branch 'develop' into bwindels/redesign
|
2018-10-17 11:24:33 +02:00 |
|
Bruno Windels
|
dbd4d5e779
|
update /experimental
|
2018-10-16 18:56:32 +02:00 |
|
Weblate
|
2a80d33a89
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-16 10:12:26 +00:00 |
|
David Baker
|
2202ff1ccd
|
update deps
|
2018-10-16 11:12:13 +01:00 |
|
Weblate
|
a138a9c6ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-16 10:10:09 +00:00 |
|
David Baker
|
3d8d66547f
|
Merge branch 'master' into develop
|
2018-10-16 11:09:55 +01:00 |
|
David Baker
|
17e84bf815
|
Merge branch 'release-v0.17.0'
|
2018-10-16 11:09:33 +01:00 |
|
David Baker
|
41540842eb
|
v0.17.0
|
2018-10-16 11:00:39 +01:00 |
|
David Baker
|
65cc3000ee
|
Prepare changelog for v0.17.0
|
2018-10-16 11:00:39 +01:00 |
|
David Baker
|
1fc8592ef6
|
v0.17.0
|
2018-10-16 10:59:18 +01:00 |
|
David Baker
|
4afb5caa4e
|
Released js-sdk & react-sdk
|
2018-10-16 10:58:29 +01:00 |
|
Bruno Windels
|
ee137ce44c
|
Merge branch 'develop' into bwindels/redesign
|
2018-10-16 11:58:15 +02:00 |
|
Bruno Windels
|
9830ab3aad
|
Merge pull request #7503 from vector-im/dbkr/ll_phased_rollout
Phased rollout of lazyloading
|
2018-10-16 11:44:49 +02:00 |
|
David Baker
|
005e4aa1bd
|
Phased rollout of lazyloading
|
2018-10-16 10:43:15 +01:00 |
|
David Baker
|
de7d3ba701
|
Change electron build script paths
Because electron builder has decided to output the mac assets to
somewhere else today.
|
2018-10-16 10:26:04 +01:00 |
|
David Baker
|
05884ba279
|
Merge pull request #7501 from vector-im/dbkr/update_electron_builder_relbranch
Update to latest electron builder
|
2018-10-16 09:40:30 +01:00 |
|
David Baker
|
a0e067510c
|
Update to latest electron builder
Tested auto update on both windows (ia32) and mac, seems to work!
|
2018-10-16 09:39:30 +01:00 |
|
Weblate
|
2784d1b31c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-16 08:37:33 +00:00 |
|
Tom Van Eyck
|
8e9d7d97f6
|
Translated using Weblate (Dutch)
Currently translated at 100.0% (37 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
|
2018-10-16 08:37:31 +00:00 |
|
David Baker
|
f483fd3916
|
Merge pull request #7498 from vector-im/dbkr/update_electron_builder
Update to latest electron builder
|
2018-10-16 09:37:27 +01:00 |
|
David Baker
|
4e65b5f73b
|
Update to latest electron builder
Tested auto update on both windows (ia32) and mac, seems to work!
|
2018-10-15 18:13:47 +01:00 |
|
Bruno Windels
|
0d7093fe76
|
Merge branch 'bwindels/redesign' into experimental
|
2018-10-15 14:13:11 +02:00 |
|
Travis Ralston
|
47ade14e07
|
Merge pull request #6831 from MTRNord/patch-8
Fix Tinter.setTheme to not fire using Firefox
|
2018-10-12 13:55:43 -06:00 |
|
David Baker
|
5ad9d2094a
|
v0.17.0-rc.1
|
2018-10-11 16:03:53 +01:00 |
|
David Baker
|
848bd8f553
|
Prepare changelog for v0.17.0-rc.1
|
2018-10-11 16:03:52 +01:00 |
|
David Baker
|
74f2266d89
|
v0.17.0-rc.1
|
2018-10-11 16:02:48 +01:00 |
|
David Baker
|
03323bc294
|
Merge remote-tracking branch 'origin/develop' into release-v0.17.0
|
2018-10-11 16:02:20 +01:00 |
|
David Baker
|
df1eb9f5cb
|
Merge pull request #7483 from vector-im/revert-7429-bwindels/alsocommitlockfile
Revert "also commit the lock file when bumping version as it is now committed to the repo"
|
2018-10-11 16:02:09 +01:00 |
|
David Baker
|
aaa9c82758
|
Revert "also commit the lock file when bumping version as it is now committed to the repo"
|
2018-10-11 16:01:56 +01:00 |
|
David Baker
|
ba51c0721e
|
js-sdk & react-sdk rc.1
|
2018-10-11 15:42:30 +01:00 |
|
David Baker
|
845b40d815
|
Bump electron version to 3
|
2018-10-11 12:06:30 +01:00 |
|
David Baker
|
69adab2c9f
|
Merge pull request #7478 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-10-11 11:08:59 +01:00 |
|
David Baker
|
80f0964342
|
Translated using Weblate (English (United States))
Currently translated at 100.0% (37 of 37 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/en_US/
|
2018-10-11 09:58:31 +00:00 |
|
Weblate
|
56372b6a5f
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-11 09:29:42 +00:00 |
|
Matthew Hodgson
|
af4d3da7a8
|
link to Here Be Dragons
|
2018-10-11 10:29:28 +01:00 |
|
Bruno Windels
|
eed9c56c51
|
Merge branch 'develop' into matthew/dharma
|
2018-10-11 09:56:07 +02:00 |
|
Weblate
|
ae1971f5d2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-10 16:35:17 +00:00 |
|
Matthew Hodgson
|
5c184e501d
|
dep on dev sdks
|
2018-10-10 17:35:06 +01:00 |
|
Weblate
|
3488f04dd4
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-10-09 03:18:28 +00:00 |
|
Travis Ralston
|
92db2b85f3
|
Merge pull request #7444 from aaronraimist/promise-defer
Fix riot-web Promise.defer warnings (#7409)
|
2018-10-08 21:18:22 -06:00 |