mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 05:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
10122 commits 208 branches 547 tags 609 MiB
Commit graph

3354 commits

Author SHA1 Message Date
Michael Telatynski
1346f47a12
allow filtering Group Invite Tiles with the same search filter 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 14:18:39 +01:00
Michael Telatynski
4e216714b5
remove commented code and move modal.close into a finally block 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-06-14 13:53:02 +01:00
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
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
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
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
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
fd8d501732 Update cookie bar wording 2018-05-24 16:58:14 +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
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
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
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
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
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