OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
4,480 Commits
213 Branches
562 Tags
497 MiB
Commit Graph

4480 Commits (b753563a7e598029adec4c1639a13b09654a3b94)

Author SHA1 Message Date
Matthew Hodgson 63dac026a8 remove spammy log 2017-04-25 00:17:46 +01:00
Matthew Hodgson c7e4b298b2 Merge pull request #820 from turt2live/travis/h1-h2-to-h3 
Transform h1 and h2 tags to h3 tags
 2017-04-25 00:08:35 +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 28a2266f70 tidy up UDE handler 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:11:20 +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
David Baker e569144d6f v0.8.8-rc.2 2017-04-24 18:24:29 +01:00
David Baker 8e6981db44 Prepare changelog for v0.8.8-rc.2 2017-04-24 18:24:28 +01:00
Matthew Hodgson cf2cf66cae fix deep-linking to riot.im/app 2017-04-24 18:19:51 +01:00
Matthew Hodgson bb6dd363d7 unbreak in-app permalinks correctly 2017-04-24 18:19:39 +01:00
turt2live 3bd77d56db Allow h1 and h2 tags again. CSS handled by riot-web 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-24 08:45:22 -06:00
Luke Barnard 74e92d6c23 Remove DM-guessing code 2017-04-24 15:44:45 +01:00
turt2live 28923cdb93 Merge remote-tracking branch 'upstream/develop' into travis/h1-h2-to-h3 2017-04-24 08:29:10 -06: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
Michael Telatynski 5e8b43f3ed if we're not granted, show an ErrorDialog with some text which needs changing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 06:16:25 +01:00
Michael Telatynski 0590ce7faf Conform damn you (mostly) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-23 06:07:53 +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 6a63c7e50c fix deep-linking to riot.im/app 2017-04-22 21:06:38 +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 8865732286 Merge pull request #823 from t3chguy/improve_webpack_config 
Specify cross platform regexes and add olm to noParse
 2017-04-22 16:07:47 +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
Matthew Hodgson 7e07ffd55f Merge pull request #824 from t3chguy/fix_hide_rr_abstraction 
move user settings outward and use built in read receipts disabling
 2017-04-22 15:53:07 +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 18d933cbe4 Specify cross platform regexes and add olm to noParse 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-22 14:52:20 +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 d2d24bf0fa Merge pull request #818 from turt2live/travis/hide-read-receipts 
Add option to hide other people's read receipts.
 2017-04-22 01:36:45 +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 80b8be64d1 Transform h1 and h2 tags to h3 tags 
Addresses vector-im/riot-web#1772

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-21 15:09:56 -06:00