imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5519 commits 222 branches 563 tags 470 MiB
Commit graph

1180 commits

Author SHA1 Message Date
David Baker
306ea58578 Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 15:45:05 +01:00
Luke Barnard
d5b49a11d7 Merge pull request #829 from matrix-org/luke/fix-people-section-disappearing 
Remove DM-guessing code
 2017-05-04 14:15:28 +01:00
David Baker
e1c99430cb Merge remote-tracking branch 'origin/develop' into dbkr/left_panel_for_newbies_2 2017-05-04 14:04:22 +01:00
David Baker
ce119a6364 Add buttons to room sub list headers 2017-05-04 13:55:52 +01:00
Luke Barnard
bfa3123f9b Combine data-scroll-token and -contained-scroll-tokens 
- Instead of using one attribute, use one that might just contain one token
 - Use the first token when tracking a child
 - Mandate that no commas can be in individual tokens
 2017-05-04 10:00:13 +01:00
Michael Telatynski
b6fd771b9a move implementation to MessageComposer to it applies to any future composers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-03 16:21:35 +01:00
Michael Telatynski
6685cbcb25 make MessageComposerInput (new and old) warn on unload 
new needs binding due to class this ref being softer
couldn't do this nicely in MessageComposer/Input as
isTyping wasn't propagated.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-29 06:26:59 +01:00
David Baker
083d5bf463 Other empty sections no longer need to be greyed 2017-04-28 11:20:29 +01:00
David Baker
f5f35e3294 Make the left panel more friendly to new users 
https://github.com/vector-im/riot-web/issues/3609
 2017-04-28 11:10:21 +01:00
Luke Barnard
88abe54ffe Give the SRH its prop back 2017-04-27 17:58:02 +01:00
Luke Barnard
0b06e979cb Add optional tintable SVG icon for SimpleRoomHeader 2017-04-27 17:57:13 +01:00
Luke Barnard
63224ff164 Add mx_EventTile_emote class 2017-04-26 18:00:25 +01:00
Michael Telatynski
6cbd04045d change the now working defaults 
to what they effectively were when defaultValue was broken
(hopefully tests now pass)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 22:17:25 +01:00
Michael Telatynski
9ae9aeea07 lets improve forwarding :D 
ditch double quotes
stop caring about rhs state
always call hide_right_panel, nop if already hidden
use new restore_right_panel to bring it back if it was visible pre-us

actually tell things that we sent a message or failed in doing so
now the UDE works :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:14:45 +01:00
Michael Telatynski
ee560a969a upon forwarding message to current room, explicitly remove clear from aux 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 20:17:29 +01:00
turt2live
e6fd380947 Change redact -> remove for clarity 
Addresses vector-im/riot-web#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:49:09 -06:00
Michael Telatynski
4285c395f5 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into forward_message 
Conflicts:
	src/components/structures/RoomView.js
 2017-04-24 18:36:33 +01:00
Luke Barnard
74e92d6c23 Remove DM-guessing code 2017-04-24 15:44:45 +01:00
Matthew Hodgson
1347d9fa65 fix scroll behaviour on macs with no gemini 2017-04-24 12:53:53 +01:00
Matthew Hodgson
6f461f0ebb add in scrollto button 2017-04-24 01:09:57 +01:00
Matthew Hodgson
a2be764681 display err.message to user if available in error msgs 2017-04-23 01:48:27 +01:00
Matthew Hodgson
db996f678c show better errors when slash commands fail 2017-04-23 01:32:51 +01:00
Matthew Hodgson
0e5006b041 typo 2017-04-22 17:28:28 +01:00
Michael Telatynski
33e841a786 move user settings outward and use built in read receipts disabling 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 15:40:29 +01:00
Matthew Hodgson
ba0bb677c8 Merge pull request #817 from turt2live/travis/rw-3626 
Change presence status labels to 'for' instead of 'ago'
 2017-04-22 01:45:21 +01:00
