mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 19:41:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
10231 commits 219 branches 562 tags 474 MiB
Commit graph

5116 commits

Author SHA1 Message Date
Michael Telatynski
9dd2184b33
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:29:05 +01:00
Michael Telatynski
c820836bcc
make RoomTooltip generic and add ContextMenu&Tooltip to GroupInviteTile 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 15:23:11 +01:00
David Baker
e858cf3bcb Merge branch 'master' into develop 2018-06-12 14:26:29 +01:00
David Baker
13d52065f5 Merge branch 'release-v0.12.7' 2018-06-12 14:23:48 +01:00
Michael Telatynski
18546dbe06
QR Code align [m] logo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:33:38 +01:00
Michael Telatynski
d8a1feb501
fix Modal typo and refactor BaseDialog to fix " undefined" className 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:02 +01:00
Michael Telatynski
7f1ce52dd3
link to ShareDialog from GroupView, RoomView, UserSettings & MemberInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski
64bcf6fd7e
allow ContextualMenu to run without background, for tooltips & fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:22:01 +01:00
Michael Telatynski
074051297a
add a ShareDialog for sharing users,groups and rooms 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-12 11:21:55 +01:00
Luke Barnard
2120858e5f
Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-06-11 14:24:40 +01:00
David Baker
50e08c7560
Merge pull request #1947 from matrix-org/t3chguy/invite_checkIfAlone 
re-run checkIfAlone if a member change occurred in the active room
 2018-06-08 17:36:42 +01:00
David Baker
06321deea9
Merge pull request #1935 from turt2live/travis/persist-pinned-open 
Persist pinned message open-ness between room switches
 2018-06-08 16:48:40 +01:00
David Baker
8dce276e5b
Merge pull request #1933 from turt2live/travis/pin-cosmetics 
Pinned message cosmetic improvements
 2018-06-08 16:46:33 +01:00
Michael Telatynski
0b9b03c9ee
re-run checkIfAlone if a member change occurred in the active room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-07 22:01:27 +01:00
Travis Ralston
83f0459a7f
Merge branch 'develop' into travis/persist-pinned-open 2018-06-06 09:17:08 -06:00
Michael Telatynski
ffec32c7d9
Merge pull request #1943 from akihikodaki/react 
Import react as React in src/components/views/elements/DNDTagTile.js
 2018-06-06 10:08:52 +01:00
Akihiko Odaki
bf0d03bce3 Import react as React in src/components/views/elements/DNDTagTile.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-06-06 17:59:50 +09:00
David Baker
bea99e07b3
Merge pull request #1940 from matrix-org/luke/exit_settings 
Fix click on faded left/right/middle panel -> close settings
 2018-06-05 10:36:58 +01:00
Luke Barnard
6a317569d7 Add null-guard to support browsers that don't support performance 
Like Tor.

Fixes https://github.com/vector-im/riot-web/issues/6781
 2018-06-04 09:38:21 +01:00
Luke Barnard
d30bc2dc6b
Merge pull request #1937 from turt2live/travis/no-guest 
Replace "Login as guest" with "Try the app first" on login page
 2018-06-01 11:58:26 +01:00
Luke Barnard
404c071f2a Remove lie from docs 2018-05-29 13:19:56 +01:00
Luke Barnard
da9fe9917b Fix click on faded left/right/middle panel -> close settings 
- implement generic dispatch to close user/room/group settings
 - use dispatch to allow clicks on disabled left/right/middle panel to
   close settings

A much more maintainable approach would be to use dedicate routing
instead of doing different things depending on what page of the app is
currently being viewed. At the very least we could make the concept of a
settings page generic.
 2018-05-29 13:16:39 +01:00
