OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,123 Commits
211 Branches
549 Tags
666 MiB
Commit Graph

5082 Commits (38f45bc40d6a247fcb914ffb7e40594d4d1909db)

Author SHA1 Message Date
Richard van der Hoff 38114711fd Make MatrixChat do fewer render cycles during mount 
This is mostly with the intent of making the login tests more reliable, but it
seems generally worthwhile:

* keep screenAfterLogin in the object props rather than `state` so that we can
  clear it without triggering a rerender

* also move our record of the window width to the object props, and call
  `handleResize` from componentWillMount rather than componentDidMount so that
  we don't trigger a rerender by updating `state.width`

* Remove update of unused `loading` state
 2017-08-08 22:31:40 +01:00
David Baker 8426ada24c Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted 
Show unencrypted messages as unencrypted
 2017-08-08 18:11:56 +01:00
Richard van der Hoff da85cb9f45 Show unencrypted messages as unencrypted 
Previously, we were special-casing outgoing messages such that they were shown
as encrypted even when encryption had failed for some reason.

There's no need for this: outgoing messages have a working isEncrypted() method
which we can use to show whether the event has been encrypted yet. Arguably we
could do better than an open padlock for events in the 'encrypting' send state,
but I'm not really sure what.
 2017-08-08 17:49:41 +01:00
David Baker 34adda590b Merge pull request #1280 from matrix-org/luke/fix-rte-prevent-completion-pills-in-commands 
Disable autocompletions for users and rooms when entering a command
 2017-08-08 17:48:56 +01:00
David Baker b76b6791b2 Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions 
Always use message `body` when quoting
 2017-08-08 17:47:25 +01:00
Luke Barnard cb8a66b5a1 When `hide`ing autocomplete, also remove completion state 2017-08-08 17:25:11 +01:00
Luke Barnard a72f38799f Disable autocompletions for users and rooms when entering a command 
This only affects commands that take a room alias or user ID as an argument. (Leaving commands such as `/me` unaffected)
 2017-08-08 15:58:15 +01:00
Luke Barnard 503fa6a7b3 Always use message `body` when quoting 
(not formatted_body)

This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
 2017-08-08 14:59:56 +01:00
David Baker ca2273519d Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting 
Add optional setting for hiding avatars in <Pill>s
 2017-08-08 14:01:34 +01:00
Luke Barnard bef6726290 Lint 2017-08-08 13:42:51 +01:00
Luke Barnard 91a1cc4431 Mandate ctrl/meta ONLY for a subset of key bindings 
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
 2017-08-08 13:36:43 +01:00
Luke Barnard b08d32371d Add optional setting for hiding avatars in <Pill>s 
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
 2017-08-08 11:13:29 +01:00
David Baker 3639fc0c3c Merge pull request #1276 from matrix-org/luke/fix-rte-completion-raw-disp-name 
Use the rawDisplayName for the user provider completion
 2017-08-08 10:38:24 +01:00
Luke Barnard 1743c047bd Use the rawDisplayName for the user provider completion 
to make sure that the length of text in the decoration (See <Pill>) is equal to the length of text in the completion (underlying text range that the Entity covers).
 2017-08-08 10:28:11 +01:00
Luke Barnard 7018deee44 Fix ctrl+a, backspace toggling block format 
Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753
 2017-08-07 17:16:42 +01:00
Luke Barnard 641fda0162 Adjust comment 2017-08-07 16:29:22 +01:00
Luke Barnard d9d8f2055f Allow default for ctrl+shift+b, ctrl+shift+u in RTE 
fixes vector-im/riot-web#4750
 2017-08-07 16:23:37 +01:00
Michael Telatynski ffdffb643d
allow hiding of avatar/display name changes 2017-08-04 17:22:01 +01:00
Luke Barnard ee18ddb700 MD-escape URLs/alises/user IDs prior to parsing markdown 
So that MD characters in them do not result in formatting being applied.

