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
Weblate 47cb441fc6 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 15:47:53 +00:00
Travis Ralston fbadb588e1 Merge pull request #2221 from matrix-org/travis/tos-register 
Support m.login.terms during registration
 2018-10-16 09:47:48 -06:00
Bruno Windels 1d2e1d4b6b make it work for now, probably want to rename this back later on 2018-10-16 17:45:53 +02:00
Weblate 6af9998b62 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 15:30:15 +00:00
Travis Ralston 06764c2bab Merge pull request #2220 from matrix-org/travis/peek-invite-nag 
Don't show the invite nag bar when peeking
 2018-10-16 09:30:09 -06:00
Bruno Windels bb184a4ae0 support programmatic access to a distributor (to set size from storage) 2018-10-16 17:22:12 +02:00
Travis Ralston b929c36222 Documentation++ 2018-10-16 09:19:36 -06:00
Bruno Windels 650e19ff77 don't expose direction, handleIndex to distributor ctor 2018-10-16 16:25:00 +02:00
Weblate 43ee22897b Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 14:08:09 +00:00
Travis Ralston 49bd5441d1 Merge pull request #2214 from matrix-org/travis/fix-default-tint 
Apply the user's tint once the MatrixClientPeg is moderately ready
 2018-10-16 08:08:02 -06:00
Bruno Windels 30003d8f91 turn resizer into class to make programmatic interaction/cleanup easier 2018-10-16 15:16:10 +02:00
Bruno Windels c095e30ae4 provide collapsed callback to also collapse on react side of things 2018-10-16 14:56:49 +02:00
Bruno Windels 529845d8fc group collapsed styles 2018-10-16 14:55:35 +02:00
Bruno Windels 8fa22d620a align badge and make it non-flex when collapsed 2018-10-16 14:54:30 +02:00
Bruno Windels cc29dd08da don't always show badge (leftover) 2018-10-16 14:54:14 +02:00
Bruno Windels 99bf6b0e32 put dm icon back in it's correct location 2018-10-16 14:53:44 +02:00
Bruno Windels c56975d93d dont base collapse toggle size on min-width, as it's not available in collapsed state 2018-10-16 12:26:08 +02:00
Will Hunt 67d39a40d3 Sneaky , 2018-10-16 11:26:04 +01:00
Will Hunt fcce61bf14 Merge remote-tracking branch 'upstream/develop' into hs/upload-limits 2018-10-16 11:21:15 +01: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 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
Weblate 6453cd7b17 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 09:58:02 +00:00
Bruno Windels 01471abdc5 Merge branch 'bwindels/redesign' into bwindels/resizehandles 2018-10-16 11:57:59 +02:00
Bruno Windels 6878ce3c6a Merge branch 'develop' into bwindels/redesign 2018-10-16 11:57:44 +02:00
David Baker 8015bdfed7 Update deps 
or, apparently, mostly just add 'github' prefixes
 2018-10-16 10:57:32 +01:00
Weblate 127b5a972f Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 09:55:33 +00:00
David Baker 4d7b88a914 Merge branch 'master' into develop 2018-10-16 10:55:12 +01:00
David Baker cbb117552f v0.14.0 2018-10-16 10:54:19 +01:00
David Baker 0e69490b6a Prepare changelog for v0.14.0 2018-10-16 10:53:43 +01:00
David Baker cbe642f569 released js-sdk 2018-10-16 10:50:02 +01: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 e2a126c26c Merge pull request #2222 from matrix-org/bwindels/phasedrollout 
Phased rollout of lazy loading
 2018-10-16 10:15:10 +01:00
Weblate 1d4832a2a4 Merge remote-tracking branch 'origin/develop' into develop 2018-10-16 08:45:53 +00:00
David Baker 589633d98f Merge pull request #2217 from matrix-org/dbkr/rageshake_dont_use_all_the_memory 
Make rageshake use less memory
 2018-10-16 09:45:48 +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
Travis Ralston d87ab8aac0 Support m.login.terms during registration 
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
 2018-10-15 16:39:59 -06:00