bcedc206e1
seems folk prefer darker pills
2017-07-25 09:55:34 +01:00
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
ac597996e0
Remove outdated comment
2017-07-25 09:37:18 +01:00
026582bcf7
Add unmounted guard
2017-07-25 09:22:08 +01:00
5efd5bf927
done -> then, style
2017-07-25 09:20:14 +01:00
77582e0a17
Merge remote-tracking branch 'origin/develop' into develop
2017-07-24 21:13:38 +00:00
be0cb667c8
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (207 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
2017-07-24 21:13:37 +00:00
dbeeacf11c
tweak pill colours some more
2017-07-24 22:13:29 +01:00
d0344fef8b
Merge remote-tracking branch 'origin/develop' into develop
2017-07-24 20:22:49 +00:00
7dbb4bba09
Merge pull request #4671 from vector-im/rav/promise_fail_fails
...
Fix a couple of minor errors in the room list
2017-07-24 21:22:45 +01:00
d13c4b510c
Merge branch 'develop' into luke/feature-async-pills
2017-07-24 17:39:35 +01:00
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
b6ba7f0116
Merge pull request #1242 from matrix-org/luke/fix-rte-pt-md-mentions
...
Strip MD user mentions from the `body` of sent messages
2017-07-24 17:25:59 +01:00
bc2f639aae
Fix a couple of minor errors in the room list
...
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
2017-07-24 17:19:46 +01:00
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
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
dc09ad8db4
Re-add NL
2017-07-24 14:50:44 +01:00
8445eb0959
Merge remote-tracking branch 'origin/develop' into develop
2017-07-24 13:49:52 +00:00
de04cba41f
Translated using Weblate (Latvian)
...
Currently translated at 100.0% (207 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lv/
2017-07-24 13:49:52 +00:00
e923847dac
Make user mentions more pill-like
...
By adding subtle background-colors
2017-07-24 14:49:43 +01:00
f7145941fd
Add tests to assert correct MD mention link stripping
...
Tab-completed @Mentions should only be sent as display names in the `body` of the event. The HTML should be unaffected, and always sent as an anchor tag.
2017-07-24 14:42:20 +01:00
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
397201a74d
Remove subjective comment
2017-07-24 09:41:46 +01:00
efa156b53a
tweak compact theme
...
- add some comments
- decrease size of info events and MELS (#4363.2)
- reduce spacing between paragraphs, lists, etc (#4363.3 & 4)
Signed-off-by: Hubert Chathi <hubert@uhoreg.ca >
2017-07-23 23:02:29 -04:00
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
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
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
b976649b5b
re-add i18n string
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-22 12:52:19 +01:00
a4abd1baa7
fix comment and remove unused const
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-22 12:03:32 +01:00
ae973e1e99
unrevert some more...
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-22 11:37:21 +01:00
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
7e355f7cda
unrevert most of the logic.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 23:18:18 +01:00
1fa4fe0b9a
remove comments/commented code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 22:51:31 +01:00
5808fce60e
fix logic ordering
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 22:45:19 +01:00
17758cd1db
attempt to incorporate more code #2
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 20:43:03 +01:00
e47e14ed19
attempt to incorporate more code #1
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 20:22:01 +01:00
3859708114
re-add Unread shouldHideEvent code
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 19:51:13 +01:00
8167c004a8
re-add core logic
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 19:38:01 +01:00
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
f036fd1d0f
first attempt at stubbing tests
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-07-21 19:16:30 +01:00
e315b30f6a
Merge branch 'develop' into luke/fix-rte-pt-md-mentions
2017-07-21 18:06:31 +01:00
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
feaafc7a1a
Remove logging
2017-07-21 17:18:48 +01:00
e8495f637f
Strip MD mentions from the body of sent messages
...
Because previously we just sent the display name and MD links are not very readable.
2017-07-21 16:38:31 +01:00
f9cff50ef5
_loadGroupFromServer doesn't return a promise
2017-07-21 14:41:29 +01:00
d48924e768
Lint
2017-07-21 14:30:09 +01:00
be7228996a
This should be null rather than false
2017-07-21 14:18:28 +01:00
d2f02e8e99
Swap classes instead of using 0 height elements
2017-07-21 14:14:27 +01:00
4eda2ab083
Swap classes instead of using 0 height elements
2017-07-21 14:13:57 +01:00
03aba64b97
Merge branch 'luke/refactor-pills' of github.com:matrix-org/matrix-react-sdk into luke/refactor-pills
...
Conflicts:
src/components/views/elements/Pill.js
2017-07-21 14:08:36 +01:00
Matthew Hodgson
Luke Barnard
Weblate
Kevin Németh
Richard van der Hoff
Luke Barnard
Richard van der Hoff
Lauris Mierkalns
Hubert Chathi
Glandos
Michael Telatynski
David Baker