OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,046 Commits
223 Branches
564 Tags
460 MiB
Commit Graph

5046 Commits (b4e216ba230f278c8685d2b2443f764dae27334b)

Author SHA1 Message Date
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
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
Bamstam 3ffa3d82c6 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 17:10:27 +00:00
Amandine a2b931ee91 Translated using Weblate (French) 
Currently translated at 100.0% (781 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-06-01 17:10:25 +00:00
Luke Barnard 16c4c14a16 Fix to show the correct room 2017-06-01 18:01:30 +01:00
Richard van der Hoff 3c02b70eb7 Merge pull request #994 from matrix-org/revert-989-add-language-picker-labels 
Revert "add labels to language picker"
 2017-06-01 17:54:30 +01:00
Richard van der Hoff b3e9716126 Revert "add labels to language picker" 2017-06-01 17:52:25 +01:00
Richard van der Hoff 6e693612a0 travisci: Don't run the riot-web tests if the react-sdk tests fail 2017-06-01 17:49:49 +01:00
Richard van der Hoff 53ebc8d7bd Merge pull request #983 from matrix-org/rav/clear_storage_on_logout 
Call MatrixClient.clearStores on logout
 2017-06-01 17:34:21 +01:00
Kegan Dougal 66bce35918 copyright adjustments 2017-06-01 17:29:40 +01:00
turt2live ab1e277f5f Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:53:24 -06:00
Jean GB 312109e846 Translated using Weblate (French) 
Currently translated at 98.7% (771 of 781 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-06-01 15:18:38 +00:00
Kegan Dougal 0c7040e190 Missed one 2017-06-01 16:08:42 +01:00
Kegan Dougal ced68f2719 Find a way to translate the name of RTE in user settings 
I never said it was a *nice* way...
 2017-06-01 15:53:08 +01:00
Kegan Dougal a0c21854a9 Make it compile 2017-06-01 15:45:31 +01:00
Kegan Dougal 547f10bcbb Add translations for slash command failures 2017-06-01 15:44:56 +01:00
RiotTranslate 6c48279665 Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 14:31:50 +00:00
Jean GB e266edf350 Translated using Weblate (French) 
Currently translated at 99.1% (771 of 778 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-06-01 14:31:50 +00:00
Krombel 5300aa40f9 Translated using Weblate (German) 
Currently translated at 100.0% (778 of 778 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-01 14:31:48 +00:00
Kegan Dougal f75e714c3a More translations.. 2017-06-01 15:18:06 +01:00
Matthew Hodgson ecbc724a3f Merge pull request #988 from matrix-org/matthew/room-avatar-event 
Matthew/room avatar event
 2017-06-01 14:43:29 +01:00
Matthew Hodgson e6cf93e237 switch to imports 2017-06-01 14:42:44 +01:00
Matthew Hodgson 01cdc7ff21 remove rogue import 2017-06-01 14:42:38 +01:00
Matthew Hodgson fdb619cb40 Merge pull request #989 from coletivoEITA/add-language-picker-labels 
add labels to language picker
 2017-06-01 14:38:48 +01:00
daniel tygel b8e26ddf3d add labels to language picker 2017-06-01 09:48:36 -03:00
Matthew Hodgson 00750b4686 quick and dirty RoomAvatarEvent 2017-06-01 13:31:24 +01:00
Matthew Hodgson d689d4e1fa quick and dirty RoomAvatarEvent 2017-06-01 13:31:15 +01:00
RiotTranslate 8880207d36 [WEBLATE] fix fr and de merge issue 2017-06-01 12:28:16 +00:00
Kegan Dougal b26f4ba578 First lot of translations 2017-06-01 12:09:07 +01:00
Krombel 84fa154016 Translated using Weblate (German) 
Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-01 11:06:12 +00:00
Amandine 63c9ec7d53 Translated using Weblate (French) 
Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-06-01 10:34:03 +00:00
Luke Barnard dd48b3f055 Add comment 2017-06-01 10:08:02 +01:00
Richard van der Hoff 98c4252840 Throw errors when components don't look like components (#980) 
- instead of mysteriously throwing an error later on.
 2017-06-01 09:26:35 +01:00
Hubert Chathi 92d1a9a6ff enable useCompactLayout user setting an add a class when it's enabled 
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2017-05-31 22:00:30 -04:00
Matthew Hodgson bceef2db91 v0.9.0-rc.1 2017-06-01 02:15:49 +01:00
Matthew Hodgson b63adc9b10 Prepare changelog for v0.9.0-rc.1 2017-06-01 02:15:48 +01:00
Matthew Hodgson b1475cb309 bump js-sdk 2017-06-01 02:04:46 +01:00
Matthew Hodgson d021598380 fix typo 2017-06-01 02:04:43 +01:00
Matthew Hodgson 3d91b31637 i18n invited, and delete stale warning 2017-06-01 01:29:07 +01:00
Matthew Hodgson 5e3af22c5d fix broken i18n variable 2017-06-01 01:18:46 +01:00
Matthew Hodgson b4284cf000 fix up Can't connect to HS i18n with _tJsx 2017-06-01 01:17:39 +01:00
RiotTranslate ad0cbdd4ff Update from Weblate. (#981) 
* Translated using Weblate (French)

Currently translated at 99.3% (763 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 100.0% (768 of 768 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/

* Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (Chinese (Simplified))

Currently translated at 26.8% (207 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/zh_Hans/

* Translated using Weblate (French)

Currently translated at 100.0% (770 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/

* Translated using Weblate (German)

Currently translated at 99.7% (768 of 770 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-06-01 00:39:21 +01:00
Matthew Hodgson cad2f643ea Merge pull request #982 from turt2live/travis/presence-undefined 
Fix rare case where presence duration is undefined
 2017-06-01 00:38:50 +01:00
Matthew Hodgson a33b60d3a1 Merge pull request #985 from matrix-org/t3chguy/electron_flash 
add concept of platform handling loudNotifications (bings/pings/whatHaveYou)
 2017-06-01 00:08:46 +01:00