764d5891ad
Fix proptypes on UserPickerDialog
...
... so that it doesn't log an error
2017-08-21 16:30:49 +01:00
b7569a9831
Revert auxPanel changes (this should already have been fixed in a separate PR).
2017-08-21 15:29:11 +01:00
385205471b
AppsDrawer: Remove unnecessary bind
2017-08-21 15:34:13 +02:00
c0f0425907
Merge pull request #1322 from matrix-org/rxl881/styling
...
Position add app widget link
2017-08-21 14:03:27 +01:00
e8e3117099
Merge pull request #1323 from matrix-org/rxl881/beta
...
Remove app tile beta tag.
2017-08-21 14:03:15 +01:00
866f6f1dd3
Add missing translation.
2017-08-21 12:11:21 +01:00
6c8391e3ea
Remove beta tag.
2017-08-21 11:39:06 +01:00
e93a1fac3d
Position add app widget link
2017-08-21 11:29:42 +01:00
38720e6216
Add internationlisation.
2017-08-21 10:05:16 +01:00
2eac869e27
Merge branch 'develop' into rob/apps-not-e2ee
2017-08-21 10:30:38 +02:00
70824960ee
AppPermission: Make strings translatable
2017-08-21 10:23:55 +02:00
c6a48cbda6
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-19 11:03:09 +00:00
345903514a
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-19 11:03:04 +00:00
d7f5295949
untested WIP for supporting multiple widgets properly
2017-08-18 18:40:00 +01:00
1862057695
Only render appTile body (including warnings) if drawer shown.
2017-08-18 18:33:56 +01:00
7395f96b77
Rearrange timeline update wording for better internationalisation. Fix widget name values.
2017-08-18 18:02:50 +01:00
b678c2cf0f
Don't bind Pill function, React does this for us
2017-08-18 17:15:27 +01:00
45e7f1c401
Translated using Weblate (German)
...
Currently translated at 100.0% (963 of 963 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-08-18 15:56:09 +00:00
2e00968bcd
AppPermission: Note that apps are not E2E encrypted in E2E rooms
2017-08-18 17:44:33 +02:00
4a1106de2f
Translated using Weblate (German)
...
Currently translated at 94.9% (914 of 963 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-08-18 15:32:53 +00:00
273abd9327
Merge pull request #1318 from matrix-org/luke/fix-widget-event-name
...
Add a space between widget name and "widget" in widget event tiles
2017-08-18 16:09:20 +01:00
1c36e47403
Fix add widget link
2017-08-18 15:59:12 +01:00
7a277bff3a
Add a space between widget name and "widget" in widget event tiles
2017-08-18 15:45:02 +01:00
b7d46d91ed
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-18 15:35:01 +01:00
bf07333915
Merge pull request #1316 from matrix-org/luke/fix-app-name-case
...
Don't apply case logic to app names
2017-08-18 15:08:40 +01:00
5e0a7212d9
Don't apply case logic to app names
...
As they should have the Correct Case in integrations land now
2017-08-18 14:57:28 +01:00
36fffa1696
Stop integ manager opening on every room switch
...
This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle.
This was introduced in matrix-org/matrix-react-sdk#1312 .
Known issue with this fix: deleting the last app doesn't hide the app drawer.
2017-08-18 14:48:58 +01:00
857a8c9519
Remove empty defaultProps.
2017-08-18 13:28:47 +01:00
3a7aa926c3
Merge pull request #1313 from matrix-org/luke/feature-app-tile-ux
...
Add behaviour to toggle app draw on app tile header click
2017-08-18 13:08:57 +01:00
caff761df7
Merge pull request #1308 from matrix-org/t3chguy/mels_fix
...
Change OOO so that MELS generation will continue over hidden events
2017-08-18 13:08:35 +01:00
84f5e5aad2
REmove unused onCancelClick
2017-08-18 12:21:48 +01:00
1a1a80b633
Merge branch 'develop' into luke/feature-app-tile-ux
2017-08-18 12:12:00 +01:00
cab3123bd8
Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events
...
Implement TextualEvent tiles for im.vector.modular.widgets
2017-08-18 12:10:22 +01:00
1bba1f0fa6
Add comment
2017-08-18 12:04:34 +01:00
6c37a9a3af
Simplify getting of content, prev content for widget event
2017-08-18 12:03:29 +01:00
615d96a065
catch hidden event being RM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-18 11:53:52 +01:00
96900e76a0
Move error logging to where it is first caught.
2017-08-18 11:51:32 +01:00
4b5cdac032
Don't show widget security warning to the person who added it to the room.
2017-08-18 11:41:27 +01:00
57505c3a61
Add behaviour to toggle app draw on app tile header click
2017-08-18 10:56:35 +01:00
9382689675
Merge branch 'develop' into luke/feature-widget-timeline-events
2017-08-18 10:47:25 +01:00
20a0ec35af
Use short form to get event URL
2017-08-18 10:45:43 +01:00
acc54b97f1
Implement TextualEvent tiles for im.vector.modular.widgets
...
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
2017-08-18 10:35:33 +01:00
42d9e3bc8a
remove unused strings introduced by string change in bb084595
2017-08-17 20:26:34 +02:00
bb0845954d
improve wording for directory listings
2017-08-17 19:10:45 +01:00
7c04a6671d
expand auxPanel when showing apps
2017-08-17 19:06:19 +01:00
b0d088dfd0
Added translation using Weblate (Czech)
2017-08-17 17:11:38 +00:00
120a4f4f44
Check for valid roomId before renering manageIntegsButton.
2017-08-17 18:10:50 +01:00
0907fff080
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-17 17:47:46 +01:00
91fe308f06
Merge pull request #1310 from matrix-org/t3chguy/hotfix1
...
hotfix bad fn signature regression
2017-08-17 17:31:55 +01:00
766c188a1e
hotfix bad fn signature regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-17 17:15:18 +01:00
02edadbd15
Don't bubble cancel click to room header.
2017-08-17 12:21:44 +01:00
d1ee257b5a
Pass roomId rather than whole room object.
2017-08-17 12:15:01 +01:00
eb77dcc8e3
Camel case variable name
2017-08-17 11:24:25 +01:00
2c25639a61
Fix copyright header
2017-08-17 11:22:42 +01:00
9111cb421e
Merge pull request #1291 from matrix-org/rxl881/maxWidgets
...
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-17 10:03:42 +01:00
59815359f8
Add misiing _tJsx import
2017-08-16 23:55:43 +02:00
fceccfc503
Add missing Robot string to translation
2017-08-16 23:54:36 +02:00
0935f26cf3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-08-16 16:04:47 +01:00
0844beac79
Enable matrix-apps by default
2017-08-16 16:04:39 +01:00
252ab208e4
Merge pull request #1300 from matrix-org/dbkr/userpicker
...
Refactor ChatInviteDialog to be UserPickerDialog
2017-08-16 14:29:07 +01:00
14903274c0
Change OOO so that MELS generation will continue over hidden events
...
this fixes the scenario of N Member events, then an invisible event
e.g. (m.room.aliases) then more Member events. Pre hide-join-parts
this is how it worked.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-16 13:20:32 +01:00
a379f04ca8
Merge pull request #1306 from matrix-org/luke/fix-te-i18n-variables
...
Fix i18n variable names and `)s` syntax for TE.json (Tegulu)
2017-08-15 18:18:54 +01:00
eae5a45ec2
Fix variable case
2017-08-15 18:02:46 +01:00
063cbcfc73
Merge pull request #1303 from matrix-org/luke/fix-autocomplete-by-mxid
...
Allow autocompletion when typing user IDs
2017-08-15 17:32:03 +01:00
036fa0e944
Merge pull request #1305 from matrix-org/t3chguy/fix_async_modal
...
fix async modal create fn signature
2017-08-15 17:31:45 +01:00
9818007022
Fix i18n variable names and `)s` syntax for TE.json (Tegulu)
2017-08-15 17:29:55 +01:00
72a412589d
Fix vector-im/riot-web#4799 regression by fixing fn signature
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-15 15:52:38 +01:00
454a848e47
Remove erroneous line
2017-08-15 15:10:23 +01:00
b40cc111bd
Remove incidental diff syntax
2017-08-15 15:03:25 +01:00
d443368aa3
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop
...
Conflicts:
src/i18n/strings/en_EN.json
src/i18n/strings/fr.json
src/i18n/strings/ru.json
2017-08-15 14:00:35 +00:00
97ee9d72db
Translated using Weblate (Ukrainian)
...
Currently translated at 19.1% (175 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-08-15 13:39:11 +00:00
df898e1c45
Translated using Weblate (Thai)
...
Currently translated at 70.4% (645 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-08-15 13:39:10 +00:00
5112134345
Translated using Weblate (Telugu)
...
Currently translated at 36.7% (337 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/te/
2017-08-15 13:39:10 +00:00
29b5a03e02
Translated using Weblate (Swedish)
...
Currently translated at 56.8% (521 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2017-08-15 13:39:10 +00:00
4da6c811e9
Translated using Weblate (Spanish)
...
Currently translated at 69.9% (641 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2017-08-15 13:39:10 +00:00
7bc754618e
Translated using Weblate (Russian)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-08-15 13:39:10 +00:00
2f373de574
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 99.7% (914 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2017-08-15 13:39:10 +00:00
435028a68b
Translated using Weblate (Polish)
...
Currently translated at 30.5% (280 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
2017-08-15 13:39:10 +00:00
3e765d52bc
Translated using Weblate (Malayalam)
...
Currently translated at 4.1% (38 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ml/
2017-08-15 13:39:10 +00:00
430389309d
Translated using Weblate (Latvian)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
2017-08-15 13:39:10 +00:00
535b16ac3f
Translated using Weblate (Japanese)
...
Currently translated at 20.8% (191 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
2017-08-15 13:39:10 +00:00
e7ccd6792c
Translated using Weblate (Italian)
...
Currently translated at 19.2% (176 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-08-15 13:39:10 +00:00
2c3484bfe6
Translated using Weblate (Indonesian)
...
Currently translated at 25.3% (232 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/id/
2017-08-15 13:39:10 +00:00
013fa108b5
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-08-15 13:39:10 +00:00
3578234689
Translated using Weblate (German)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-08-15 13:39:10 +00:00
b77aa5b2a8
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-15 13:39:10 +00:00
b3989bb01a
Translated using Weblate (Esperanto)
...
Currently translated at 1.4% (13 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2017-08-15 13:39:10 +00:00
c332a26322
Translated using Weblate (English)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_EN/
2017-08-15 13:39:09 +00:00
bd2fd07959
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2017-08-15 13:39:09 +00:00
7d7afeb276
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2017-08-15 13:39:09 +00:00
9150b687eb
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 40.6% (372 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-08-15 13:39:09 +00:00
cc6af53db8
Translated using Weblate (Basque)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2017-08-15 13:39:09 +00:00
14c474c6ef
Translated using Weblate (Arabic)
...
Currently translated at 1.2% (11 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ar/
2017-08-15 13:39:09 +00:00
5b1467a4c9
Allow autocompletion when typing user IDs
...
Because we need to support tab completing `"@some_user"` if `@some_user` has a display name that is totally different and will therefore not match what the user typed in.
This does have the disadvantage of a display name appearing (the pill) that isn't at all what the user typed in, but the autocomplete box and the tooltip should give enough information to let the user know what's going on. (e.g. typing `@kyr*tab*` and getting `Remmy`).
This _does_ run contrary to vector-im/riot-web#4495
related to vector-im/riot-web#4794
cc @lampholder
2017-08-15 14:08:26 +01:00
753ea38654
Add UserAddress
2017-08-15 14:01:50 +01:00
0df8a63847
de-lint Invite.js
2017-08-15 13:50:15 +01:00
81273ec855
Move non-invite specific stuff to UserAddress
2017-08-15 13:42:23 +01:00
bbcf7e1d9b
s/inviteList/userList/
2017-08-15 13:30:13 +01:00
472b5b5350
Merge pull request #1299 from matrix-org/luke/fix-text-offsets-to-selection-state
...
Fix bugs in textOffsetsToSelectionState
2017-08-15 11:37:35 +01:00
fa660c8211
PR feedback
2017-08-15 10:57:24 +01:00
65dc9fda6e
Alter comments
2017-08-15 09:25:23 +01:00
5f00bbbff6
Add comments
2017-08-15 09:22:50 +01:00
004cc42cfc
Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content
...
Store history as raw content
2017-08-15 09:18:22 +01:00
6baca05968
Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick
...
Add onClick to user pills
2017-08-15 09:15:50 +01:00
b7b449434d
Lint
2017-08-15 09:10:13 +01:00
d1c54e1224
Switch to prop-types
2017-08-15 08:58:08 +01:00
1b66e88b6e
ChatInviteDialog -> UserPickerDialog pt 2
...
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
447aa1e5a0
Refactor ChatInviteDialog to be UserPickerDialog
...
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.
Adds the ability to restrict what types of addresses may be chosen,
although this isn;t used yet, it will be necessary for groups
because groups don't support 3pid invites.
2017-08-14 17:38:59 +01:00
844ca249d0
Fix bugs in textOffsetsToSelectionState
...
This just had some thinkos in it. Namely the conditionals were slightly wrong and this lead to negative offset selection state being returned, causing vector-im/riot-web#4792
fixes vector-im/riot-web#4792
2017-08-14 17:31:16 +01:00
ecef9cf22f
Use plaintext when loading a markdown history item into RT mode
2017-08-14 16:48:29 +01:00
6b1b643d41
Merge branch 'develop' into luke/store-history-as-raw-content
2017-08-14 16:42:22 +01:00
7d10a7556b
Merge pull request #1295 from matrix-org/luke/fix-emoji-picker-gone
...
preventDefault when moving autocomplete selection with vertical arrow
2017-08-14 16:37:32 +01:00
5eff2a3df2
Merge branch 'develop' into luke/fix-user-pill-onclick
2017-08-14 16:32:01 +01:00
e48c4911b8
Merge pull request #1294 from matrix-org/revert-1290-luke/fix-user-url-no-middle-panel
...
Revert "At /user, view member of current room"
2017-08-14 16:31:24 +01:00
0079e70006
Display RM when it = a standalone member event
...
Standalone = not next to any member events in the timeline.
fixes vector-im/riot-web#4694
2017-08-14 15:40:49 +01:00
9742962d61
preventDefault when moving autocomplete selection with vertical arrow
...
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
2017-08-14 15:16:13 +01:00
867e83edff
Fix log to include some useful info
2017-08-14 14:47:26 +01:00
bb229d33a4
Add onClick to user pills
...
instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.
2017-08-14 14:44:08 +01:00
2844b574d5
Re-add useful comment
2017-08-14 14:41:03 +01:00
b59de7964c
Wait for first sync before dispatching view_user on /user
...
the RightPanel will be mounted once we're done doing the first sync, so wait until then and then dispatch a view_user. This is not very nice but it's what we do for view_room.
2017-08-14 14:37:49 +01:00
d9e8292a5e
Revert "At /user, view member of current room"
2017-08-14 14:06:54 +01:00
3d5d7fa9c8
Lint
2017-08-14 13:59:12 +01:00
c97ae5c2e1
Override matrix-apps to be disabled
...
- ignores localStorage setting
- hides feature from labs section in user settings
2017-08-14 12:29:42 +01:00
cbd8018ac8
Support semi-perma-disabling of lab features
...
Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.
2017-08-14 12:26:31 +01:00
ab7aeccd35
Translated using Weblate (Russian)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-08-13 18:07:28 +00:00
d4a5bd86e6
Translated using Weblate (Korean)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-08-13 04:05:38 +00:00
0e2d5a798f
Translated using Weblate (Korean)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2017-08-13 03:59:17 +00:00
4a1ba01f44
fix deprecation warning
2017-08-13 00:56:37 +00:00
018c8721f4
Translated using Weblate (French)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-08-11 21:11:46 +00:00
305adf8b62
Translated using Weblate (Italian)
...
Currently translated at 19.2% (176 of 915 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-08-11 13:02:45 +00:00
02217c8bd2
Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel
...
At /user, view member of current room
2017-08-11 10:49:22 +01:00
8b4e00330a
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (916 of 916 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-08-11 09:44:03 +00:00
454ec40b00
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-11 10:35:20 +01:00
0323151bee
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-10 23:53:43 +01:00
975aa0f08a
Added translation using Weblate (Indonesian)
2017-08-10 22:24:12 +00:00
12966d06cd
Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics
...
un-i18n Modal Analytics
2017-08-10 15:35:46 +01:00
d3ba1f40dc
Merge pull request #1272 from matrix-org/t3chguy/hide_other_events
...
allow hiding of avatar/display name changes
2017-08-10 15:35:11 +01:00
89254e77f4
When no member, use `null` `roomId`
2017-08-10 15:23:14 +01:00
5450d6b9ca
remove redundant check and add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:22:53 +01:00
41843f021d
don't track two more potential risks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:21:01 +01:00
56ea528f43
don't track error messages .2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:17:52 +01:00
625ca96d86
add comment about why state key must be not undefined
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 14:01:24 +01:00
a6064c53d3
export shouldHideEvent fn named
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 14:00:26 +01:00
ab3abd2f7f
fix string casing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:59:55 +01:00
1603360c13
s/Membership/Member/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:58:19 +01:00
b19c1010aa
Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/Analytics.js
2017-08-10 13:54:55 +01:00
67f9c3774d
make string more human-friendly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:51:47 +01:00
24599ace32
don't track error messages
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 13:49:11 +01:00
60c1ba4f4d
Add LanguageDropdown to LoginPage ( #1284 )
2017-08-10 13:29:10 +01:00
07633fe67f
At /user, view member of current room
...
With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name).
To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change.
Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.
2017-08-10 13:12:50 +01:00
Richard van der Hoff