David Baker
|
ba9f03ce5e
|
Merge pull request #1702 from matrix-org/t3chguy/datesep
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
|
2018-01-15 13:45:11 +00:00 |
|
Michael Telatynski
|
b526fc057c
|
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
|
2018-01-14 18:32:17 +00:00 |
|
David Baker
|
952f2c6a21
|
Merge pull request #1698 from matrix-org/dbkr/fix_autofocus
Fix autofocus on QuestionDialog
|
2018-01-12 13:56:24 +00:00 |
|
David Baker
|
99a72b5b2b
|
Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674
'focus' attribute was on the wrong thing
|
2018-01-12 10:52:51 +00:00 |
|
David Baker
|
aa5d42d045
|
Remove spurious dot
|
2018-01-12 10:32:36 +00:00 |
|
David Baker
|
3371506960
|
Merge pull request #1697 from matrix-org/t3chguy/nvl/rich_quoting
Iterative fixes on Rich Quoting
|
2018-01-12 09:41:14 +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
|
192cba2b79
|
allow text&onSenderProfileClick for tileShape===quote
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-11 19:25:43 +00:00 |
|
Matthew Hodgson
|
e187ec6a2f
|
Merge pull request #1696 from matrix-org/t3chguy/fix_missing_negation
Fix missing negation
|
2018-01-11 12:06:48 +00:00 |
|
Michael Telatynski
|
8ad4da54cb
|
Fix missing negation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-11 12:04:53 +00:00 |
|
David Baker
|
b152bd4ab9
|
Merge pull request #1625 from matrix-org/t3chguy/analytics_info
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
|
2018-01-11 11:02:34 +00:00 |
|
David Baker
|
84da19c544
|
Merge pull request #1668 from turt2live/travis/re-register-scalar-token
Attempt to re-register for a scalar token if ours is invalid
|
2018-01-11 11:01:04 +00:00 |
|
David Baker
|
292a6c5767
|
Merge pull request #1674 from aidalgol/rebase-dialogs
Normalise dialogs
|
2018-01-11 10:49:40 +00:00 |
|
David Baker
|
efb96cdd2a
|
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying
Add 'send without verifying' to status bar
|
2018-01-11 10:34:56 +00:00 |
|
David Baker
|
4524e227d2
|
Merge pull request #1660 from matrix-org/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
|
2018-01-11 10:34:39 +00:00 |
|
David Baker
|
57e11cea1c
|
Fix jsdoc
|
2018-01-11 10:27:15 +00:00 |
|
Michael Telatynski
|
007715aeaa
|
Run prune-i18n.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 12:54:00 +00:00 |
|
Michael Telatynski
|
94167e2b8b
|
Run gen-i18n.js and embed the ellipsis into the base string
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 12:52:20 +00:00 |
|
Michael Telatynski
|
f5bad8bb10
|
Regenerate ESLintIgnore file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 12:50:12 +00:00 |
|
Michael Telatynski
|
1a7dc22a8d
|
make wantsDateSeparator generic and throw into DateUtils
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 12:06:24 +00:00 |
|
Michael Telatynski
|
e45fcf10c7
|
Refactor DateUtils to ES6
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 12:00:11 +00:00 |
|
Michael Telatynski
|
9e2238e884
|
remove unused imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 11:56:36 +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 |
|
Michael Telatynski
|
454fd23f25
|
fix typo shsape->shape
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 11:51:48 +00:00 |
|
Michael Telatynski
|
a977ab9be4
|
change handler name to suit convention
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 11:51:23 +00:00 |
|
David Baker
|
e2b2818555
|
Empty to force re-test
|
2018-01-10 11:03:38 +00:00 |
|
David Baker
|
9dd9a5be4b
|
Wording tweak
|
2018-01-09 17:59:49 +00:00 |
|
David Baker
|
dbb8f878cb
|
Tidy up imports
|
2018-01-09 17:57:18 +00:00 |
|
David Baker
|
4c101628b5
|
Add 'send without verifying' to status bar
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
|
2018-01-09 13:52:37 +00:00 |
|
Aidan Gauland
|
9365860075
|
Update copyright line
|
2018-01-09 18:40:12 +13:00 |
|
Michael Telatynski
|
d0897dc8f3
|
update wording to not imply exhaustiveness
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-08 13:29:27 +00:00 |
|
Matthew Hodgson
|
76ce40715d
|
bump commonmark dep to try to fix https://github.com/vector-im/riot-web/issues/3428 better
|
2018-01-07 20:32:57 +00:00 |
|
Matthew Hodgson
|
bcc3a4870a
|
Merge pull request #1694 from matrix-org/revert-1270-luke/fix-md-unescaped-tokens
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
|
2018-01-07 20:31:07 +00:00 |
|
Matthew Hodgson
|
a88f92c3e3
|
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
|
2018-01-07 20:30:18 +00:00 |
|
David Baker
|
6902cb5648
|
Merge pull request #1693 from matrix-org/luke/pref-tag-panel-selected2
Cache isConfCallRoom
|
2018-01-05 16:16:10 +00:00 |
|
lukebarnard
|
5ac1d8ce81
|
Merge branch 'develop' into luke/pref-tag-panel-selected2
|
2018-01-05 15:57:43 +00:00 |
|
David Baker
|
587a6f8e2b
|
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected
Improve performance of tag panel selection (when tags are selected)
|
2018-01-05 15:55:24 +00:00 |
|
Luke Barnard
|
8c84c3f929
|
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar
Hide status bar on visible->hidden transition
|
2018-01-05 15:26:22 +00:00 |
|
lukebarnard
|
8509db1bda
|
Cache isConfCallRoom
This only needs to be calculated one per room
|
2018-01-05 14:53:04 +00:00 |
|
lukebarnard
|
8ade357349
|
Handle newly added rooms and removed rooms.
|
2018-01-05 12:33:26 +00:00 |
|
David Baker
|
845dda8f48
|
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent
[revived] Singularise unsent message prompt, if applicable
|
2018-01-05 12:24:06 +00:00 |
|
Michael Telatynski
|
c61d09464a
|
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self
small refactor && warn on self-demotion
|
2018-01-05 12:18:15 +00:00 |
|
Michael Telatynski
|
9f295b7a86
|
fix typo
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 12:03:46 +00:00 |
|
Michael Telatynski
|
558a90a359
|
comment out RoomView.onStatusBarHidden
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 11:58:42 +00:00 |
|
Michael Telatynski
|
a8bd4bf858
|
add comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 11:56:18 +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 |
|
Michael Telatynski
|
222b01e000
|
Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings
only save RelatedGroupSettings if it was modified. Otherwise perms issue
|
2018-01-05 11:53:30 +00:00 |
|
David Baker
|
350dab06a0
|
Merge pull request #1675 from turt2live/travis/fix-granular-again
Fix a couple more issues with granular settings
|
2018-01-05 11:48:32 +00:00 |
|
David Baker
|
242d84c63a
|
Merge pull request #1673 from matrix-org/t3chguy/fix_op_slashcommand_for_negatives
Allow argument to op slashcommand to be negative as PLs can be -ve
|
2018-01-05 11:28:52 +00:00 |
|
Michael Telatynski
|
a473971c7b
|
negate for less indentation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 11:11:20 +00:00 |
|