Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,117 Commits 3 Branches 492 Tags 100 MiB
f36c1ca207
Commit Graph

69 Commits

Author SHA1 Message Date
Michael Telatynski
f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +01:00
Michael Telatynski
274536bf13 change dispatcher forward_event signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:11:33 +01:00
Kegan Dougal
162f3872e5 Translate src/components/context_menus|dialogs 2017-05-31 15:40:49 +01:00
Michael Telatynski
6a57742343 managed to eat the eventStatus check, can't redact a local-echo etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 14:19:33 +01:00
Michael Telatynski
17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 23:49:56 +01:00
Michael Telatynski
d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Matthew Hodgson
da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Matthew Hodgson
2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +01:00
David Baker
ee85eb961a Bulk change counterpart imports 
to use react-sdk wrapper function, rather than using counterpart
directly.
 2017-05-25 11:39:56 +01:00
David Baker
6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Michael Telatynski
09f987559b rename action, now forwarding any event is possible, limited by where 
button is shown, i.e easy to modify

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:30:36 +01:00
Michael Telatynski
7777be89ee only for finalised events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-18 23:53:37 +01:00
Michael Telatynski
58ada2c27d move mxEvent.status check to js-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:14:06 +01:00
Michael Telatynski
db78534b45 remove no longer required parseIntWithDefault 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:10:00 +01:00
Michael Telatynski
d55f4f9e6a use new RoomState method from matrix-org/matrix-js-sdk/pull/435 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:08:00 +01:00
Michael Telatynski
aff1e14efc first go at show redact only if we can redact 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 13:15:14 +01:00
Michael Telatynski
0a1ebc2487 Don't show for anything that doesn't have a msgtype and body 
otherwise the server will just reject it anyway

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:43:02 +01:00
turt2live
9124c1475a Change redact -> remove to improve clarity 
Addresses #2814

Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-24 12:48:32 -06:00
Michael Telatynski
2eb715002f Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message 
Conflicts:
	.gitignore
 2017-04-24 18:38:52 +01:00
Michael Telatynski
92b52a61e7 don't show forward option for things we cannot decrypt 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 18:33:25 +01:00
Matthew Hodgson
40eceaf9bc show err.message in errors if present 2017-04-23 02:22:31 +01:00
Michael Telatynski
20abb2c2df Add Forward Message button to m.room.message events 
Conform this file to eslint

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 13:46:23 +01:00
Luke Barnard
8b50ed8006 Merge pull request #3458 from vector-im/luke/fix-people-section2 
Fix people section again
 2017-03-27 15:52:15 +02:00
Luke Barnard
abc5b2d5f4 UI delay in UI 2017-03-27 09:44:33 +01:00
Keyvan Fatehi
a9ed2e20cb Confirm redactions with a dialog 
Closes #277
Closes #1805

Signed-off-by: Keyvan Fatehi <keyvanfatehi@gmail.com>
 2017-03-18 18:58:24 -07:00
Luke Barnard
be02ac3bc6 Fix people section again 
- Alter CSS due to removed mx_RoomDropTarget_avatar. The avatar was removed because it didn't particularly add anything and we needed space for "Drop here to tag as direct chat", which is quite long.
 - Use guessAndSetDMRoom as a convenience method for guessing the DM member and setting the state.
 - Do evil hacks to make DNDRoomTile do dragging of RoomTiles to and from the People section. Dragging a DM to and from Rooms/Favourites/Low Priority now works as one would expect. This is still not ideal however because edge cases exist where you have more than one tag set and then you drag a DM from "Favourites" to "Rooms" and the tile ends up in "People". This would require setting multiple tags, and breaks the 1-1 mapping between tags and sections even further. Ultimately the UI needs a rework.
 2017-03-17 12:14:44 +00:00
Luke Barnard
49be954d31 Better CSS for redactions 
See https://github.com/vector-im/riot-web/issues/3390

Also: The "Redact" option in the MessageContextMenu no longer appears for redacted events.
 2017-03-16 17:03:16 +00:00
Luke Barnard
f8298b2482 Fix the people section 
This does two things:
 - Fixes an incorrect import that was causing Direct Chat toggle to not be editable https://github.com/vector-im/riot-web/issues/3355
 - Use props.list in RoomSubList when calculating whether to show IncomingCallDialog. Fixes https://github.com/vector-im/riot-web/issues/2956
 2017-03-16 11:36:57 +00:00
Luke Barnard
32b9ee7f6f Copyright 2017-03-14 14:07:10 +00:00
Luke Barnard
3dc45886f7 Merge the two RoomTile context menus into one 2017-03-09 17:05:51 +00:00
David Baker
03dd25624f Allow forgetting rooms you're banned from 
From the room tag context menu.

Also fix the room tag context menu, which was missing sdk and
modal imports. Switch over the import while we're at it.
 2017-02-17 15:52:07 +00:00
Matthew Hodgson
ef519231d6 fix mute button colors 2017-01-20 21:16:58 +00:00
Richard van der Hoff
7577d2eb05 s/var/const/ 2016-11-17 10:51:09 +00:00
Richard van der Hoff
81d70a921d Add a 'View decrypted source' button 2016-11-16 23:10:51 +00:00
Will Hunt
15c730a22a Add rel="noopener" to context menu links. 2016-11-08 17:08:50 +00:00
Will Hunt
cf33ed58c1 Add menu option for external_url if present 2016-11-08 16:57:56 +00:00
Aviral Dasgupta
42993a78ed Only show quote option if RTE is enabled 2016-10-11 19:07:15 +05:30
Matthew Hodgson
82e257b4ea make DM naming consistent 2016-09-15 13:23:17 +01:00
David Baker
9e771ddd07 Merge pull request #2111 from vector-im/dbkr/toggle_dm_room 
Support toggling DM status of rooms
 2016-09-08 14:11:30 +01:00
David Baker
74aef1fdad Comment delay 2016-09-08 13:58:53 +01:00
David Baker
a1f8116e3b Support toggling DM status of rooms 
on context menu
 2016-09-07 17:47:47 +01:00
Aviral Dasgupta
d6a324ede7 Formatting toggle, markdown indicator, quoting 2016-09-05 17:39:32 +05:30
Matthew Hodgson
9b8e127e23 switch to using matrix.to for permalinks 2016-08-28 02:11:57 +01:00
Matthew Hodgson
ee1fae8ced fix RoomTagContextMenu so it works on historical rooms 2016-08-27 23:58:35 +01:00
David Baker
0bb3eaaf67 Use constants 2016-08-18 13:46:47 +01:00
David Baker
e48d68a449 PR feedback 2016-08-18 13:11:57 +01:00
David Baker
6b0aeefc66 RoomNotifs.js moved to react-sdk 
Since it's now used in RoomTile. Remove the vector prefix since it's no longer really a 'vector' thing
 2016-08-17 18:29:38 +01:00
David Baker
cd0ed879e3 Make the slider work 
Still WIP though: need to make vector work with the 'contains display name' rule being an override
 2016-08-16 15:54:28 +01:00
David Baker
a17df609f3 Read all 4 different notif states 
Can't yet set loud / mute
 2016-08-12 15:19:34 +01:00
wmwragg
9798e14733 Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes 2016-08-10 16:35:22 +01:00