Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-12-02 17:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,326 Commits 220 Branches 561 Tags 458 MiB
1b2e33976d
Commit Graph

6326 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Barnard
ecef9cf22f Use plaintext when loading a markdown history item into RT mode 2017-08-14 16:48:29 +01:00
Luke Barnard
6b1b643d41 Merge branch 'develop' into luke/store-history-as-raw-content 2017-08-14 16:42:22 +01:00
Luke Barnard
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
Luke Barnard
5eff2a3df2 Merge branch 'develop' into luke/fix-user-pill-onclick 2017-08-14 16:32:01 +01:00
Luke Barnard
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
Luke Barnard
1ce433b5f6 Merge pull request #1296 from matrix-org/luke/fix-rm-stuck-on-1-event-mels 
Display RM when it = a standalone member event
 2017-08-14 15:51:22 +01:00
Luke Barnard
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
Luke Barnard
ecd1735a11 Merge pull request #1293 from matrix-org/luke/disable-matrix-apps 
Disable widgets prior to release
 2017-08-14 15:17:53 +01:00
Luke Barnard
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
Luke Barnard
867e83edff Fix log to include some useful info 2017-08-14 14:47:26 +01:00
Luke Barnard
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
Luke Barnard
2844b574d5 Re-add useful comment 2017-08-14 14:41:03 +01:00
Luke Barnard
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
Luke Barnard
d9e8292a5e Revert "At /user, view member of current room" 2017-08-14 14:06:54 +01:00
Luke Barnard
3d5d7fa9c8 Lint 2017-08-14 13:59:12 +01:00
Luke Barnard
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
Luke Barnard
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
Andrey
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
IMIN
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
IMIN
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
MTRNord
4a1ba01f44 fix deprecation warning 2017-08-13 00:56:37 +00:00
kaiyou
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
ErCiccione Calcifer
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
David Baker
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
Szimszon
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
Richard Lewis
454ec40b00 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes 2017-08-11 10:35:20 +01:00
Richard Lewis
0323151bee Show a dialog if the maximum number of widgets allowed has been reached. 2017-08-10 23:53:43 +01:00
Krombel
975aa0f08a Added translation using Weblate (Indonesian) 2017-08-10 22:24:12 +00:00
Luke Barnard
12966d06cd Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:35:46 +01:00
Luke Barnard
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
Luke Barnard
89254e77f4 When no member, use null roomId 2017-08-10 15:23:14 +01:00
Michael Telatynski
5450d6b9ca
remove redundant check and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:22:53 +01:00
Michael Telatynski
41843f021d
don't track two more potential risks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:21:01 +01:00
Michael Telatynski
56ea528f43
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:17:52 +01:00
Michael Telatynski
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
Michael Telatynski
a6064c53d3
export shouldHideEvent fn named 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 14:00:26 +01:00
Michael Telatynski
ab3abd2f7f
fix string casing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:59:55 +01:00
Michael Telatynski
1603360c13
s/Membership/Member/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:58:19 +01:00
Michael Telatynski
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
Michael Telatynski
67f9c3774d
make string more human-friendly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:51:47 +01:00
Michael Telatynski
24599ace32
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:49:11 +01:00
Marcel
60c1ba4f4d Add LanguageDropdown to LoginPage (#1284) 2017-08-10 13:29:10 +01:00
Luke Barnard
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
Luke Barnard
b2fd4be166 Merge pull request #1289 from matrix-org/luke/fix-quote-innerText 
Quote by taking the innerText of eventTiles
 2017-08-10 10:35:49 +01:00
Luke Barnard
678c472b75 Quote by taking the innerText of eventTiles 
because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`.

TODO: Do quoting proper - using `in_response_to`.
 2017-08-10 10:14:14 +01:00
Luke Barnard
390e77ee22 Merge pull request #1288 from matrix-org/luke/track-richtext-mode 
Track whether the user has richtext mode enabled
 2017-08-10 09:31:09 +01:00
Luke Barnard
fc6977e68d Track RT mode once we've retrieved the setting from account data 2017-08-09 19:00:38 +01:00
Luke Barnard
e121440d05 Track whether the user has richtext mode enabled 2017-08-09 18:39:06 +01:00
David Baker
f4092cc9b4 Merge pull request #1287 from matrix-org/luke/fix-hide-autocomp-on-selection-change 
Hide autocomplete when RTE selection state (cursor) changes
 2017-08-09 18:21:25 +01:00
Luke Barnard
794bf820cc Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog 
Fix Set MXID Dialog woes
 2017-08-09 17:53:50 +01:00