Michael Telatynski
05357b9f8c
improve comment 2018-05-29 12:07:56 +01:00
Travis Ralston
254e8c358a Remove unused imports 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-28 11:38:09 -06:00
Travis Ralston
98613748b6 Move Scalar Widget URL check to WidgetUtils 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 11:12:55 -06:00
Travis Ralston
23162c8625 Support third party integration managers in AppPermission 
Alternative integration managers may wish to also wrap widgets to supply a better user experience. With the previous code, it was not possible to use the integrations_widgets_urls configuration option (described in AppTile). AppPermission should use the same logic to determine if a widget is being wrapped, so it can display a helpful URL for the user (instead of the wrapper URL).

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 10:56:50 -06:00
Michael Telatynski
96ec3ab78a
Merge pull request #1934 from turt2live/travis/realtime-pins 
Update pinned messages in real time
 2018-05-27 17:50:23 +01:00
Travis Ralston
929da30df8 onEvent -> onStateEvent 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-27 10:28:47 -06:00
Travis Ralston
ec53b5f5ab Expose at-room power level setting 
Fixes https://github.com/vector-im/riot-web/issues/5835

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 21:22:42 -06:00
Travis Ralston
e690bcb6ef Replace "Login as guest" with "Try the app first" on login page 
Fixes vector-im/riot-web#5875

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 20:54:19 -06:00
Travis Ralston
752605429c Persist pinned message open-ness between room switches 
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:58:12 -06:00
Travis Ralston
53396ff38d Show timestamp of pinned messages on hover 
Addresses part of https://github.com/vector-im/riot-web/issues/5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:46:11 -06:00
Travis Ralston
085271a864 Update pinned messages in real time 
Fixes https://github.com/vector-im/riot-web/issues/5358

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 19:18:35 -06:00
Travis Ralston
033c41a2a8 Align pinned message contents and reduce image size 
Fixes https://github.com/vector-im/riot-web/issues/5421

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:40:48 -06:00
Travis Ralston
62f4cfe734 Don't affect avatars in pinned message contents 
This uses more direct classes to avoid affecting pills. Fixes https://github.com/vector-im/riot-web/issues/5438

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-26 18:21:24 -06:00
Michael Telatynski
6636fa32f6
Allow selecting audio output for WebRTC Audio/Video calls 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 17:22:23 +01:00
Michael Telatynski
5147246c17
kill stream when using gUM for permission to device labels to kill camera 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-26 15:41:25 +01:00
Richard Lewis
b2c26e6984
Merge pull request #1920 from matrix-org/rxl881/refreshWidget 
Add a "reload widget" button.
 2018-05-24 18:11:22 +01:00
Richard Lewis
6288e9bc08
Merge pull request #1923 from matrix-org/rxl881/devTools 
Make devTools styling more consistent and easier to edit event data.
 2018-05-24 18:10:59 +01:00
Luke Barnard
033b110f5f
Merge pull request #1929 from matrix-org/luke/cookie-bar-update 
Cookie bar update
 2018-05-24 17:19:05 +01:00
Luke Barnard
023c4e2a43
Merge pull request #1928 from matrix-org/dbkr/leave_server_notices_room_message 
Message for leaving server notices room
 2018-05-24 17:06:41 +01:00
David Baker
168b956b3c homeserver 2018-05-24 17:01:00 +01:00
Luke Barnard
fd8d501732 Update cookie bar wording 2018-05-24 16:58:14 +01:00
David Baker
9d2f223773 Message for leaving server notices room 2018-05-24 16:54:48 +01:00
Luke Barnard
24aeda2e05 Fix bug where usage data link not visible when no cookie policy url 2018-05-24 16:52:04 +01:00
Richard Lewis
9753ee8d82 Better check of jitsi widget message origin. 2018-05-24 16:14:18 +01:00
Richard Lewis
a13d58f6c2 More thorough check of IM URL validity. 2018-05-24 14:58:59 +01:00
Luke Barnard
aae89efa01 Add usage data link to cookie bar 
this opens the analytics modal
 2018-05-24 12:47:27 +01:00
Luke Barnard
03c97140a6
Merge pull request #1925 from matrix-org/luke/deactivate-account-reword 
Change wording and appearance of Deactivate Account dialog
 2018-05-24 12:02:10 +01:00
