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

2637 commits

Author SHA1 Message Date
Luke Barnard
71a119376c Guard against no children 2017-04-25 17:05:54 +01:00
Luke Barnard
1e9a2e80e9 Remove empty line 2017-04-25 11:57:03 +01:00
Luke Barnard
0d4ab07250 Fix not autoSelecting first item in dropdown 
Fixes https://github.com/vector-im/riot-web/issues/3686
 2017-04-25 11:53:14 +01:00
Luke Barnard
aac0238882 Remove redundant API for getting country prefix 2017-04-25 11:25:14 +01:00
Luke Barnard
336462366e Improve country dropdown UX and expose +prefix 
A prefix is now exposed through a change to the API for onOptionChange. This now returns the entire country object which includes iso2, prefix etc.

This also shows the prefix in the Registration and Login screens as a prefix to the phone number field.
 2017-04-25 11:21:47 +01:00
Luke Barnard
5c83d4d2ed Merge pull request #832 from t3chguy/ude_break_out_room 
show the room name in the UDE Dialog
 2017-04-25 10:04:23 +01:00
Michael Telatynski
e64b647799 show the room name in the UDE Dialog 
especially useful when it appears after you switch rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 09:26:21 +01:00
Matthew Hodgson
29e48d1801 Merge pull request #826 from matrix-org/matthew/mels-profile-changes 
summarise profile changes in MELS
 2017-04-25 00:18:19 +01:00
Matthew Hodgson
63dac026a8 remove spammy log 2017-04-25 00:17:46 +01:00
Michael Telatynski
3997974f0f remove debug console log (ignore its content pls) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:16:15 +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
bfba25f3da we don't care about rhs state anymore as we can just restore it sanely 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:10:14 +01:00
Michael Telatynski
4cf9e0c1ae Create a way to restore last state of the rhs panel. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:00:59 +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
Michael Telatynski
fbca0e0d0d correct cancel appearing when it shouldn't 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 20:03:07 +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
Richard van der Hoff
96e733b487 Merge pull request #825 from matrix-org/matthew/missing-keyboard-modifiers 
limit our keyboard shortcut modifiers correctly
 2017-04-23 12:02:29 +01:00
Matthew Hodgson
24f2aed45f summarise profile changes in MELS 
fixes https://github.com/vector-im/riot-web/issues/3463
 2017-04-23 04:05:50 +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
7854cac61d hook up keyb shortcuts for roomdir 2017-04-23 01:00:44 +01:00
Matthew Hodgson
fa033e6116 limit our keyboard shortcut modifiers correctly 
fixes https://github.com/vector-im/riot-web/issues/3614
 2017-04-23 00:49:14 +01:00
Matthew Hodgson
34c1a8f3cf make autofocus explicit on errordialog as it autoFocus attr seems unreliable 2017-04-22 17:28:48 +01:00
Matthew Hodgson
0e5006b041 typo 2017-04-22 17:28:28 +01:00
Matthew Hodgson
e18e965eb8 missing key attr 2017-04-22 16:26:39 +01:00
Matthew Hodgson
0ac836919d Merge pull request #822 from t3chguy/BaseDialog_restore_focus 
Remember element that was in focus before rendering dialog
 2017-04-22 16:05:34 +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
Michael Telatynski
6a657a6555 Remember element that was in focus before rendering dialog 
restore focus to that element when we unmount

also remove some whitespace because ESLint is a big bad bully...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 05:44:27 +01:00
Matthew Hodgson
aa0658d9ce Merge pull request #802 from t3chguy/t3chguy/file_download_improvements 
File Download Consistency
 2017-04-22 02:59:25 +01:00
Matthew Hodgson
6c177bc617 Merge pull request #806 from t3chguy/t3chguy/show_access_token 
Show Access Token under Advanced in Settings
 2017-04-22 02:51:54 +01:00
Matthew Hodgson
ad76dd0dd1 Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements 
Link tags/commit hashes in the UserSettings version section
 2017-04-22 02:38:30 +01:00
Matthew Hodgson
febd9c637e Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer 
On return to RoomView from auxPanel, send focus back to Composer
 2017-04-22 02:08:48 +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
fdc26a490a On return to RoomView from auxPanel, send focus back to Composer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-21 18:45:28 +01:00
Luke Barnard
ae8d04b35d Merge pull request #805 from matrix-org/luke/feature-read-marker 
Sync RM across instances of Riot
 2017-04-21 16:52:46 +01:00
Luke Barnard
29c2bd3d18 reset last_rr_sent on error 
Indicate that setting the RR was a failure and that hitting the API should be retried (in the case where the errcode !== "M_UNRECOGNISED")
 2017-04-21 16:46:36 +01:00