Fixes https://github.com/vector-im/riot-web/issues/3428
Fixes https://github.com/vector-im/riot-web/issues/4674
 2017-08-04 10:02:22 +01:00
Luke Barnard a27eefd893 Fix a couple of more errors due to API changes 2017-08-03 15:20:44 +01:00
Luke Barnard 901cbf495d Update decorator strategy API in accordance with recent changes to 0.11.0 
See 590cdc6c54, which is a change to the API not mentioned in the migration to v0.10 notes https://draftjs.org/docs/v0-10-api-migration.html
 2017-08-03 12:02:29 +01:00
Luke Barnard 1d1cd5f691 Reflect API change for decorator strategy 2017-08-03 11:36:07 +01:00
Luke Barnard fb5dc295aa Reflect API change for getting an Entity 2017-08-03 11:29:26 +01:00
Luke Barnard 124795006c Reflect API change for creating an Entity 2017-08-03 11:18:56 +01:00
yuurii 4835123256 Added translation using Weblate (Japanese) 2017-08-03 09:15:56 +00:00
Osoitz 5872f2389f 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-03 06:30:46 +00:00
Jeff Huang da2b3c067b 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-03 06:11:15 +00:00
Richard Lewis 5752345b80 Merge pull request #1263 from matrix-org/rxl881/warnings 
Display warning if widget is mixed content
 2017-08-02 17:30:46 +01:00
Richard Lewis 7599bde1f6 Fix logging line length. 2017-08-02 17:05:46 +01:00
Luke Barnard 700dd51584 Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks 
Account for `\n` after each block
 2017-08-02 16:41:47 +01:00
Kegan Dougal c914f1607b scalar-develop is a scalar URL 2017-08-02 14:35:14 +01:00
Luke Barnard 1512aff326 Add comments 2017-08-02 11:06:02 +01:00
Luke Barnard 2c86086444 Account for `\n` after each block 
when converting from text offsets to selection state.

fixes vector-im/riot-web#4728
 2017-08-02 10:51:34 +01:00
Luke Barnard 72c1cf9288 When sorting completions, use matched string, not entire query 
Otherwise the results vary depending on where you start autocompleting in your message. We only care about the matched string.
 2017-08-02 10:09:00 +01:00
Luke Barnard dbade448c1 Don't try to match query against roomId 
We only care about aliases.
 2017-08-02 09:40:00 +01:00
Luke Barnard 8053d2933a Order room completions more intuitively 
by index of the query in displayedAlias and then length of displayedAlias. (So that aliases where the query appears earlier in the string appear first and if the query is in the same index for two aliases, the shorter one appears first).
 2017-08-02 09:35:07 +01:00
Richard Lewis 48faf72fdc Disable eslint rule 2017-08-01 21:00:18 +01:00
Richard Lewis 2ab6bc84a7 Improve clarity 2017-08-01 17:49:41 +01:00
Richard Lewis f0224460d2 Fix comparison and handle case where app has permission to load but content is mixed protocol. 2017-08-01 17:48:02 +01:00
Richard Lewis d29610bdd2 Fix boolean comparison. 2017-08-01 17:45:06 +01:00
Richard Lewis f57b0d4cc7 Fix invalid translation 2017-08-01 17:43:38 +01:00
Luke Barnard ff95542549 Adjust emoji sorting such that exact matches/prefixes appear first 
fixes https://github.com/vector-im/riot-web/issues/4704
 2017-08-01 17:36:41 +01:00