Luke Barnard
dca1217a45 Change wording and appearance of Deactivate Account dialog 2018-05-24 11:50:45 +01:00
Matthew Hodgson
3bee23e733
Merge pull request #1924 from matrix-org/matthew/fix-memberlist-ordering 
fix membership list ordering when presence is disabled.
 2018-05-24 11:29:29 +01:00
Matthew Hodgson
cc79384839 fix https://github.com/vector-im/riot-web/issues/6643 2018-05-24 01:57:22 +01:00
Richard Lewis
2a9859c7b6 Styling for consistency. 2018-05-23 17:40:15 +01:00
Richard Lewis
9f9cde12ce Make devTools styling more consistent and easier to edit event data. 2018-05-23 17:18:33 +01:00
Luke Barnard
b124989968 Implement erasure option upon deactivation 2018-05-23 16:33:32 +01:00
Luke Barnard
ba3dd0c87a Refactor onOk to async function 2018-05-23 13:35:42 +01:00
Luke Barnard
ef686a966d Add cookie warning to widget warning (AppPermission) 2018-05-23 10:46:32 +01:00
Luke Barnard
c1a42637e7
Merge pull request #1919 from matrix-org/luke/consent-dialog 
Terms and Conditions dialog
 2018-05-23 10:17:14 +01:00
Richard Lewis
6df3371c6c Add a "reload widget" button. 2018-05-22 19:14:54 +01:00
Luke Barnard
658e88c30f Implement consent/terms and conditions dialog for /_matrix/consent flow 2018-05-22 18:03:56 +01:00
Luke Barnard
538979a4ee Fix MVideoBody spinner 2018-05-22 17:13:45 +01:00
Luke Barnard
c249bee9b5 Grammar 2018-05-22 16:09:54 +01:00
Luke Barnard
c47c7b8d98
Merge pull request #1902 from matrix-org/t3chguy/room_settings_muted_users 
improve privileged section users in room settings
 2018-05-22 16:07:01 +01:00
Luke Barnard
31dcd85c08 Add customisable cancel button to QuestionDialog 2018-05-22 15:45:58 +01:00
Luke Barnard
fb5dd4a410 Remove spurious fixupHeight 2018-05-22 10:46:10 +01:00
Luke Barnard
e4f8c09c32 Only include placeholder in DOM when necessary 2018-05-22 10:43:16 +01:00
David Baker
ae10491f95 Space between sentences in 'leave room' warning 2018-05-22 09:28:41 +01:00
Luke Barnard
e9ae3de00f Merge branch 'develop' into luke/kill-mimage-fixupheight 2018-05-21 17:15:54 +01:00
Luke Barnard
836dc8b0ef Factor out all shared logic between MStickerBody and MImageBody 
The benefits of this:
 - One code path for determining spinner/placeholder and it's position
   for loading images/stickers. This includes spinner used in e2e
   decryption of images.
 - Very small definition for MStickerBody, only overriding the minimal
   differences is has from MImageBody.

The disadvantages:
 - Slightly more complicated MImageBody, but hopefully not less
   readable.
 2018-05-21 16:59:13 +01:00
Luke Barnard
015093b371 Move inline style to stylesheet 2018-05-18 11:34:41 +01:00
David Baker
5952de772b
Merge pull request #1906 from matrix-org/luke/opt-in-analytics 
Implement opt-in analytics with cookie bar
 2018-05-18 10:44:53 +01:00
Luke Barnard
7e7e2a7473 Add more comments to explain thumbnail sizing 2018-05-18 10:27:22 +01:00
Luke Barnard
d11442de04 Adjust comment 2018-05-18 10:15:59 +01:00
Luke Barnard
b41b9aa4fa Remove fixupHeight call from MStickerBody 2018-05-18 09:58:52 +01:00
Luke Barnard
bbcf2fea53 Fix e2e image thumbnail spinner containing box correct size 2018-05-18 09:47:49 +01:00
Luke Barnard
b28ed6075b Implement slightly hacky CSS soln. to thumbnail sizing 
As the slightly nicer alternative to fixupHeight being applied once
we actually have a timelineWidth.

