ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-10 01:01:45 +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
Travis Ralston e31c89d360 Make the controller work for notifications 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 22:28:35 -07:00
Travis Ralston 63607f29e7 Use SettingsStore for notification settings 
Signed-off-by: Travis Ralstron <travpc@gmail.com>
 2017-11-04 22:27:34 -07:00
Travis Ralston 7ce4316cc8 Initial support for notification settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 21:47:18 -07:00
Travis Ralston 8351ec7e73 Local echo on all setting levels 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 20:32:00 -07:00
Travis Ralston 3958e32672 Ensure blacklistUnverifiedDevices persists reloads 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 20:13:23 -07:00
Travis Ralston 45140cab69 Don't assume false means "use state" 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:42 -07:00
Travis Ralston ef45d82ec6 Fix URL preview save calls 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:20 -07:00
Travis Ralston b75be41f94 Fix split-brain for blacklistUnverifiedDevices 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:06 -07:00
Matthew Hodgson d14285eb08 fix secondary accent color tinting 2017-11-05 02:20:12 +00:00
Travis Ralston cb17c0a379 Migrate blacklistUnverifiedDevicesPerRoom 
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:15:55 -07:00
Matthew Hodgson 68115f5b9c tint when theming correctly 2017-11-05 00:40:38 +00:00
Matthew Hodgson 555847e5e9 make default theme actually work 2017-11-05 00:40:13 +00:00
Matthew Hodgson 8587b36715 Merge branch 'develop' into matthew/status 2017-11-04 23:51:26 +00:00
Matthew Hodgson 816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson e72e30197a calculate new CSS tinting when we change theme 2017-11-04 23:50:57 +00:00
Matthew Hodgson 9a0bbfb871 tint the colours in the theme rather than hardcode vector green 2017-11-04 23:43:34 +00:00
Matthew Hodgson b2ddcb8027 tint the colours in the theme rather than hardcode vector green 2017-11-04 23:43:20 +00:00
Travis Ralston c7eee36990 Fix lanugage detection 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 16:38:26 -06:00
Travis Ralston 4f1ad974fc Delay URL preview saving until the save button is pressed 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 16:32:13 -06:00
Matthew Hodgson adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Travis Ralston 358298e4ee Support room color in settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 16:10:25 -06:00
Travis Ralston bb5f7bed85 Check the correct event type for the room 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 15:48:24 -06:00
Travis Ralston a8169a682c Throw errors if the setting isn't known 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 15:46:15 -06:00
Travis Ralston 257e1aabb8 Improve documentation of settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 15:44:01 -06:00
Weblate ae844a048f Merge remote-tracking branch 'origin/develop' into develop 2017-11-04 15:42:03 +00:00
Matthew Hodgson 3fd5937687 Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing 
Fixes React warning
 2017-11-04 15:41:57 +00:00
Andrey b4b4fefffb Translated using Weblate (Russian) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2017-11-04 08:11:22 +00:00
Kévin C 2b49b68ba5 Translated using Weblate (French) 
Currently translated at 100.0% (217 of 217 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-11-04 07:26:28 +00:00
Travis Ralston 8282534f87 Add SettingsLevel enum; Move settings to own file. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 23:19:45 -06:00
Travis Ralston 893c39bfbe Merge branch 'develop' into travis/granular-settings 2017-11-03 22:00:07 -06:00
Travis Ralston 69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Travis Ralston 5a1498dec3 CSS for pinned indicators 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 20:01:54 -06:00
Travis Ralston de6fc32a87 Show an indicator when there are any pins in the room 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 20:00:48 -06:00
Travis Ralston a2b7f6d30e Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice 2017-11-03 19:57:39 -06:00
Travis Ralston 5c37155730 Don't assume we have a valid event. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 18:18:09 -06:00
Travis Ralston 3656fdb571 Store read pinned events as an array to avoid racing saves. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-03 18:12:57 -06:00
Weblate 441aa91831 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 23:10:35 +00:00
Matthew Hodgson 31c5122fa6 Merge pull request #5293 from turt2live/travis/pinned-led-css 
CSS for new pinned events indicator
 2017-11-03 23:10:31 +00:00
Weblate f290569487 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 23:10:05 +00:00
Matthew Hodgson c0b343c89f Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Weblate a42414eabd Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 22:44:46 +00:00
Matthew Hodgson c90834114b Merge pull request #5498 from vector-im/luke/css-use-margin-in-room-dir-perms 
Use margin to separate "perms" in the room directory
 2017-11-03 22:44:41 +00:00
Weblate 107f83f84f Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 22:44:22 +00:00
Matthew Hodgson d4adff3d25 Merge pull request #1575 from matrix-org/luke/fix-flair-store-again 
Fix Flair not appearing due to missing this._usersInFlight
 2017-11-03 22:44:16 +00:00
Kévin C 6ddbaebb65 Translated using Weblate (French) 
Currently translated at 100.0% (923 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-03 19:54:40 +00:00
Luke Barnard da23afdec2 Better comment on FlairStore _usersInFlight 2017-11-03 18:48:15 +00:00
Weblate 295bdae075 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 18:47:03 +00:00
Jan Kudrik ed586bedbc Translated using Weblate (Czech) 
Currently translated at 70.0% (647 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-11-03 18:47:02 +00:00
Luke Barnard d03f2826c3 Merge pull request #1574 from matrix-org/luke/fix-groups-rooms-list-view-room-dispatch 
Use, if possible, a room's canonical or first alias when viewing the …
 2017-11-03 18:46:58 +00:00
Luke Barnard 4d8f18742b Check against non-existant promise to resolve a user's groups 2017-11-03 18:43:43 +00:00