c090c2e7df
Merge pull request #1710 from matrix-org/t3chguy/roomColor
...
don't pass back {} when we have no `org.matrix.room.color_scheme`
2018-01-18 10:22:21 +00:00
80d3edfbb3
simplify the 'send anyway' text, as 'mark devices known' is meaningless to users
2018-01-18 09:57:29 +00:00
d3292d9388
fix typos and NPE. fixes #5999
2018-01-17 23:28:14 +00:00
27b27e3759
Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting
...
Don't paginate whilst decrypting events
2018-01-17 19:28:52 +00:00
6b43b412ab
Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback
...
Fall back for missing i18n plurals
2018-01-17 19:28:38 +00:00
2f42e69b57
Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor
2018-01-17 18:20:35 +00:00
b7204e79a7
fallback after receiving settings rather than {} because its truthy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-17 18:17:26 +00:00
43bb8c561d
add comment
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-17 18:10:19 +00:00
b90a98b5c1
don't pass back {} when we have no org.matrix.room.color_scheme
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-17 18:06:19 +00:00
5f413ddf8b
Do not fetch GroupStore resources if already fetching
2018-01-17 17:01:42 +00:00
3ebf278cf3
Refactor GroupStore based on existing STATE_KEY concept
...
by factoring out a lot of repeated code.
2018-01-17 16:59:13 +00:00
2a1f8bd394
Ignore remote echos caused by this client
...
by sending each tag_ordering with a _storeId and ignoring accout data
that has a matching _storeId.
This will tend to become out of sync with the server over time if
requests continually fail, but subsequent successful requests will
rectify any differences.
2018-01-17 10:51:28 +00:00
f76186d743
Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback
2018-01-16 17:45:45 +00:00
0557737f8d
Don't modify original options arg
2018-01-16 17:45:29 +00:00
c64b4e1b1c
Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting
2018-01-16 17:38:32 +00:00
62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd
...
Replace TagPanel react-dnd with react-beautiful-dnd
2018-01-16 11:26:44 +00:00
f19dcd8114
Comment workaround to atlassian/react-beautiful-dnd#273
2018-01-16 11:07:25 +00:00
bda2d6b0a6
Work around atlassian/react-beautiful-dnd#273
...
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
2018-01-16 10:44:11 +00:00
d2e5b12271
Update jsdoc for moveTag
2018-01-16 09:46:48 +00:00
16c13fb079
Replace TagPanel react-dnd with react-beautiful-dnd
...
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.
It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).
Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).
The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
2018-01-15 18:12:27 +00:00
0a6018a945
Merge pull request #1704 from matrix-org/luke/perf-room-list
...
Only set selected tags state when updating rooms
2018-01-15 15:01:57 +00:00
408f13f68c
Only set selected tags state when updating rooms
...
instead of every time we get an update from a GroupStore/otherwise.
This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.
Also, use the rate limited version of refreshRoomList.
2018-01-15 14:42:41 +00:00
b526fc057c
Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep
2018-01-14 18:32:17 +00:00
e42bea6277
Don't paginate whilst decrypting events
...
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
2018-01-12 18:17:03 +00:00
3cadb9b587
Fall back for missing i18n plurals
...
Counterpart doesn't do fallback if there is a translation for the
base string in the preferred language but not the required
pluralisation. This meant that if someone added some plurals to a
language or a string, but not all, you'd get completely empty
strings in the interface.
Work around this in the wrapper function.
2018-01-12 16:21:30 +00:00
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
aa5d42d045
Remove spurious dot
2018-01-12 10:32:36 +00:00
23bd612730
Focus composer when clicking Reply (quote event)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-11 19:29:00 +00:00
192cba2b79
allow text&onSenderProfileClick for tileShape===quote
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-11 19:25:43 +00:00
8ad4da54cb
Fix missing negation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-11 12:04:53 +00:00
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
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
292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs
...
Normalise dialogs
2018-01-11 10:49:40 +00:00
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
57e11cea1c
Fix jsdoc
2018-01-11 10:27:15 +00:00
007715aeaa
Run prune-i18n.js
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 12:54:00 +00:00
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
1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 12:06:24 +00:00
e45fcf10c7
Refactor DateUtils to ES6
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 12:00:11 +00:00
9e2238e884
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 11:56:36 +00:00
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
454fd23f25
fix typo shsape->shape
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 11:51:48 +00:00
a977ab9be4
change handler name to suit convention
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-10 11:51:23 +00:00
9dd9a5be4b
Wording tweak
2018-01-09 17:59:49 +00:00
dbb8f878cb
Tidy up imports
2018-01-09 17:57:18 +00:00
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
9365860075
Update copyright line
2018-01-09 18:40:12 +13:00
d0897dc8f3
update wording to not imply exhaustiveness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2018-01-08 13:29:27 +00:00
a88f92c3e3
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
2018-01-07 20:30:18 +00:00
5ac1d8ce81
Merge branch 'develop' into luke/pref-tag-panel-selected2
2018-01-05 15:57:43 +00:00
David Baker