The niceness comes from not needing timelineWidth, which means we can
implement at render time with CSS. (Despite still calculating aspect
ratios when we render.)
 2018-05-17 18:15:34 +01:00
David Baker
a7006307bf Call afterComponentDidMount() after componentDidMount 2018-05-17 16:50:16 +01:00
David Baker
e53497421e Fix image size jumping regression 
Fixes https://github.com/vector-im/riot-web/issues/6654
 2018-05-17 16:47:17 +01:00
Luke Barnard
0bda607bb2 Only show cookie bar if analytics configured 2018-05-16 15:53:43 +01:00
Luke Barnard
d15051a635 Add policyLink configuration to piwik 
Also:
 - Make CookieBar ES6 class
 - Alter phrasing on CookieBar
 - Conditionaly display longer "...(See our ++cookie and privacy
   policies++)." if policy link is configured.
 2018-05-16 15:49:23 +01:00
Luke Barnard
4e6594d64b Allow arbitrary hrefs for cookie/privacy links 2018-05-16 15:20:38 +01:00
Luke Barnard
d01e738839 Fix UserSettings for new analyticsOptIn 2018-05-16 15:20:38 +01:00
Luke Barnard
ac1cd384e7 Implement opt-in analytics with cookie bar 2018-05-16 15:20:38 +01:00
Luke Barnard
e596924074 Merge branch 'develop' into release-v0.12.4 2018-05-14 17:43:40 +01:00
Luke Barnard
ff0254d346 Fix ContextualMenu imports for TagTile and code block copy button 2018-05-14 17:36:57 +01:00
David Baker
7588d4380c Merge branch 'release-v0.12.4' into develop 2018-05-14 17:27:01 +01:00
Luke Barnard
e0236c3d3e Fix issue with sticker picker rendering off-screen 
when the RightPanel is collapsed on a small monitor
and the sticker picker is opened.
 2018-05-14 17:12:45 +01:00
Luke Barnard
3761cd4054 When panels are shown/hidden, hide sticker picker 2018-05-14 16:35:12 +01:00
Michael Telatynski
a88cbef331
tidy and switch to lexicographic sorting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-14 16:22:28 +01:00
Michael Telatynski
5ef0eece9a
refactor and sort 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-14 16:09:22 +01:00
Luke Barnard
49a3770e92 Merge branch 'release-v0.12.4' into develop 2018-05-14 14:31:18 +01:00
Richard Lewis
dddd1c43cc Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 14:23:26 +01:00
Richard Lewis
986fb3237d Remove redundant logging (currently shown on every render when no stickerpicker is present). 2018-05-14 13:56:39 +01:00
David Baker
b6e317647a Fix stickers briefly being 2x the size 
fixupHeight was the only thing actually fixing the size of the
sticker image to be the size we want it rather than the pixel size
of the image, and this was only getting run after the image loaded,
causing a flash of 2x image.
 2018-05-14 13:41:41 +01:00
Luke Barnard
cf8077e605 Set loading: false when iFrame finishes loading 2018-05-14 11:42:38 +01:00
Luke Barnard
6345e474f5 Remove unused conditional 2018-05-14 11:38:17 +01:00
Luke Barnard
98c06315cf Update widget state when account data changes 2018-05-14 11:14:49 +01:00
Travis Ralston
9e11720191 Add setting to enable widget screenshots (if widgets declare support) 
Fixes the remainder of https://github.com/vector-im/riot-web/issues/6708

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2018-05-12 14:30:59 -06:00
Matthew Hodgson
f8fd90c559
Merge pull request #1889 from matrix-org/t3chguy/replies-html-tag 
T3chguy/replies html tag
 2018-05-12 20:22:54 +01:00
Michael Telatynski
dbbcabfed8
switch from asymmetrical fallback form to a cleaner one mx-reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-05-12 15:58:25 +01:00