nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
65dd2d4db1 Fix PM being AM 
Fixes https://github.com/vector-im/riot-web/issues/4043

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-26 13:43:01 -06:00
Matthew Hodgson
3815872cf7 Merge pull request #4041 from turt2live/patch-1 
Update translating.md: Minor suggestions
 2017-05-26 20:12:56 +01:00
Travis Ralston
8ddf4ced64 Update translating.md: Minor suggestions 
Primarily spelling, wording, and grammar. A little bit of formatting too.
 2017-05-26 13:09:40 -06:00
RiotTranslate
cd9d3ea248 Merge branch 'develop' of git://github.com/vector-im/riot-web into develop 2017-05-26 18:52:19 +00:00
RiotTranslate
b5912d3c92 Merge branch 'develop' of git://github.com/matrix-org/matrix-react-sdk into develop 2017-05-26 18:52:03 +00:00
RiotTranslate
e46b63dc5a [WEBLATE] fix merging issues 2017-05-26 18:51:55 +00:00
Matthew Hodgson
32207bd058 use develop js-sdk 2017-05-26 19:51:47 +01:00
Matthew Hodgson
963c90c833 switch to develop deps... 2017-05-26 19:51:04 +01:00
Krombel
d626542baf Translated using Weblate (German) 
Currently translated at 100.0% (120 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-26 18:47:45 +00:00
RiotTranslate
10d2caf5d6 Merge remote-tracking branch 'origin/develop' into develop 2017-05-26 18:43:09 +00:00
Krombel
2819799843 Translated using Weblate (German) 
Currently translated at 97.5% (117 of 120 strings)

Translation: Riot Web/Riot Web
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/riot-web/de/
 2017-05-26 18:43:08 +00:00
Krombel
c138e4d92e Translated using Weblate (German) 
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-26 18:40:57 +00:00
Amandine
9fcee811cb Translated using Weblate (French) 
Currently translated at 25.7% (170 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-26 18:40:56 +00:00
Matthew Hodgson
09adfbd6d6 remove stale i18n instructions 2017-05-26 19:39:05 +01:00
Amandine
a77663d18b Translated using Weblate (French) 
Currently translated at 25.6% (169 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/fr/
 2017-05-26 18:18:16 +00:00
Krombel
1edad35c98 Translated using Weblate (German) 
Currently translated at 100.0% (659 of 659 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.nordgedanken.de/projects/riot-web/matrix-react-sdk/de/
 2017-05-26 18:18:14 +00:00
Matthew Hodgson
e5ef9f3e3a Merge pull request #918 from matrix-org/t3chguy/electron_call_sleep 
pass call state through dispatcher, for poor electron
 2017-05-26 19:09:10 +01:00
David Baker
cddfe7e6ef Fix inconsistent quoting in topic messages 2017-05-26 19:00:44 +01:00
Thomas Lant
7034300dd5 A much more cutdown thing without bootstrap, but unfortunately without images and without having tested the links to the rooms actually work, and all the links currently point to lant.uk which obvs needs changing 2017-05-26 17:57:38 +00:00
David Baker
563b85ceb8 Merge https://github.com/MTRNord/matrix-react-sdk/pull/115 2017-05-26 18:53:23 +01:00
Matthew Hodgson
1bcdf31afc Merge pull request #3993 from vector-im/t3chguy/tidy_electron_files 
tidy electron files, they weren't pwetty
 2017-05-26 18:52:41 +01:00
Matthew Hodgson
ff5adeff2c Merge branch 'develop' into t3chguy/tidy_electron_files 2017-05-26 18:50:48 +01:00
Luke Barnard
fd27d6dab1 Merge pull request #936 from matrix-org/luke/new-guest-access-need-to-set-mx-id-beore-user-settings 
Block user settings with view_set_mxid
 2017-05-26 18:48:55 +01:00
Matthew Hodgson
75eca60d76 Merge pull request #4037 from vector-im/luke/new-guest-access-login-button 
Add "Login" button to RHS when user is a guest
 2017-05-26 18:47:26 +01:00
Matthew Hodgson
445a55c7ca Merge pull request #3992 from vector-im/t3chguy/electron_call_sleep 
Prevent Power Save when in call (Electron)
 2017-05-26 18:44:53 +01:00
David Baker
d313f4c7b6 Merge https://github.com/MTRNord/riot-web/pull/70/ 2017-05-26 18:44:08 +01:00
Luke Barnard
aa604612a7 Add "Login" button to RHS when user is a guest 2017-05-26 18:42:07 +01:00
David Baker
5e0457c32d Merge pull request #4035 from vector-im/dbkr/translations 
Translations!
 2017-05-26 18:39:07 +01:00
David Baker
f4184bc695 Merge pull request #934 from matrix-org/dbkr/translations 
Translations!
 2017-05-26 18:38:04 +01:00
Thomas Lant
8f083a5fdd Welcome page + too much bootstrap stuff for now 2017-05-26 17:23:34 +00:00
Matthew Hodgson
9156a871f5 Merge pull request #3961 from Kieran-Gould/kieran-gould/12hourtimestamp 
Kieran gould/12hourtimestamp
 2017-05-26 18:23:11 +01:00
Matthew Hodgson
e26422ef10 fix a typo 2017-05-26 18:22:53 +01:00
David Baker
647c1b6169 Once more, with braces 2017-05-26 18:19:32 +01:00
David Baker
97aeb57a8b Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 18:15:32 +01:00
Luke Barnard
276d3cad9c Merge pull request #906 from matrix-org/luke/revert-login-username-prefix-suffix 
Remove suffix and prefix from login input username
 2017-05-26 18:07:10 +01:00
David Baker
62ffe929e4 Translate Add Threepid labels 2017-05-26 18:03:24 +01:00
David Baker
cf0073a631 Missing translations in User Interface section 2017-05-26 17:59:19 +01:00
David Baker
23fbce66a2 Translate 'email' threepid label 2017-05-26 17:56:51 +01:00
David Baker
40680d55e0 Fix merge fail 2017-05-26 17:55:48 +01:00
Matthew Hodgson
ed79a3adef Merge pull request #935 from matrix-org/luke/new-guest-access-no-barf-on-username-check-err 
Show "Something went wrong!" when errcode undefined
 2017-05-26 17:47:52 +01:00
Matthew Hodgson
44f479c38b Merge pull request #930 from matrix-org/luke/new-guest-access-reset-stores-on-logged-out 
Reset store state when logging out
 2017-05-26 17:45:32 +01:00
David Baker
c22978d033 Merge remote-tracking branch 'origin/develop' into dbkr/translations 2017-05-26 17:30:02 +01:00
Luke Barnard
ac44151e2a Put the reset method in the right scope... 2017-05-26 17:27:31 +01:00
Luke Barnard
9311b9012a Use the same .reset as RoomViewStore 2017-05-26 17:23:02 +01:00
Matthew Hodgson
3d688a6ada Merge pull request #933 from matrix-org/luke/new-guest-access-set-display-name-to-useridlocalpart 
Set the displayname to the mxid once PWLU
 2017-05-26 17:17:23 +01:00
David Baker
84cef00f1f Mismatched oneUser / severalUsers 2017-05-26 17:16:23 +01:00
David Baker
d3875ec794 Oops, include file extension in language list 2017-05-26 17:11:11 +01:00
Matthew Hodgson
1c7785535f Merge pull request #929 from matrix-org/luke/new-guest-access-fix-view-next-room 
Fix view_next_room, view_previous_room and view_indexed_room
 2017-05-26 17:09:35 +01:00
Matthew Hodgson
fbc3f83625 Merge pull request #928 from matrix-org/luke/new-guest-access-inidicate-joining-early 
Use RVS to indicate "joining" when setting a mxid
 2017-05-26 17:08:34 +01:00
David Baker
4fcaccbc7f Merge https://github.com/MTRNord/riot-web/pull/69 2017-05-26 16:56:49 +01:00