gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,278 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7278 Commits

Author SHA1 Message Date
Bruno Windels ab1f68df93 apply changes from dharma theme to status theme 2018-10-23 15:50:09 +02:00
Aaron Raimist b7622d8551
Use babel-eslint 7.2.3 instead 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-19 23:00:02 -05:00
Aaron Raimist c470e2dcfb
Actually I'll just fix the errors myself and get rid of lintwithexclusions 
I seemingly need babel-eslint version 8 for VectorHomePage.js but might as well just upgrade to version 10

Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-19 21:04:55 -05:00
Aaron Raimist fe11ae73db
Run lintwithexclusions on travis builds 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-19 20:59:07 -05:00
Aaron Raimist 70fe4f67ee
eslint --fix on test/ 2018-10-19 20:59:07 -05:00
Aaron Raimist 6abd1de8b8
eslint --fix on src/ 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-19 20:59:06 -05:00
Weblate 16b150039a Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 15:07:56 +00:00
Bruno Windels ca1dec8e13 Merge branch 'master' into develop 2018-10-19 17:07:29 +02:00
Bruno Windels f81d3bc903 Merge branch 'release-v0.17.2' 2018-10-19 17:00:44 +02:00
Bruno Windels 88132067ad update version in package lock file 2018-10-19 17:00:13 +02:00
Bruno Windels f5eff7d349 v0.17.2 2018-10-19 16:54:27 +02:00
Bruno Windels 5f35b9903d Prepare changelog for v0.17.2 2018-10-19 16:54:26 +02:00
Bruno Windels 221f75542a v0.17.2 2018-10-19 16:51:26 +02:00
David Baker d0fcf3c952 Don't set tags on notifications 
They are to suppress notifications that don't want to be shown in
addition to each other. This makes no sense for our notifications:
they're each for independent messages. Also settings tags on
notifications makes electron crash on windows when you close the
notif, as per https://github.com/vector-im/riot-web/issues/7512
 2018-10-19 16:47:16 +02:00
Bruno Windels 62f664c592 update matrix-react-sdk to 0.14.1 2018-10-19 16:45:39 +02:00
Weblate deaeb1a715 Merge remote-tracking branch 'origin/develop' into develop 2018-10-18 18:26:13 +00:00
David Baker c1dfbd6993
Merge pull request #7518 from vector-im/dbkr/better_fix_for_windows_crashes 
Don't set tags on notifications
 2018-10-18 19:26:08 +01:00
David Baker 2854c0969b Don't set tags on notifications 
They are to suppress notifications that don't want to be shown in
addition to each other. This makes no sense for our notifications:
they're each for independent messages. Also settings tags on
notifications makes electron crash on windows when you close the
notif, as per https://github.com/vector-im/riot-web/issues/7512
 2018-10-18 19:07:59 +01:00
Weblate 1de5e61888 Merge remote-tracking branch 'origin/develop' into develop 2018-10-18 17:44:16 +00:00
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