ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-10 18:29:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,695 Commits 208 Branches 566 Tags
develop
Commit Graph

63695 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker d25fc9d9fb Revert 3f0c948387 
...as hopefully this should work now sanitize-html is fixed?
 2018-08-02 19:37:27 +01:00
Bruno Windels f1643f77ac fix lint 2018-08-02 19:57:20 +02:00
Bruno Windels 42fc83d2a8 Move LL filter creation inside MatrixClient 
As we need an option to turn lazy loading on (we can't just accept a filter,
as /messages has an incompatible filter), better only pass the option
and create the filter inside startClient
 2018-08-02 19:38:41 +02:00
David Baker 02019a58b3 Support active user limit on message send 
For https://github.com/vector-im/riot-web/issues/7091
 2018-08-02 17:09:04 +01:00
Weblate 9ea31042db Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 15:52:35 +00:00
Bruno Windels 675d617dbc Merge pull request #7132 from vector-im/dbkr/unpin_sanitize_html 
Unpin sanitize-html
 2018-08-02 17:52:29 +02:00
Weblate 4c8f437cfc Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 15:52:24 +00:00
Bruno Windels 2b5c8282d0 Merge pull request #2105 from matrix-org/dbkr/unpin_sanitize_html 
Unpin sanitize-html
 2018-08-02 17:52:15 +02:00
David Baker a79e9b4fd6 Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:22:07 +01:00
David Baker d25ed88b0d Unpin sanitize-html 
1.18.4 is now out which makes it work with webpack again
 2018-08-02 16:20:55 +01:00
Osoitz dbe28558c2 Translated using Weblate (Basque) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-08-02 15:17:08 +00:00
David Baker bb9a3eb33d Support MAU limit error on register too 2018-08-02 16:09:57 +01:00
Bruno Windels e1843601be support directional content in pill member fake 2018-08-02 17:09:18 +02:00
David Baker cc58b06226 Support montly active user limit error on /login 
The 'contact your service administrator' should be a link but we
don't have this info from the HS yet.
 2018-08-02 14:25:17 +01:00
David Baker 1b01867b84 Merge pull request #3 from matrix-org/bwindels/ci_script 
Make tests run on CI environment
 2018-08-02 13:01:47 +01:00
Bruno Windels 4b96e01410 enable newly introduced option 2018-08-02 13:01:57 +02:00
Weblate f39e3f385c Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 10:57:47 +00:00
kR ad9f786646 Translated using Weblate (Polish) 
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/pl/
 2018-08-02 10:57:46 +00:00
Bruno Windels 8f6226d410 Merge pull request #7129 from vector-im/dbkr/pin_sanitize_html 
Pin sanitize-html to 0.18.2
 2018-08-02 12:57:41 +02:00
Weblate c47f952e1a Merge remote-tracking branch 'origin/develop' into develop 2018-08-02 10:05:43 +00:00
kR a6106ddc4f Translated using Weblate (Polish) 
Currently translated at 92.6% (1129 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-08-02 10:05:42 +00:00
Brendan Abolivier 34259591ae Translated using Weblate (French) 
Currently translated at 100.0% (1218 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-08-02 10:05:42 +00:00
Bruno Windels d1dcd0f374 Merge pull request #2101 from matrix-org/dbkr/pin_sanitize_html 
Pin sanitize-html to 0.18.2
 2018-08-02 12:05:37 +02:00
David Baker 8a18488b1e Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 11:00:35 +01:00
David Baker 4575710c84 Pin sanitize-html to 0.18.2 
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
 / https://github.com/punkave/sanitize-html/issues/242
 2018-08-02 10:59:26 +01:00
Bruno Windels 802efc7694 given the != join check, isInvite will never be true 
Also, put comments in right order
 2018-08-02 11:47:24 +02:00
Bruno Windels b151956f7b Use room method to help with DM detection with fallback to summary heroes/counts. 2018-08-02 11:42:19 +02:00
Bruno Windels 908de56c6d replace getMember(myId).membership with getMyMembership 
This works with rooms which haven't had their members
loaded yet.
 2018-08-02 11:42:05 +02:00
Bruno Windels b9bbb7ee16 pass in userId with room in test 2018-08-02 11:40:56 +02:00
David Baker 53b179b22b Merge pull request #7128 from vector-im/revert-7115-dbkr/remove_package_lock 
Revert "Remove package-lock.json for now"
 2018-08-02 10:02:57 +01:00
David Baker dcde74bc09 Revert "Remove package-lock.json for now" 2018-08-02 10:02:09 +01:00
Bruno Windels 3f0c948387 try logging the stack to see where the TypeError on travis occurs exactly 2018-08-01 18:46:40 +02:00
Bruno Windels 86a6f1e932 Merge pull request #7115 from vector-im/dbkr/remove_package_lock 
Remove package-lock.json for now
 2018-08-01 16:27:08 +02:00
David Baker 10ed13acc0 Add package-lock to .gitignore 2018-08-01 15:08:12 +01:00
David Baker de43cc920d Add package-lock to gitignore 2018-08-01 15:07:17 +01:00
David Baker 7875d37c8e Destroy non-persistent widgets when switching room 2018-08-01 15:01:11 +01:00
adrian-007 f137151a7a Translated using Weblate (Polish) 
Currently translated at 92.6% (1129 of 1218 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-08-01 08:53:33 +00:00
Bruno Windels 97fa7e03d1 dont swallow synapse startup errors 2018-07-31 14:48:05 +02:00
Bruno Windels f57628e3d0 dont swallow riot server errors 2018-07-31 14:48:05 +02:00
Bruno Windels 3876577218 log when using external chrome! 2018-07-31 14:48:05 +02:00
Bruno Windels 9a2f309486 xhr and console logs are done for all tests now, no need to do it in signup anymore 2018-07-31 14:48:05 +02:00
David Baker ccf52d3bff Remove package-lock.json for now 
As per https://github.com/vector-im/riot-web/issues/7083

The package-lock file is currently not bringing any of the benefits
it's supposed to bring because we don't do the neccessary things to
massage it during the release process. Remove it until we actually
manage it correctly.
 2018-07-31 11:07:24 +01:00
David Baker f0d135d76e Remove package-lock.json for now 
As per https://github.com/vector-im/riot-web/issues/7083

The package-lock file is currently not bringing any of the benefits
it's supposed to bring because we don't do the neccessary things to
massage it during the release process. Remove it until we actually
manage it correctly.
 2018-07-31 11:02:14 +01:00
Bruno Windels c357a0158d no need to log contents of zip files 2018-07-31 11:48:54 +02:00
Bruno Windels d738b404ca try upgrading puppeteer 2018-07-31 11:48:54 +02:00
Bruno Windels a5c8911445 output document html on error and dont make a screenshot on submit 2018-07-31 11:48:54 +02:00
Bruno Windels e50420dd1b apply config file when starting riot, not installing, so we can support riots that were built by another process 2018-07-31 11:48:54 +02:00
Bruno Windels 31fcf08fec only allow one riot server instance simultaneously 2018-07-31 11:48:29 +02:00
Bruno Windels 6f60b68ac7 Puppeteer does need it's own chrome after all 
The stable chrome travis provides is not supported.
 2018-07-31 11:00:44 +02:00
Bruno Windels 93f51eb6ce force running scripts in bash, as it's not the default shell on Ubuntu (which is what Travis runs) 2018-07-31 11:00:44 +02:00