Matthew Hodgson
f4ed820b6f
fix stubbing
2018-05-05 23:38:14 +01:00
Matthew Hodgson
e62e43def6
comment out more draft stuff
2018-05-05 23:25:04 +01:00
Matthew Hodgson
02947063d3
Merge branch 'develop' into matthew/slate
2018-05-05 22:45:44 +01:00
Michael Telatynski
db55f87699
avoid .done
and .then
anti-pattern
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-05-01 18:14:35 +01:00
Michael Telatynski
68dd57f56e
rename two methods
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-27 11:47:18 +01:00
Matthew Hodgson
75a2be1a8d
WIP (doesn't build yet) replacing draft with slate
2018-04-23 01:13:18 +01:00
Michael Telatynski
f765db7d16
only clear reply_to_event if there was one to begin with
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-07 12:18:53 +01:00
Michael Telatynski
9c2e3e25f0
clear reply_to_event at queue not send time
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-04-04 10:34:39 +01:00
Michael Telatynski
0ed3563748
clear quoting event even on send fail, as then we can click retry
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-16 00:03:50 +01:00
Michael Telatynski
14f29e4740
fix the bugs Tulir found - THANKS
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-09 23:37:42 +00:00
Michael Telatynski
df56a67fda
Add reply fallback and run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-03-04 12:39:34 +00:00
Michael Telatynski
665ddccb0d
restrict to m.text for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:45:25 +00:00
Michael Telatynski
90f9badbf3
s/Reply/ReplyThread/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-20 15:40:19 +00:00
Michael Telatynski
34b427d15e
s/quote_event/reply_to_event/
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-19 23:41:07 +00:00
Michael Telatynski
fbb950e064
mass s/Quote/Reply
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 12:38:25 +00:00
Michael Telatynski
1c3d8cbe6e
initial refactor of Replies to use B
explicit over-the-wire format
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-10 11:19:43 +00:00
Michael Telatynski
5764280588
Persist contentState when sending SlashCommand via MessageComposerInput
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-29 09:09:22 +00:00
Michael Telatynski
23bd612730
Focus composer when clicking Reply
(quote event)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-11 19:29:00 +00:00
Michael Telatynski
1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# src/components/views/messages/TextualBody.js
2018-01-10 11:54:58 +00:00
David Baker
5aed77c752
Merge pull request #1677 from aidalgol/PropTypes
...
Remove use of deprecated React.PropTypes
2018-01-05 11:53:55 +00:00
nostradamos
2189fe9256
removed console.log
2018-01-03 01:52:02 +01:00
nostradamos
e543f55572
refactored code
2018-01-03 01:50:03 +01:00
nostradamos
36df3acf4d
Merge remote-tracking branch 'origin/develop' into fix_riot_web_4821
2018-01-02 23:07:47 +01:00
nostradamos
03f88df66e
Make the scrolling compatible with our riot-web fix for https://github.com/vector-im/riot-web/issues/4821
2018-01-02 22:44:18 +01:00
Aidan Gauland
35780f5ae0
Remove use of deprecated React.PropTypes
...
Replace all uses of React.PropTypes with PropTypes and importing PropTypes from
'prop-types'.
2017-12-26 14:03:18 +13:00
Michael Telatynski
5c229b9ef8
DRY matrix.to link generation so it is all changeable in one class
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:33:40 +00:00
Michael Telatynski
4666ac7c83
hide rich quoting behind flags, retaining original quoting for now
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:29:43 +00:00
Michael Telatynski
0f85391587
Implement Rich Quoting/Replies
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:50:41 +00:00
David Baker
0d38e7510d
Merge pull request #1600 from matrix-org/dbkr/udd_no_auto_show
...
Don't Auto-show UnknownDeviceDialog
2017-12-08 16:33:25 +00:00
Luke Barnard
363fe04a10
isCtrlOrCmdKeyEvent -> isOnlyCtrlOrCmdKeyEvent
2017-12-01 10:44:00 +00:00
Luke Barnard
fe81fcb8c6
Factor out isCtrlOrCmdKeyEvent, use that in TagPanel
...
as opposed to the incorrect ctrl || meta
2017-12-01 10:30:49 +00:00
David Baker
196eafdc7f
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-16 15:59:16 +00:00
Luke Barnard
dad797d4a2
Run linting --fix
2017-11-16 13:19:36 +00:00
David Baker
f8fc6dc83e
Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show
2017-11-15 12:11:33 +00:00
David Baker
b1ec430523
Remove now-unused dispatches
2017-11-09 16:09:12 +00:00
Travis Ralston
289b0c2b6a
Merge branch 'develop' into travis/granular-settings
2017-11-07 14:55:12 -07:00
David Baker
df5c6470e8
get dict syntax right
2017-11-06 22:01:23 +00:00
David Baker
08d006d112
PR feedback
2017-11-06 17:15:09 +00:00
David Baker
adc4290451
Pillify room notif pills in composer
2017-11-06 15:11:42 +00:00
Travis Ralston
8282534f87
Add SettingsLevel enum; Move settings to own file.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
Travis Ralston
893c39bfbe
Merge branch 'develop' into travis/granular-settings
2017-11-03 22:00:07 -06:00
David Baker
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
David Baker
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
Travis Ralston
ae10a11ac4
Convert synced settings to granular settings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
Luke Barnard
d3f9a3aeb5
Run eslint --fix
...
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
2017-10-11 17:56:17 +01:00
Stefan Parviainen
d4929b558e
Add dummy translation function to mark translatable strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-22 21:43:27 +02:00
Luke Barnard
8ed5422a45
Fix click to insert completion
...
And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc.
Fixes vector-im/riot-web#4835
2017-08-23 16:22:14 +01:00
Luke Barnard
6b1b643d41
Merge branch 'develop' into luke/store-history-as-raw-content
2017-08-14 16:42:22 +01:00
Luke Barnard
9742962d61
preventDefault when moving autocomplete selection with vertical arrow
...
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
2017-08-14 15:16:13 +01:00
Michael Telatynski
41843f021d
don't track two more potential risks
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-10 15:21:01 +01:00