OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,907 Commits
214 Branches
561 Tags
463 MiB
Commit Graph

6907 Commits (aea2b1ebc97c546edbb77d5b3d38532b86c1fc4b)

Author SHA1 Message Date
Travis Ralston d393cd67f7
Merge pull request #7615 from vector-im/t3chguy/fix_author_of_electron_app 
Correct the author of the electron app
 2018-10-28 23:22:58 -06:00
Michael Telatynski c80f5ddcd1 Correct the author of the electron app 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-10-27 11:04:05 +01:00
Aaron Raimist a02009d31f
Update package-lock.json 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:21:40 -05:00
Aaron Raimist a4ed1afeb5
Update babel-eslint to 8.1.1 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:07:35 -05:00
Travis Ralston 1fea7c022e Fix order of operations for npm install on Travis CI 2018-10-26 20:44:14 -06:00
Travis Ralston e7f5aee9fb Regenerate package-lock.json (again) 2018-10-26 20:43:53 -06:00
Travis Ralston d3805f7545 Regenerate package-lock.json and upgrade eslint again 2018-10-26 20:12:43 -06:00
Travis Ralston 70891f41a5 Merge branch 'develop' into lint 2018-10-26 19:56:33 -06:00
Travis Ralston cebba5bfa3
Merge pull request #7552 from vector-im/travis/permalink-routing 
Mock fs, tls, and net to support request in the browser
 2018-10-26 14:22:38 -06:00
Travis Ralston 0f5c62d3cc Regenerate package-lock.json 
due to conflicts
 2018-10-26 10:06:27 -06:00
Travis Ralston f9fa338960 Merge branch 'develop' into travis/permalink-routing 2018-10-26 09:22:13 -06:00
Bruno Windels 18daa186b0 Merge branch 'develop' into experimental 2018-10-26 15:33:57 +02:00
Travis Ralston ad7ac26ff3 Upgrade babel-eslint and regenerate package-lock.json 2018-10-25 16:10:27 -06:00
Travis Ralston 10efaaa078 Merge branch 'develop' into lint 2018-10-25 16:06:02 -06:00
Travis Ralston bb353b940e
Merge pull request #7598 from jryans/update-chokidar 
Update chokidar to transitively get newer fsevents
 2018-10-25 15:53:23 -06:00
J. Ryan Stinnett 9732d10f24 Update chokidar to transitively get newer fsevents 
Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-10-25 23:04:25 +02:00
David Baker 9b80aa76ce
Merge pull request #7385 from vector-im/dbkr/wasm 
Support WebAssembly version of Olm
 2018-10-25 15:58:24 +01:00
David Baker bc935012da Update to Olm 3 2018-10-25 15:44:22 +01:00
Travis Ralston e4025f1aff Mock fs, tls, and net to support request in the browser 
fs is mocked using memfs, which needs to be installed at all 3 layers because webpack is silly
 2018-10-24 16:59:14 -06:00
Bruno Windels 03dcc97ce9 add new variables to status 2018-10-24 13:56:42 +02:00
David Baker e2b55315a6 v0.17.3-rc.1 2018-10-24 11:31:59 +01:00
David Baker 1f8b0f2135 Prepare changelog for v0.17.3-rc.1 2018-10-24 11:31:59 +01:00
David Baker a9a45dc32b v0.17.3-rc.1 2018-10-24 11:30:44 +01:00
David Baker f7138c0516 react-sdk & js-sdk rc.1 2018-10-24 11:27:01 +01:00
David Baker d080a204a3 electron 3.0.5 2018-10-24 11:12:51 +01:00
David Baker fd31d58128
Merge pull request #7549 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2018-10-24 10:26:13 +01:00
Bruno Windels a478f02c5b
Merge pull request #7541 from vector-im/bwindels/initialtimelinetweaks 
Redesign: apply changes from dharma theme to status theme
 2018-10-23 19:36:04 +00:00
Bruno Windels ffc0d3cda0
Merge pull request #7540 from vector-im/bwindels/alwaysshowdharma 
Redesign: ignore setting and always show dharma theme for now
 2018-10-23 19:35:53 +00:00
Bruno Windels c68770c0aa ignore setting and always show dharma theme for now 2018-10-23 15:51:06 +02:00
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