Richard Lewis bc4d979d1e Display warning if widget is mixed content 2017-08-01 17:29:29 +01:00
Osoitz 240a3545d0 Translated using Weblate (Basque) 
Currently translated at 29.2% (268 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2017-08-01 16:11:16 +00:00
Osoitz 2a82201551 Translated using Weblate (Basque) 
Currently translated at 17.1% (157 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2017-08-01 16:06:46 +00:00
Luke Barnard a40a86669a Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating 
Use componentWillReceiveProps to update pill state when props change
 2017-08-01 16:30:25 +01:00
Osoitz 435455c9f0 Added translation using Weblate (Basque) 2017-08-01 15:29:58 +00:00
Luke Barnard 630c2968eb Use componentWillReceiveProps 2017-08-01 16:20:32 +01:00
Luke Barnard 71abd3aff8 Revert setting of `key` 2017-08-01 16:14:12 +01:00
Luke Barnard 7fcb8c5ff0 Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace 
Only auto-replace emoji following ^ or \s
 2017-08-01 15:56:42 +01:00
Richard Lewis 546173d246 Fix scalar token 2017-08-01 15:53:42 +01:00
Luke Barnard 438b63bee2 Only auto-replace emoji following ^ or \s 
So as not to cause issues when typing e.g. `This is what was tested: ` (the "d:" used to be transformed into an emoji)
 2017-08-01 14:26:30 +01:00
Luke Barnard 9e71ba26c4 Add `key` prop to RTE decorated entities (Pills and links) 
This will cause a re-render when the URL of the pill/link changes.

fixes vector-im/riot-web#4718
 2017-08-01 13:51:08 +01:00
Richard Lewis abae43b65e Merge pull request #1257 from matrix-org/rxl881/widgetPermissions 
Widget permissions
 2017-08-01 12:13:09 +01:00
Richard Lewis 5f8e86197f Check that wurl is scalar, before checking for curl 2017-08-01 12:00:03 +01:00
Richard Lewis 596efb6062 Fix missing comma 2017-08-01 11:42:50 +01:00
Richard Lewis 46755de962 Fix event type. 2017-08-01 11:41:41 +01:00
Richard Lewis 15f39040a0 Simplify canUserModifyWidgets API 2017-08-01 11:39:17 +01:00
Michael Telatynski 62af06104d
resolve -> reject because semantics. 2017-07-31 14:22:05 +01:00
Michael Telatynski f310d4446c
i18n the title of the set mxid dialog 2017-07-31 13:31:07 +01:00
Michael Telatynski 25d1d21d93
copy logic from RegistrationForm to detect invalid localparts 2017-07-31 13:28:43 +01:00
Michael Telatynski 4bdaa15c47
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 2017-07-28 21:01:59 +01:00
Richard Lewis a310ff3bab Add ToDo item. 2017-07-28 18:21:23 +01:00
Richard Lewis 6aa1d923ce Add comment 2017-07-28 16:48:13 +01:00
Richard Lewis 9935dd0051 Add comment to explain "fullWidth" component porperty. 2017-07-28 16:46:21 +01:00
Richard Lewis 8529a21f5c Translate "Allow" 2017-07-28 16:42:07 +01:00
Richard Lewis 700ef34e95 Translate warning 2017-07-28 16:39:18 +01:00
Richard Lewis 4308d2c635 Inline setState. 2017-07-28 16:36:06 +01:00
Richard Lewis 50ad80ad86 Use ES6 style import 2017-07-28 16:24:32 +01:00
Richard Lewis 2e6fb1f956 Fix license header 2017-07-28 16:23:49 +01:00
Richard Lewis 6238c1d704 Fix default prop initialisation 2017-07-28 16:23:38 +01:00
Richard Lewis 6f57fe96f2 Add JS doc to indicate that the function may throw an error. 2017-07-28 16:19:20 +01:00
Richard Lewis a901ca5308 Remove invalid OM license header. 2017-07-28 16:17:18 +01:00
Luke Barnard 8a5f2bf2ca Interpret a `split-block` as format toggle for an empty block 
(`split-block` is emitted when "return" is pressed)

part of fixing https://github.com/vector-im/riot-web/issues/4580
 2017-07-28 14:46:57 +01:00
Richard Lewis aff1cd9469 Add allow-presentation permission to iframe sandbox permissions 2017-07-28 11:14:04 +01:00
Richard Lewis 11335b1488 Rename variable to curlBase, for clarity 2017-07-28 10:18:06 +01:00
Richard Lewis e1d9301eb4 Strip query parameters from content URLs 2017-07-28 10:01:58 +01:00
Andrei Shevchuk f4f85d053d 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-07-28 07:20:47 +00:00
Andrei Shevchuk c0d312af10 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-07-28 03:16:55 +00:00
Andrey 9bbe3871e7 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-07-28 00:25:06 +00:00
Richard Lewis d69c9a36b3 Factor out check permissions code. 2017-07-27 23:38:26 +01:00
Richard Lewis 20a1693c71 Only display add app link if user has permission to add widgets in the room. 2017-07-27 23:38:02 +01:00
Richard Lewis ccf3c1de7a Add widget utility class. Add static method to determine if user can modify widgets in the specified room. 2017-07-27 23:37:33 +01:00
Richard Lewis 5e23d676b4 Remove comments. 2017-07-27 23:05:43 +01:00
Richard Lewis 51d160e7d6 Hide edit button when user does not have permission to edit. 2017-07-27 20:18:31 +01:00
Richard Lewis f7e9dd4118 Add edit translation 2017-07-27 19:56:28 +01:00
Luke Barnard 6cb8b12cda Instead of inserting MD for completion, convert the Entity later 
This makes sure that the length of the range for a completed Entity = the length of the text in the decoration, which apparently draftjs assumes when calculating selection state offsets.

Fixes https://github.com/vector-im/riot-web/issues/4666
 2017-07-27 18:17:41 +01:00
Richard Lewis ab7fcbb5e7 Add function to determine if a user can modify widgets and style UI components as a result. 2017-07-27 18:10:28 +01:00
Richard Lewis 27923e300c Add JSX wrapper. 2017-07-27 17:47:04 +01:00
Richard Lewis 997c7493eb Add translations for delete widget and revoke widget access. 2017-07-27 17:46:45 +01:00
Michael Telatynski bf98c0da7c
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:19:18 +01:00
Richard Lewis 9ee1f3962d Set display URL from wurl if curl not specified. 2017-07-27 16:42:29 +01:00
Richard Lewis 8e4f1f0989 Add message spinner. 2017-07-27 16:41:52 +01:00
Richard Lewis f2058e0a6c Add message spinner component. 2017-07-27 16:41:20 +01:00
David Baker 92746f8cb5 Merge pull request #1254 from matrix-org/luke/fix-join-command 
Fix /join #alias command in markdown mode
 2017-07-27 15:43:02 +01:00
Luke Barnard 5c7891a25b Remove logs 2017-07-27 15:26:36 +01:00
Luke Barnard e71df44fc9 Fix /join #alias command in markdown mode 
Tab-completing a room alias inserts a markdown link, which is now stripped before a command is parsed. We also strip the MD links when doing the autocompletion itself (getAutocompleteQuery).

There is still an issue where `/invite` will not work at all with tab-completion - the text of a user Pill is not the userID but rather the display name, which cannot be used as an argument to the command.
 2017-07-27 15:18:06 +01:00
Luke Barnard dff79c4688 Only apply room pills to matrix.to room links, exclude event links 
This fixes https://github.com/vector-im/riot-web/issues/4680
and fixes https://github.com/vector-im/riot-web/issues/4670
 2017-07-27 13:01:40 +01:00
Andrei Shevchuk 6e7adedf1e 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-07-27 11:33:52 +00:00
Luke Barnard 4d4078be7e Remove disambiguation from pills 2017-07-27 10:54:23 +01:00
Luke Barnard f19fade448 Strip " (IRC)" from display names inserted into the timeline 2017-07-27 10:50:41 +01:00
Javier Quevedo 35ce336c35 Translated using Weblate (Spanish) 
Currently translated at 69.2% (634 of 916 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
 2017-07-26 18:21:48 +00:00
Luke Barnard c4f049effe Merge pull request #1243 from matrix-org/t3chguy/hide-join-part-2 
T3chguy/hide join part (attempt) 2
 2017-07-26 17:15:43 +01:00
David Baker 9cb28ff33c Merge pull request #1248 from matrix-org/luke/fix-rte-auto-scroll 
Scroll to the bottom of editor if on last line
 2017-07-26 16:58:36 +01:00
Richard Lewis 9f52c13bea Grant permission to load app widget. 2017-07-26 16:47:58 +01:00
Michael Telatynski 2348c24369
revert the rm-always-moves-down loop as thats done Server side... 2017-07-26 14:33:48 +01:00
Michael Telatynski 3b8c408482
update comment to make explain behaviour better 2017-07-26 13:37:33 +01:00
Michael Telatynski 3eb87e2aa3
change lastShownEventIndex -> lastShownEvent since some places 
do not have the same i reference (namely MELS generation)
this way a member event at bottom of MELS (if is the last event
in the timeline will have last set appropriately)
 2017-07-26 12:17:05 +01:00
Michael Telatynski 762e6780d7
fix this hiding unbans as found by Luke's review 2017-07-26 11:51:41 +01:00
Michael Telatynski f42ae1662b
change wording of comment as per Luke's review 2017-07-26 11:46:59 +01:00
Richard Lewis 76f4f88fcd App tile permissions -- broken 2017-07-26 11:28:43 +01:00
Luke Barnard fc00eaf546 Merge branch 'develop' into luke/store-history-as-raw-content 2017-07-25 17:19:35 +01:00
Luke Barnard 1ef2a2bcf9 Merge pull request #1250 from matrix-org/dbkr/fix_truncatedlist_i18n 
Fix i18n on truncatedlist & friends to be sane
 2017-07-25 16:17:44 +01:00
Luke Barnard 2138b4a705 Merge pull request #1249 from uhoreg/imgfix1 
allow width, height, alt, title attributes in img
 2017-07-25 16:09:01 +01:00
David Baker fa7a9818c6 Fix i19n on truncatedlist & friends to be sane 
Use the proper counterpart tool for plurals rather than if > 1.
Fix up all the translation files respectively.
 2017-07-25 15:59:06 +01:00
Hubert Chathi df71502dbb allow width, height, alt, title attributes in img 
fixes vector-im/riot-web#4646

Signed-off-by: Hubert Chathi <hubert@uhoreg.ca>
 2017-07-25 10:43:40 -04:00
Luke Barnard 7e0fecbc8c Scroll to the bottom of editor if on last line 
Make the MessageComposerInput scroll to the bottom if we are on the last line of the contents.

fixes https://github.com/vector-im/riot-web/issues/4652
 2017-07-25 15:22:10 +01:00
Luke Barnard eccdceae33 Rename `props` to `entityProps` for clarity 2017-07-25 11:43:12 +01:00
Luke Barnard 143994e44f Use `data-offset-key` in RTE decorators 
This makes sure the selection state is correct when moving the cursor through an entity in the composer but only in rich text mode. https://github.com/vector-im/riot-web/issues/4666 still persists despite this, probably because the text content inserted during a completion in markdown mode has a different length to the text node within the entity.

fixes vector-im/riot-web#4654
 2017-07-25 11:25:33 +01:00
Luke Barnard b372e5d55d Merge pull request #1246 from matrix-org/luke/feature-async-pills 
Get user pill profile remote data and show unrecognised rooms as links
 2017-07-25 10:21:55 +01:00
Luke Barnard 76e281662b Merge pull request #1229 from matrix-org/dbkr/groupview_edit 
UI for editing groups
 2017-07-25 10:13:49 +01:00
Luke Barnard 11f3a1db72 Merge branch 'luke/feature-async-pills' of github.com:matrix-org/matrix-react-sdk into luke/feature-async-pills 2017-07-25 09:37:47 +01:00
Luke Barnard ac597996e0 Remove outdated comment 2017-07-25 09:37:18 +01:00
Luke Barnard 026582bcf7 Add unmounted guard 2017-07-25 09:22:08 +01:00
Luke Barnard 5efd5bf927 done -> then, style 2017-07-25 09:20:14 +01:00
Luke Barnard d13c4b510c Merge branch 'develop' into luke/feature-async-pills 2017-07-24 17:39:35 +01:00
Luke Barnard bcd1ab5cd4 Merge pull request #1245 from matrix-org/luke/feature-mentions-ambiguate 
Remove disambiguation from user mentions, add tooltip for mxid
 2017-07-24 17:36:42 +01:00
Luke Barnard 61c16569cb Get user pill profile remote data 
Instead of relying on the local avatar/displayname of a user, request the data from the server and update the pill if it shows up.

This required a slight refactor which means we're not doing everything in `render` now. Also I noticed unknown rooms weren't being rendered _at all_! So now you get something that looks like a normal link but with the room alias/ID in it.
 2017-07-24 17:18:29 +01:00
Luke Barnard 727b1ca545 Remove disambiguation from user mentions, add tooltip for mxid 
Also add a tooltip for room pills = room alias/ID

Requires: https://github.com/matrix-org/matrix-js-sdk/pull/513
 2017-07-24 15:08:22 +01:00
Luke Barnard dc09ad8db4 Re-add NL 2017-07-24 14:50:44 +01:00
Luke Barnard 6945fa54ea Reimplement so that only tab-completed mentions are stripped 
Instead of blindly stripping all MD mentions, only strip those that were tab-completed. We do this by adding the `isCompleted` flag to the Entity data.
 2017-07-24 14:41:13 +01:00
Luke Barnard 397201a74d Remove subjective comment 2017-07-24 09:41:46 +01:00
Glandos b15f3c08ea 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-07-22 14:12:05 +00:00
Michael Telatynski 8e66e64621
fix for loop - check happens before pre-inc so cause issues at end of TL 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 13:16:16 +01:00
Michael Telatynski c9b547368b
add algo to ensure that RM always moves forwards 
this is needed so that if a client which does not hide any events
sets and RM at bottom of timeline, then riot-web which hides events
sets the RM it'd set it at X-N where X is bottom and N is the amount of
hidden events at bottom of the timeline, this way now an RM will
fall through to the hidden events below a seen event.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 13:10:57 +01:00
Michael Telatynski b976649b5b
re-add i18n string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 12:52:19 +01:00
Michael Telatynski a4abd1baa7
fix comment and remove unused const 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 12:03:32 +01:00
Michael Telatynski ae973e1e99
unrevert some more... 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-22 11:37:21 +01:00
Lauris Mierkalns 3631870c96 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-07-22 03:05:04 +00:00
Michael Telatynski 7e355f7cda
unrevert most of the logic. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 23:18:18 +01:00
Michael Telatynski 1fa4fe0b9a
remove comments/commented code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 22:51:31 +01:00
Michael Telatynski 5808fce60e
fix logic ordering 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 22:45:19 +01:00
Michael Telatynski 17758cd1db
attempt to incorporate more code #2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 20:43:03 +01:00
Michael Telatynski e47e14ed19
attempt to incorporate more code #1 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 20:22:01 +01:00
Michael Telatynski 3859708114
re-add Unread shouldHideEvent code 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 19:51:13 +01:00
Michael Telatynski 8167c004a8
re-add core logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 19:38:01 +01:00
Michael Telatynski 928294eba3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/hide-join-part-2 2017-07-21 19:23:42 +01:00
Luke Barnard e315b30f6a Merge branch 'develop' into luke/fix-rte-pt-md-mentions 2017-07-21 18:06:31 +01:00
Luke Barnard eb0575d9c1 Merge pull request #1241 from matrix-org/luke/refactor-pills 
Factor out shared logic in two code-paths for pill rendering
 2017-07-21 17:54:20 +01:00
Luke Barnard feaafc7a1a Remove logging 2017-07-21 17:18:48 +01:00