mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-19 12:11:58 +03:00
Code Issues Projects Releases Packages Wiki Activity
7086 commits 219 branches 562 tags 474 MiB
Commit graph

7086 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
dc92b126c7 Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 18:18:06 +00:00
David Baker
c6f70cb72c
Merge pull request #7737 from vector-im/revert-7490-lint 
Revert "Run lint on travis builds and use modern node versions"
 2018-11-22 18:18:01 +00:00
David Baker
f701e2601a
Revert "Run lint on travis builds and use modern node versions" 2018-11-22 18:17:09 +00:00
Weblate
8cb8890ab3 Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 18:01:09 +00:00
David Baker
a7a5679bfa
Merge pull request #7490 from aaronraimist/lint 
Run lint on travis builds and use modern node versions
 2018-11-22 18:01:04 +00:00
David Baker
03587abff1
Update .travis.yml 
Remove node 6
 2018-11-22 17:54:02 +00:00
Weblate
496a5baffd Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 17:06:38 +00:00
David Baker
8996b6b429 Merge branch 'master' into develop 2018-11-22 17:06:25 +00:00
David Baker
d483fb0605 v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
c2ec5f39ab Prepare changelog for v0.17.7 2018-11-22 16:58:48 +00:00
David Baker
58f927538f v0.17.7 2018-11-22 16:56:41 +00:00
David Baker
d9434c7af5 Bump js-sdk & react-sdk 2018-11-22 16:56:13 +00:00
David Baker
6f54ff9e7f Fix missing js-sdk logging 
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.

Fix by doing the rageshake setup within an import, as commented.
 2018-11-22 16:43:15 +00:00
Weblate
9eaba3d3f5 Merge remote-tracking branch 'origin/develop' into develop 2018-11-22 16:32:45 +00:00
David Baker
4805858ecb
Merge pull request #7736 from vector-im/dbkr/fix_missing_logging 
Fix missing js-sdk logging
 2018-11-22 16:32:39 +00:00
David Baker
092ae7ef2f Fix missing js-sdk logging 
Some of the js-sdk logging was going missing due to js-sdk's
loglevel library being initialised before the rageshake logging.

Fix by doing the rageshake setup within an import, as commented.
 2018-11-22 16:21:55 +00:00
David Baker
bbb128b672
Merge branch 'develop' into lint 2018-11-22 11:23:02 +00:00
Weblate
15b8d410c0 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 19:25:36 +00:00
David Baker
8298e73205 Argh, npm, why are you so awful? 2018-11-21 19:25:11 +00:00
Weblate
819e6d9219 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 19:14:09 +00:00
David Baker
d2c87a0331 Fix jenkins build 2018-11-21 19:13:42 +00:00
Weblate
286c5e8895 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 19:00:29 +00:00
David Baker
7df77d7e5d Recent node please 2018-11-21 19:00:11 +00:00
Bruno Windels
c7c271fb01 Merge branch 'develop' into experimental 2018-11-21 10:38:16 +00:00
Weblate
6804a00af0 Merge remote-tracking branch 'origin/develop' into develop 2018-11-19 15:30:26 +00:00
David Baker
81c75eb14b Merge branch 'master' into develop 2018-11-19 15:30:01 +00:00
David Baker
e604dfe9e8 v0.17.6 2018-11-19 15:24:34 +00:00
David Baker
135a5d38ff Prepare changelog for v0.17.6 2018-11-19 15:24:33 +00:00
David Baker
07ed2e8d0a v0.17.6 2018-11-19 15:23:08 +00:00
David Baker
2a594414e7 released js-sdk / react-sdk 2018-11-19 15:21:12 +00:00
Weblate
d3496c0cb9 Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 19:36:38 +00:00
Akarshan Biswas
c15151a0af Translated using Weblate (Hindi) 
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/hi/
 2018-11-16 19:36:37 +00:00
Travis Ralston
6d1640194e
Merge pull request #7710 from vector-im/travis/terms-auth-improvements 
Add $accent-color-50pct as a CSS variable to the Status theme
 2018-11-16 12:36:32 -07:00
Akarshan Biswas
06740e5480 Translated using Weblate (Hindi) 
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/hi/
 2018-11-16 15:09:25 +00:00
Travis Ralston
c338e491fe Add $accent-color-50pct as a CSS variable to the Status theme 2018-11-15 20:21:20 -07:00
David Baker
a570ee53a8 v0.17.6-rc.2 2018-11-15 15:40:54 +00:00
David Baker
417a31f1fe Prepare changelog for v0.17.6-rc.2 2018-11-15 15:40:53 +00:00
David Baker
a4a6f070e4 v0.17.6-rc.2 2018-11-15 15:38:42 +00:00
David Baker
d287abcd68 Update js-sdk to 0.14 & react-sdk to rc.2 
rc.1 used js-sdk 0.13 which did not use the new Olm API.
 2018-11-15 15:37:20 +00:00
David Baker
79fd38a899 v0.17.6-rc.1 2018-11-15 12:23:06 +00:00
David Baker
0aa0773ef7 Prepare changelog for v0.17.6-rc.1 2018-11-15 12:23:05 +00:00
David Baker
154e8bdb50 v0.17.6-rc.1 2018-11-15 12:21:16 +00:00
David Baker
8f37c22917 releaesed js-sdk & react-sdk rc.1 2018-11-15 12:20:42 +00:00
David Baker
0aeef3187a
Merge pull request #7708 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-11-15 12:13:47 +00:00
Weblate
8903eebe17 Merge remote-tracking branch 'origin/develop' into develop 2018-11-13 19:02:46 +00:00
David Baker
cc4d0af713 Merge branch 'master' into develop 2018-11-13 19:02:34 +00:00
David Baker
4a217d9e9f v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
122caf7a95 Prepare changelog for v0.17.5 2018-11-13 18:54:25 +00:00
David Baker
a1e5c72eb9 v0.17.5 2018-11-13 18:52:59 +00:00
David Baker
7dd163ac85 bump react-sdk 2018-11-13 18:52:16 +00:00