Matthew Hodgson
304136766d Merge pull request #816 from t3chguy/ability_to_disable_scalar 
Disable Scalar Integrations if urls passed to it are falsey
 2017-04-22 01:39:20 +01:00
Matthew Hodgson
872d0e0f50 Merge branch 'develop' into travis/hide-read-receipts 2017-04-22 01:36:38 +01:00
Matthew Hodgson
b36eb90a10 Merge pull request #819 from turt2live/travis/no-typing-notifs 
Add option to not send typing notifications
 2017-04-22 01:35:07 +01:00
Matthew Hodgson
1faecfd0f7 fix sticky headers on resize 2017-04-22 01:29:48 +01:00
Matthew Hodgson
ec6a1c4c75 recalculate roomlist when your invites change 2017-04-22 01:16:25 +01:00
turt2live
64e416e117 Add option to not send typing notifications 
Addresses vector-im/riot-web#3220

Fix applies to both the RTE and plain editor.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 14:50:26 -06:00
turt2live
e4c4adc517 Add option to hide other people's read receipts. 
Addresses vector-im/riot-web#2526

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 14:28:28 -06:00
turt2live
2d39b59556 Change presence status labels to be more clear. 
As per vector-im/riot-web#3626 the current labels are unclear. Changing the verbage should make it more clear.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 13:41:37 -06:00
Michael Telatynski
8e9f52e217 Disable Scalar Integrations if urls passed to it are falsey 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 19:46:19 +01:00
Michael Telatynski
589d41e3b9 DRY the code a little bit in anticipation of #813 
which sends a `focus_composer` onCancelClick()

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 18:51:49 +01:00
Michael Telatynski
64112da25c only re-show right panel if it was visible before we were mounted 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 14:13:01 +01:00
Michael Telatynski
b6ca16fc2f add RoomView state for message being forwarded 
add RoomView action handler for message forward
clear forwardingMessage onCancelClick RoomView
change var into const in render RoomView
load ForwardMessage from rooms.ForwardMessage
if there is a messageForwarding object in state show panel in aux

Create ForwardMessage class

Modify RoomHeader so that it shows the cancel button more greedily

reskindex

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 13:50:22 +01:00
Matthew Hodgson
b0288ebd89 fix stupid typos in RoomList's shouldComponentUpdate 2017-04-21 12:40:13 +01:00
Matthew Hodgson
35a16edccc oops, actually refresh roomlist when its state changes! 2017-04-20 15:47:59 +01:00
Matthew Hodgson
0d8d3c6710 HOW DID THIS EVER WORK? 2017-04-20 15:15:20 +01:00
Matthew Hodgson
238f59dc87 return the event from RoomTile's onClick to distinguish clicks from keypresses 2017-04-20 14:16:45 +01:00
Matthew Hodgson
e69ea68133 unbreak stack overflow which fires on tests due to mocked timers 2017-04-20 13:53:36 +01:00
Matthew Hodgson
5a3b4b6a60 various bug fixes: 
don't redraw RoomList when the selectedRoom changes
keep passing selectedRoom through to RoomTiles so they have correct initial state
handle onAccountData at the RoomList, not RoomTile level
Fix some typos
 2017-04-20 01:12:57 +01:00
Matthew Hodgson
9f99224a1f fix bugs from PR review 2017-04-19 17:59:06 +01:00
Matthew Hodgson
fb6252a16b fix invite highlights take 3 2017-04-19 00:16:17 +01:00
Matthew Hodgson
4a9c168682 fix invite highlights 2017-04-19 00:13:01 +01:00
Matthew Hodgson
abf2300c0d highlight invites correctly 2017-04-19 00:09:03 +01:00
Matthew Hodgson
093b9a0b52 kick the roomtile on RoomState.members 2017-04-18 23:29:28 +01:00
Matthew Hodgson
8389a67c75 we don't need RoomTile specific focus in the end 2017-04-18 22:54:30 +01:00
Matthew Hodgson
015a4480e2 oops, wire up Room.receipt again, and refresh roomtiles on Room.timeline 2017-04-18 22:36:54 +01:00