nikrozman/element-web
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
62,585 Commits 258 Branches 582 Tags
38e5eeea00a56d548dee683eaaf9158ce335175d
Commit Graph

62585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ac2a5a882d Merge pull request #4140 from RiotTranslate/weblate-riot-web-riot-web 
Update from Weblate.
 2017-06-01 21:34: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
f099f56f01 Merge pull request #4132 from uhoreg/compact 
add styles for compact layout
 2017-06-01 21:32:46 +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
David Baker
19f9900b55 Merge pull request #4147 from vector-im/rav/fetch_deps_tweaks 
Various tweaks to fetch-develop-deps
 2017-06-01 18:48:43 +01:00
David Baker
9e46d174a5 Merge pull request #4145 from vector-im/rav/pin_to_node_6.3 
Don't try to build with node 6.0
 2017-06-01 18:40:26 +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
1fbec01edb Merge pull request #4143 from turt2live/travis/date-sep-12h 
Support 12hr time on DateSeparator
 2017-06-01 18:29:53 +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
Luke Barnard
a2378db837 Merge branch 'new-guest-access' of github.com:vector-im/riot-web into new-guest-access 2017-06-01 18:23:12 +01:00
Luke Barnard
188ea3a4b1 CSS for modified ChatcreateOrReuseDialog 2017-06-01 18:23:04 +01:00
Richard van der Hoff
81c0c7bd4f Various tweaks to fetch-develop-deps 
* tell git to checkout the right branch, rather than cloning and then changing.
* clone with depth 1 under travis, to save time.
* less pushd/popd, which print out confusing text - use `cd` in a subshell
  instead. (and just avoid it where possible).
* add some markers to the output to let travis roll it up.
 2017-06-01 18:18:46 +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
Matthew Hodgson
29e58be7f4 Merge pull request #4129 from vector-im/matthew/i18n-welcome 
i18n welcome
 2017-06-01 18:08:17 +01:00
Luke Barnard
16c4c14a16 Fix to show the correct room 2017-06-01 18:01:30 +01:00
Richard van der Hoff
71aed70d4b Don't try to build with node 6.0 
because it has broken npm
 2017-06-01 17:55:52 +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
Hubert Chathi
9f597e9d3c fix alignment of info event tiles 2017-06-01 12:09:36 -04:00
turt2live
ab1e277f5f Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:53:24 -06:00
turt2live
640fa108fc Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:52:42 -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
RiotTranslate
fcdfec9d64 Merge remote-tracking branch 'origin/develop' into develop 2017-06-01 15:18:21 +00:00
Jean GB
569e54e5a9 Translated using Weblate (French) 
Currently translated at 100.0% (161 of 161 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/fr/
 2017-06-01 15:18:20 +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
Richard van der Hoff
e868dbbb94 No need to make olm an external (#4139) 
matrix-js-sdk now loads olm from global.Olm instead of requiring it
(https://github.com/matrix-org/matrix-js-sdk/pull/446), so we no longer need to
define it as an external.
 2017-06-01 15:46:37 +01:00