Matthew Hodgson
c57c653535
Merge branch 'develop' into matthew/webpack4
2018-09-26 00:15:56 +01:00
David Baker
e58ac74aa2
Merge branch 'master' into develop
2018-09-10 11:48:19 +01:00
David Baker
2b18aa7d79
Merge branch 'release-v0.16.4'
2018-09-10 11:47:09 +01:00
David Baker
0f9c8235e1
v0.16.4
2018-09-10 11:43:23 +01:00
David Baker
8b0ae88987
Prepare changelog for v0.16.4
2018-09-10 11:43:23 +01:00
David Baker
d8aaae6d42
v0.16.4
2018-09-10 11:42:20 +01:00
David Baker
ce4c71ccfb
Released js-sdk & react-sdk
2018-09-10 11:41:45 +01:00
Matthew Hodgson
5ef141913b
remove ancient layering warning
2018-09-09 18:35:31 +01:00
Matthew Hodgson
d27db5a1c7
downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57
...
thanks @ZerataX! :)
2018-09-09 10:48:03 +01:00
Matthew Hodgson
c2bd6e6da1
point deps at #develop to unbreak npm i
2018-09-09 10:25:33 +01:00
David Baker
d6406b48fd
v0.16.4-rc.1
2018-09-07 14:42:52 +01:00
David Baker
d5b42d99f2
Prepare changelog for v0.16.4-rc.1
2018-09-07 14:42:51 +01:00
David Baker
42bac1620e
v0.16.4-rc.1
2018-09-07 14:39:20 +01:00
David Baker
09130582ad
js-sdk & react-sdk rc.1
2018-09-07 14:38:16 +01:00
David Baker
73239f5535
Merge pull request #7296 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2018-09-07 14:07:30 +01:00
Weblate
22abe5a815
Merge remote-tracking branch 'origin/develop' into develop
2018-09-05 14:48:11 +00:00
David Baker
736450e184
Merge pull request #7288 from vector-im/bwindels/fixmobileguideloadedonriot
...
Fix config not loading & mobileguide script being loaded in riot
2018-09-05 15:48:04 +01:00
Bruno Windels
d10fda36af
fix config not loading correctly anymore
2018-09-05 16:38:00 +02:00
Bruno Windels
8639b2858b
dont load the mobileguide script in riot
2018-09-05 16:07:44 +02:00
Weblate
f47a9f93a5
Merge remote-tracking branch 'origin/develop' into develop
2018-09-05 10:31:06 +00:00
David Baker
52bbd8c764
Merge pull request #7272 from vector-im/dbkr/mobileguide
...
Instructions for installing mobile apps
2018-09-05 11:31:00 +01:00
Weblate
8ef2eec504
Merge remote-tracking branch 'origin/develop' into develop
2018-09-05 10:21:41 +00:00
Bruno Windels
1c5f16c332
Merge pull request #7265 from vector-im/dbkr/make_index_js_less_of_a_dogs_dinner
...
Tidy up index.js
2018-09-05 12:21:35 +02:00
Matthew Hodgson
588369d297
downgraded parallelshell due to https://github.com/darkguy2008/parallelshell/issues/57
...
thanks @ZerataX! :)
2018-09-04 20:32:06 +01:00
David Baker
e23195fd86
Conditionally show custom server bit
2018-09-04 10:08:52 +01:00
Matthew Hodgson
1b0cafd956
Merge pull request #7274 from gusttt/patch-1
...
Small typo in release notes v0.16.3
2018-09-04 09:50:39 +01:00
gusttt
81a624146b
Small typo in release notes v0.16.3
...
Fixes #7273
2018-09-04 08:16:29 +02:00
David Baker
9c8ef4240c
Instructions for installing mobile apps
...
Replace the native js dialog with a page telling you how to
download the apps and how to set your HS URL.
2018-09-03 20:38:30 +01:00
Weblate
b59edf2690
Merge remote-tracking branch 'origin/develop' into develop
2018-09-03 13:39:35 +00:00
Andri
daa3e1351b
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-09-03 13:39:34 +00:00
David Baker
d00ca02c25
v0.16.3
2018-09-03 14:34:06 +01:00
David Baker
207106ea46
Prepare changelog for v0.16.3
2018-09-03 14:34:05 +01:00
David Baker
c150d97eaf
v0.16.3
2018-09-03 14:29:48 +01:00
David Baker
6231cf3496
Released js-sdk & react-sdk
2018-09-03 14:28:34 +01:00
David Baker
57999b460b
Didn't mean to commit that file
2018-09-03 13:05:58 +01:00
David Baker
e2bad5bdc8
Tidy up index.js
...
Non-functional changes (before I start messing with it).
Switch to import, move code out of the top level, switch to one
consistent way of declaring functions, keep imports at the top.
2018-09-03 13:01:52 +01:00
David Baker
5170635a1f
v0.16.3-rc.2
2018-08-31 13:52:58 +01:00
David Baker
1db5c64f3e
Prepare changelog for v0.16.3-rc.2
2018-08-31 13:52:58 +01:00
David Baker
9e4aa50567
v0.16.3-rc.2
2018-08-31 13:50:57 +01:00
David Baker
2b91595aa9
js-sdk & react-sdk rc.2
2018-08-31 13:50:12 +01:00
Andri
2209059e84
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-08-30 14:55:19 +00:00
Andrey Silversburg
b335da75db
Translated using Weblate (Indonesian)
...
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/id/
2018-08-30 14:49:14 +00:00
David Baker
7cfda97b82
v0.16.3-rc.1
2018-08-30 14:40:22 +01:00
David Baker
01f4e9b2a5
Prepare changelog for v0.16.3-rc.1
2018-08-30 14:40:21 +01:00
David Baker
2bef30635c
v0.16.3-rc.1
2018-08-30 14:39:12 +01:00
David Baker
447c133d82
js-sdk & react-sdk rc.1
2018-08-30 14:38:15 +01:00
Weblate
fbe6595b19
Merge remote-tracking branch 'origin/develop' into develop
2018-08-30 10:43:42 +00:00
David Baker
86b738dd79
Merge pull request #7245 from RiotTranslateBot/weblate-riot-web-riot-web
...
Update from Weblate.
2018-08-30 11:43:37 +01:00
Weblate
b30fd9d3bf
Merge remote-tracking branch 'origin/develop' into develop
2018-08-30 10:38:37 +00:00
David Baker
e54865b7ec
electron 2.0.8
2018-08-30 11:38:20 +01:00
