PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
8371 commits 1 branch 0 tags 338 MiB
Commit graph

8371 commits

This branch
This branch
All branches
Author SHA1 Message Date
lukebarnard
d495519986 Fix shift-ctrl-click 
isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
 2018-01-03 11:39:15 +00:00
lukebarnard
85cdd888e8 Combine TagOrderStore and FilterStore 
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
 2018-01-03 11:33:59 +00:00
nostradamos
2189fe9256 removed console.log 2018-01-03 01:52:02 +01:00
nostradamos
e543f55572 refactored code 2018-01-03 01:50:03 +01:00
Michael Telatynski
f67d405732
small refactor && warn on self-demotion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-02 23:15:36 +00:00
nostradamos
36df3acf4d Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821 2018-01-02 23:07:47 +01:00
nostradamos
03f88df66e Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821 2018-01-02 22:44:18 +01:00
Weblate
dd9283f952 Merge remote-tracking branch 'origin/develop' into develop 2018-01-02 19:27:06 +00:00
lukebarnard
57fb09dfb7 Fix dodgy merge done in 874a7bf 
where develop branch should have been used for a chunk of code
 2018-01-02 19:26:56 +00:00
Weblate
8c885bbfee Merge remote-tracking branch 'origin/develop' into develop 2018-01-02 19:02:54 +00:00
Luke Barnard
5abf0440c6
Merge pull request #1666 from matrix-org/luke/fix-duplicate-group-profile-requests 
Dedupe requests to fetch group profile data
 2018-01-02 19:02:50 +00:00
Weblate
075c6272cc Merge remote-tracking branch 'origin/develop' into develop 2018-01-02 19:02:37 +00:00
Luke Barnard
8eef09335a
Merge pull request #1667 from matrix-org/luke/fix-naive-tag-panel-group-profile-requesting 
Get Group profile from TagTile instead of TagPanel
 2018-01-02 19:02:33 +00:00
Weblate
cefd6dfbdd Merge remote-tracking branch 'origin/develop' into develop 2018-01-02 18:58:28 +00:00
Sejo
57fc2eab7a Translated using Weblate (Spanish) 
Currently translated at 59.8% (573 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2018-01-02 18:58:27 +00:00
Peter Vágner
9a9c309253 Translated using Weblate (Slovak) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2018-01-02 18:58:27 +00:00
Andrey
c9ef142192 Translated using Weblate (Russian) 
Currently translated at 99.3% (952 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-02 18:58:27 +00:00
Klaus Marx
f44f5aac53 Translated using Weblate (German) 
Currently translated at 99.8% (957 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-01-02 18:58:27 +00:00
Xose M
7d2a637bd9 Translated using Weblate (Galician) 
Currently translated at 24.6% (236 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-01-02 18:58:26 +00:00
Tirifto
c2cc0ffa1c Translated using Weblate (Esperanto) 
Currently translated at 99.3% (952 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-01-02 18:58:26 +00:00
Joachim Nielandt
4c00f3f59c Translated using Weblate (Dutch) 
Currently translated at 75.6% (725 of 958 strings)

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

room wordt momenteel meestal vertaald in 'ruimte'. Ik weet niet of dat de beste vertaling is, maar om consistent te zijn kunnen we misschien best 1 keuze maken en evt achteraf nog wijzigen.
 2018-01-02 18:58:26 +00:00
Milan Korecký
2eafdff2c1 Translated using Weblate (Czech) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2018-01-02 18:58:26 +00:00
Osoitz
fb76d5fa52 Translated using Weblate (Basque) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-02 18:58:26 +00:00
Luke Barnard
2338fba2ee
Merge pull request #1664 from matrix-org/luke/fix-room-list-group-store-leak 
Fix leaking of GroupStore listeners in RoomList
 2018-01-02 18:58:22 +00:00
lukebarnard
479e88cff7 Log an error to get group profile data 2018-01-02 18:55:50 +00:00
lukebarnard
45e860de7a Document GroupStore.registerListener 2018-01-02 18:12:08 +00:00
lukebarnard
874a7bf1de Merge branch 'develop' into luke/fix-room-list-group-store-leak 2018-01-02 16:19:37 +00:00
lukebarnard
133837cdbe Document initial state 2018-01-02 15:59:10 +00:00
lukebarnard
833cd321f3 Log warning in case of failed group profile fetch 2018-01-02 15:58:24 +00:00
lukebarnard
31855f18f8 Initialise profile state 2018-01-02 15:56:32 +00:00
lukebarnard
2cb4c897ce Move getInitialState before componentWillMount 2018-01-02 13:45:19 +00:00
lukebarnard
3cb128094d Add more comments to TagTile to explain what it is 2018-01-02 13:44:22 +00:00
lukebarnard
80f11e5c77 Comment tag PropType 2018-01-02 13:34:47 +00:00
lukebarnard
3947a72d1b Fix to allow subsequent group profile requests if one fails 
Also, delete the groupProfilePromise immediately after setting
the group profile (the first if-statement will prevent a new
request from being started).
 2018-01-02 10:42:48 +00:00
Michael Telatynski
875eb3d34f
Hide status bar on visible->hidden transition 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-01 21:15:26 +00:00
Osoitz
6bbe3c420b Translated using Weblate (Basque) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-01 10:07:36 +00:00
Milan Korecký
97918e2f1d Translated using Weblate (Czech) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2017-12-30 14:28:57 +00:00
Aidan Gauland
35780f5ae0 Remove use of deprecated React.PropTypes 
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
 2017-12-26 14:03:18 +13:00
Aidan Gauland
9531b219d2 Remove unused imports 2017-12-26 12:53:01 +13:00
Aidan Gauland
e4b86f0730 Fix use of deprecated module 
Use PropTypes from "prop-types" instead of the deprecated React.PropTypes
submodule.
 2017-12-26 11:55:15 +13:00
Travis Ralston
e8392dfa00 Have /tint use the primary color as the secondary if no secondary was given 
This is to make the color scheme actually apply itself now that the secondary color is not optional. In order to preserve it being optional in the command, we'll use the primary color as the secondary color as it has no major visual impact.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 13:39:32 -07:00
Travis Ralston
2815c576c1 Ignore the default value when calculating if notifications are enabled 
This is to make the "Enable desktop notifications" checkbox accurately reflect the user's preference. The device-level setting is still respected. 

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 13:29:30 -07:00
Travis Ralston
6f674f21f6 Hide the notification nag bar after enabling notifications 
and add a bit of documentation around why the notificationsEnabled setting isn't set here.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-12-25 13:27:23 -07:00
Aidan Gauland
e6dbc3b863 Use DialogButtons in UnknownDeviceDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
2674fcb6d3 Use DialogButtons in TextInputDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
a11146f39d Use DialogButtons in SessionRestoreErrorDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
93b789438b Use DialogButtons in ConfirmUserActionDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
7a761dbf6b Use DialogButtons in ChatCreateOrReuseDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
aecb4650bc Correct order of buttons in CreateGroupDialog 
We can't use DialogButtons because the primary button is an <input> element.
 2017-12-23 17:02:19 +13:00
Aidan Gauland
c863dbfc76 Use DialogButtons in CreateRoomDialog 
Use DialogButtons to eliminate duplicate button code.
 2017-12-23 17:02:19 +13:00