nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Baker
3ff628254d CSS for group userlist 2017-07-25 15:56:40 +01:00
David Baker
c2034d5335 Add user list to groups 2017-07-25 15:56:16 +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
Weblate
c2e1b6c613 Merge remote-tracking branch 'origin/develop' into develop 2017-07-25 09:21:55 +00:00
David Baker
ec6efd2488 Merge pull request #4608 from vector-im/dbkr/groupview_edit 
CSS for group edit UI
 2017-07-25 10:21:51 +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
Weblate
1a09fc60f0 Merge remote-tracking branch 'origin/develop' into develop 2017-07-25 08:55:42 +00:00
Matthew Hodgson
bcedc206e1 seems folk prefer darker pills 2017-07-25 09:55:34 +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
Weblate
77582e0a17 Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 21:13:38 +00:00
Kevin Németh
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
Matthew Hodgson
dbeeacf11c tweak pill colours some more 2017-07-24 22:13:29 +01:00
Weblate
d0344fef8b Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 20:22:49 +00:00
Richard van der Hoff
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
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
Richard van der Hoff
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
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
Weblate
8445eb0959 Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 13:49:52 +00:00
Lauris Mierkalns
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
Luke Barnard
e923847dac Make user mentions more pill-like 
By adding subtle background-colors
 2017-07-24 14:49:43 +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
Hubert Chathi
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
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