OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,513 Commits
211 Branches
549 Tags
664 MiB
Commit Graph

4513 Commits (a3a262b150e3d3a4a8a8ec6c7b793224143cb637)

Author SHA1 Message Date
Richard van der Hoff a3a262b150 Merge remote-tracking branch 'origin/develop' into rav/handle_received_room_key_requests 2017-06-02 10:31:14 +01:00
Richard van der Hoff 21277557f8 Add translations for new dialog 2017-06-02 10:10:40 +01:00
Matthew Hodgson 8add074dbf v0.9.0-rc.2 2017-06-02 01:14:13 +01:00
Matthew Hodgson 3c5d0f82c9 Prepare changelog for v0.9.0-rc.2 2017-06-02 01:14:13 +01:00
Matthew Hodgson adf8ce9ca1 Merge pull request #1002 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-02 01:09:11 +01:00
Matthew Hodgson 7e097d8d74 Merge branch 'release-v0.9.0-rc.1' into develop 2017-06-02 01:07:08 +01:00
Matthew Hodgson 73f97b4661 bump js-sdk for webrtc 2017-06-02 01:05:09 +01:00
Matthew Hodgson ec433907f0 Merge pull request #850 from t3chguy/webrtc_settings 
webrtc config electron
 2017-06-02 00:48:25 +01:00
Michael Telatynski b1973d7998 undefined =/= '' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:42:19 +01:00
Michael Telatynski f4db83a031 try empty string as falsey key 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:31:43 +01:00
Michael Telatynski 6b4daf02a9 i18 missed things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:27:20 +01:00
Michael Telatynski 0bafd6458a Revert voodoo 2017-06-02 00:26:31 +01:00
Michael Telatynski 4976cbb424 missed a thing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:21:34 +01:00
Matthew Hodgson c7285b9053 fix fr layout 2017-06-02 00:21:00 +01:00
Michael Telatynski 46a9326607 special case default - CallMediaHandler can figure it out 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 00:20:34 +01:00
Matthew Hodgson 6a225d1ac2 use new sign-in string 2017-06-02 00:16:17 +01:00
Matthew Hodgson b411c8f97e shorten signin label to aid fr i18n 2017-06-02 00:10:54 +01:00
Michael Telatynski 3eb519b227 this is just endless 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:54:17 +01:00
Michael Telatynski beedeec163 copy the arrays so we're not making a mess 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:50:14 +01:00
Michael Telatynski 0f2c89d525 lets actually make things work, eh? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:39:54 +01:00
Michael Telatynski 4e36c10c38 only unshift default if there is no deviceId===default 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:33:36 +01:00
Michael Telatynski dd4480f8c3 change device data structure to array of objects 
so that we can set falsey values, for unsetting device
                               most dolphinately needs testing

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:26:43 +01:00
Michael Telatynski aa90d6b097 fix **AMAZING** C&P derp 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 23:00:25 +01:00
Michael Telatynski 0c36778369 fix bad indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 22:59:37 +01:00
Michael Telatynski dbba1dedb6 i18nize all the things and change show logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 22:58:17 +01:00
Michael Telatynski 04b86e5d1d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into webrtc_settings 
and i18nize webrtc stufffs

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/structures/UserSettings.js
 2017-06-01 22:56:31 +01:00
Amandine 10095af4d9 Translated using Weblate (French) 
Currently translated at 100.0% (797 of 797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-06-01 21:48:02 +00:00
RiotTranslate 0fa902c21d Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 21:07:12 +00:00
Bamstam 0b6d20a62e Translated using Weblate (German) 
Currently translated at 99.6% (778 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-01 21:07:10 +00:00
Matthew Hodgson 650d45466c fix up missing strings caused by punctuation changes 2017-06-01 22:06:02 +01:00
Matthew Hodgson ee965a89a7 Merge pull request #986 from uhoreg/compact 
enable useCompactLayout user setting an add a class when it's enabled
 2017-06-01 21:32:54 +01:00
Matthew Hodgson be3ac354ed Merge pull request #987 from RiotTranslate/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-01 21:24:40 +01:00
Matthew Hodgson 6c56fa3381 Merge pull request #990 from matrix-org/kegan/translation-marmoset 
Translation fixes for everything but src/components
 2017-06-01 21:22:00 +01:00
Matthew Hodgson 54ae92e9fb Merge pull request #1001 from MTRNord/patch-4 
Fix tests
 2017-06-01 20:18:55 +01:00
Marcel 8c2728ffc5 Revert changes of the key used 2017-06-01 21:10:58 +02:00
Marcel 1b35f816fb Fix languages.json 2017-06-01 21:10:32 +02:00
Marcel 924a8d1be0 Fix line change that should not happen 2017-06-01 21:03:43 +02:00
Marcel 51131ef7a5 Fix translation tests part 2 2017-06-01 21:02:40 +02:00
Marcel cbf967a86d Fix tests 
We do not have a en.json but a en_EN.json
 2017-06-01 20:53:59 +02:00
Matthew Hodgson c5921c4c28 Merge pull request #999 from MTRNord/patch-3 
Fix tests for PR #989
 2017-06-01 19:46:55 +01:00
Matthew Hodgson ba99036054 Merge pull request #1000 from matrix-org/revert-994-revert-989-add-language-picker-labels 
Revert "Revert "add labels to language picker""
 2017-06-01 19:46:44 +01:00
Matthew Hodgson 8e34b59d32 Revert "Revert "add labels to language picker"" 2017-06-01 19:46:25 +01:00
Marcel 46750c4b9b Fix tests for PR #989 2017-06-01 20:40:27 +02:00
Richard van der Hoff d0c1da580f Merge pull request #997 from matrix-org/t3chguy/external_electron 
maybe fixxy [Electron] external thing?
 2017-06-01 19:05:50 +01:00
Michael Telatynski 9f8b2ba4ba maybe fixxy? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-01 18:58:07 +01:00
Richard van der Hoff 7d55f3e75d handle room key request cancellations 2017-06-01 18:40:04 +01:00
Richard van der Hoff d5bc24d9f7 Initial implementation of KeyRequestHandler, KeyShareDialog etc 2017-06-01 18:40:04 +01:00
David Baker f756d231cf Merge pull request #992 from matrix-org/rav/no_run_riot_tests_on_test_fail 
travisci: Don't run the riot-web tests if the react-sdk tests fail
 2017-06-01 18:39:33 +01:00
Matthew Hodgson 33214b8752 Merge pull request #991 from turt2live/travis/date-sep-12hr 
Support 12hr time on DateSeparator
 2017-06-01 18:26:13 +01:00
RiotTranslate 989e994abc Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 17:10:28 +00:00