ehealthsolutions/healthchat-web
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/healthchat-web.git synced 2026-11-08 15:38:23 +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 f420a18696 Released js-sdk & react-sdk 2017-06-19 13:12:40 +01:00
David Baker 55288ce9f2 Merge branch 'master' into develop 2017-06-19 13:10:19 +01:00
David Baker 66c3a6d9ca v0.9.5 2017-06-19 13:09:41 +01:00
David Baker 096805a897 Prepare changelog for v0.9.5 2017-06-19 13:09:41 +01:00
Richard Lewis 80c5a58fc3 Fix custom widget form styling 2017-06-19 12:06:16 +01:00
Richard Lewis db70272902 Fix custom widget form styling 2017-06-19 12:05:57 +01:00
David Baker faeb40bc0f Released js-sdk v0.7.12 2017-06-19 12:00:53 +01:00
Michael Telatynski 78068bfaa0 explicit convert to nativeImage to stabilise on Windows 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-19 11:58:44 +01:00
Richard Lewis f676b58c00 Add google ardboard logo 2017-06-19 11:47:03 +01:00
David Baker 578fa1c160 Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 11:40:17 +01:00
David Baker c9715e02d9 Merge remote-tracking branch 'weblate/develop' into develop 2017-06-19 11:39:59 +01:00
David Baker 9f7cf463b9 Merge pull request #4354 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 11:38:55 +01:00
Weblate 9eca0d2fde Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 10:38:05 +00:00
Nathan van Beelen 45bb74d8f6 Translated using Weblate (Dutch) 
Currently translated at 100.0% (200 of 200 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2017-06-19 10:38:04 +00:00
David Baker 07103431a9 Merge remote-tracking branch 'weblate/develop' into develop 2017-06-19 11:37:55 +01:00
Richard Lewis 9d89bfe264 Fix jitsi logo references 2017-06-19 11:36:15 +01:00
Richard Lewis 3588ce7bc5 Fix app tile styling 2017-06-19 11:35:20 +01:00
Matthew Hodgson 6e64dd32c8 add register button 2017-06-19 11:33:44 +01:00
Matthew Hodgson e3a63c3a6d fix broken vars 2017-06-19 11:33:36 +01:00
Matthew Hodgson 79816c5726 fix broken http status i18n 2017-06-19 11:33:12 +01:00
Matthew Hodgson c55d292840 add new languages 2017-06-19 11:32:49 +01:00
Matthew Hodgson 0da4834360 Merge pull request #4346 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-19 11:32:28 +01:00
Matthew Hodgson adbe5c71b7 Merge pull request #4337 from vector-im/t3chguy/fix_forwarding 
change dispatcher forward_event signature
 2017-06-19 11:31:17 +01:00
Matthew Hodgson a9dfd4da2d Merge pull request #4259 from ollieh/code-block-border 
Add border on hover for code blocks
 2017-06-19 11:30:57 +01:00
David Baker 11e0364505 Merge pull request #1117 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-19 11:28:23 +01:00
David Baker 50aefd3285 Merge pull request #1117 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-19 11:27:48 +01:00
Weblate a2764a0c1f Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 10:25:04 +00:00
Sebastián Magrí bfd5f1b09a Translated using Weblate (Spanish) 
Currently translated at 68.9% (625 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-06-19 10:24:54 +00:00
Bamstam 1d958dd120 Translated using Weblate (German) 
Currently translated at 100.0% (906 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-19 10:24:54 +00:00
Nathan van Beelen c1ce12ef96 Translated using Weblate (Dutch) 
Currently translated at 55.0% (499 of 906 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2017-06-19 10:24:54 +00:00
Matthew Hodgson 869329e78a fix broken i18n 2017-06-19 11:23:52 +01:00
Matthew Hodgson 217f44900c fix broken vars 2017-06-19 11:23:43 +01:00
Matthew Hodgson 8f19400cc0 Merge pull request #1114 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-19 11:23:33 +01:00
Luke Barnard 513a585a3e Merge pull request #1076 from ollieh/issues/reduce-save-restore-window 
Reduce save-restore window in ScrollPanel to reduce scrolling jumps
 2017-06-19 11:23:10 +01:00
Luke Barnard 467c195d4f Don't peek when creating a room 
This causes a race between receiving the room when starting to peek and receiving the room from joining it - https://github.com/vector-im/riot-web/issues/4330, https://github.com/matrix-org/riot-web-rageshakes/issues/196
 2017-06-19 11:22:55 +01:00
Michael Telatynski 27f38aeba7 make forward_message be friendly with the RVS stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-19 11:15:17 +01:00
Richard van der Hoff ac269e6392 Merge pull request #1115 from matrix-org/rav/fix_registration_race 
Fix race in registration for pusher config
 2017-06-19 10:56:56 +01:00
Richard van der Hoff 557d4ae4c1 Test 'return-to-app' functionality 
Add a test for the 'log in as user' functionality, as well as the 'return to
app' functionality.
 2017-06-19 10:47:36 +01:00
Richard van der Hoff a5d65ee391 Get rid of guestCreds 
-- we just keep the MatrixClient running in the background, so it is easy to
resume.
 2017-06-19 10:36:25 +01:00
Richard van der Hoff 3b518f2c59 Fix race in registration for pusher config 
we no longer immediately create the MatrixClient, so don't assume we do.
 2017-06-19 10:22:18 +01:00
Richard van der Hoff 563d1dc3f1 Merge pull request #4335 from vector-im/rav/fix_token_redirect 
onLoadCompleted is now onTokenLoginCompleted
 2017-06-19 09:06:17 +01:00
Richard van der Hoff 5a8a41ad50 Merge branch 'develop' into rav/fix_token_redirect 2017-06-19 09:05:19 +01:00
Richard van der Hoff 60be24c665 Rename promise 2017-06-19 09:04:24 +01:00
Weblate 4a968cd34f Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 08:02:30 +00:00
Richard van der Hoff 0608c67767 Merge branch 'rav/refactor_matrixclient_states' into develop 
(PR https://github.com/vector-im/riot-web/pull/4325)
 2017-06-19 09:02:08 +01:00
Weblate bd1b06c9b4 Merge remote-tracking branch 'origin/develop' into develop 2017-06-19 07:57:09 +00:00
Richard van der Hoff 98f8be45b7 Merge pull request #4325 from vector-im/rav/refactor_matrixclient_states 
Tweak tests to match updates to matrixchat
 2017-06-19 08:57:06 +01:00
Richard van der Hoff 641f20a4f6 Tweak tests to match updates to matrixchat 
Mostly this is just making it look at the `view` state rather than the
individual boolean flags.

One other tweak merits explanation: we now implement the initial
couldn't-register-as-guest login with an explicit switch to the LOGIN view,
which means that the URL gets updated to #/login.

We also now need to give the login panel a bit longer to appear.
 2017-06-19 08:55:54 +01:00
Richard van der Hoff 115a3deed9 Merge pull request #1102 from matrix-org/rav/refactor_matrixclient_states 
Refactor the state machine in MatrixChat
 2017-06-19 08:53:50 +01:00
Richard van der Hoff cb29d92912 Merge pull request #1110 from matrix-org/rav/fix_token_redirect 
Avoid transitioning to loggedIn state during token login
 2017-06-19 08:52:22 +01:00