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 |
|
Michael Telatynski
|
293bb15ccc
|
check PL and compare arrays rather than tracking changes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 10:53:55 +00:00 |
|
David Baker
|
7787e57b42
|
Merge pull request #1645 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
|
2018-01-05 10:38:18 +00:00 |
|
lukebarnard
|
7606e60188
|
Merge branch 'develop' into luke/perf-tag-panel-selected
|
2018-01-05 10:26:03 +00:00 |
|
Walter
|
8731bfd008
|
Translated using Weblate (Russian)
Currently translated at 100.0% (958 of 958 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
|
2018-01-05 10:24:02 +00:00 |
|
Walter
|
a7aa0a3b27
|
Translated using Weblate (Russian)
Currently translated at 100.0% (958 of 958 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
|
2018-01-04 21:33:41 +00:00 |
|
Weblate
|
ae3666143a
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-04 18:26:10 +00:00 |
|
David Baker
|
c7accb732c
|
Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor
make RoomDetailRow reusable for the Room Directory
|
2018-01-04 18:26:06 +00:00 |
|
Weblate
|
493023a1bb
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-04 18:19:42 +00:00 |
|
David Baker
|
50aeea8f05
|
Merge pull request #1686 from matrix-org/luke/fix-get-users-rooms-for-joined-groups
Prefetch group data for all joined groups when RoomList mounts
|
2018-01-04 18:19:37 +00:00 |
|
lukebarnard
|
f1b60287fb
|
Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups
|
2018-01-04 17:56:34 +00:00 |
|
Weblate
|
cde2a5e201
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-04 17:46:52 +00:00 |
|
lukebarnard
|
55bfff24c4
|
Fix forgotten rename during d5e2a73d99
|
2018-01-04 17:46:44 +00:00 |
|
Weblate
|
9c13a5a267
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-04 17:33:40 +00:00 |
|
David Baker
|
b34f360f96
|
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop
Remove unused selectedRoom prop
|
2018-01-04 17:33:36 +00:00 |
|
Weblate
|
36a2f4e8f9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-04 17:08:06 +00:00 |
|
David Baker
|
5961cf3958
|
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click
Fix shift and shift-ctrl click in TagPanel
|
2018-01-04 17:08:01 +00:00 |
|
Weblate
|
7c86745fc3
|
Merge remote-tracking branch 'origin/develop' into develop
|
2018-01-04 16:49:22 +00:00 |
|
David Baker
|
c294e336b5
|
Merge pull request #1344 from matrix-org/t3chguy/hide_left_chats_memberinfo
skip direct chats which either you or the target have left
|
2018-01-04 16:49:17 +00:00 |
|
Michael Telatynski
|
831a3f7e42
|
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo
|
2018-01-04 16:41:16 +00:00 |
|
Michael Telatynski
|
e99477d486
|
naive translation rescue post-pluralisation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-04 15:13:54 +00:00 |
|