OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
6,136 Commits
218 Branches
565 Tags
476 MiB
Commit Graph

6136 Commits (938268967516e12698186b8740331790bbfa3161)

Author SHA1 Message Date
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 d7f4e7c8c0 Merge pull request #1247 from matrix-org/luke/fix-rte-offset-bug 
Use `data-offset-key` in RTE decorators
 2017-07-25 12:24:02 +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 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
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 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
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
Michael Telatynski f036fd1d0f
first attempt at stubbing tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-21 19:16:30 +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
Luke Barnard 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
David Baker f9cff50ef5 _loadGroupFromServer doesn't return a promise 2017-07-21 14:41:29 +01:00
David Baker d48924e768 Lint 2017-07-21 14:30:09 +01:00
David Baker be7228996a This should be null rather than false 2017-07-21 14:18:28 +01:00