4daf9064d9
Convert to API objects
...
& remove redundant power label
2017-08-09 18:15:31 +01:00
794bf820cc
Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog
...
Fix Set MXID Dialog woes
2017-08-09 17:53:50 +01:00
2d47d3d2c3
Hide autocomplete when RTE selection state (cursor) changes
2017-08-09 17:36:35 +01:00
579090a4e3
add comment
2017-08-09 16:37:38 +01:00
435ec448d6
Add improved icons from Matthew
2017-08-09 16:21:15 +01:00
1e4d621ee7
Translated using Weblate (Telugu)
...
Currently translated at 60.8% (126 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-08-09 15:11:30 +00:00
370268bba8
Translated using Weblate (Telugu)
...
Currently translated at 60.3% (125 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-08-09 15:11:14 +00:00
8906aeb766
Translated using Weblate (Telugu)
...
Currently translated at 60.3% (125 of 207 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
2017-08-09 14:45:33 +00:00
7c4b6739fc
Add group member right panel
2017-08-09 15:36:51 +01:00
d9ebb11ba9
Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes
2017-08-09 14:08:13 +01:00
185379b037
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-09 14:07:45 +01:00
12628b67ea
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-09 13:46:40 +01:00
c1546ceb59
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-09 13:46:15 +01:00
f496d2de8b
Merge pull request #1285 from matrix-org/luke/fix-rte-mention-ambiguation
...
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 11:54:50 +01:00
4bc25f12cb
Move manage integrations button in to stand-alone component
2017-08-09 11:44:24 +01:00
610b2a3a42
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 10:40:06 +01:00
102b02054b
Merge pull request #1283 from matrix-org/rav/matrix_chat_optimisations
...
Make MatrixChat do fewer render cycles during mount
2017-08-09 09:32:54 +01:00
906ed3c78f
Merge remote-tracking branch 'origin/develop' into develop
2017-08-09 08:30:53 +00:00
ee2fb17945
Merge pull request #4765 from vector-im/rav/karma-bits
...
Karma tweaks for riot-web
2017-08-09 09:30:49 +01:00
38114711fd
Make MatrixChat do fewer render cycles during mount
...
This is mostly with the intent of making the login tests more reliable, but it
seems generally worthwhile:
* keep screenAfterLogin in the object props rather than `state` so that we can
clear it without triggering a rerender
* also move our record of the window width to the object props, and call
`handleResize` from componentWillMount rather than componentDidMount so that
we don't trigger a rerender by updating `state.width`
* Remove update of unused `loading` state
2017-08-08 22:31:40 +01:00
06ef674597
Enable fancy karma reporters
...
cargo-cult luke's stuff from react-sdk
2017-08-08 19:05:58 +01:00
df33d40285
Enable karma-sourcemap-loader
...
This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
2017-08-08 19:05:49 +01:00
b3108e4dff
Merge remote-tracking branch 'origin/develop' into develop
2017-08-08 17:23:49 +00:00
0b2120e423
Merge pull request #4764 from MTRNord/patch-5
...
Fix typo with scripts/fetch-develop-deps.sh in Building From Source
2017-08-08 18:23:44 +01:00
a3525f411d
Fix typo with scripts/fetch-develop-deps.sh in Building From Source
...
scripts/fetch-develop-deps.sh vs scripts/fetch-develop.deps.sh
2017-08-08 19:22:07 +02:00
8426ada24c
Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted
...
Show unencrypted messages as unencrypted
2017-08-08 18:11:56 +01:00
da85cb9f45
Show unencrypted messages as unencrypted
...
Previously, we were special-casing outgoing messages such that they were shown
as encrypted even when encryption had failed for some reason.
There's no need for this: outgoing messages have a working isEncrypted() method
which we can use to show whether the event has been encrypted yet. Arguably we
could do better than an open padlock for events in the 'encrypting' send state,
but I'm not really sure what.
2017-08-08 17:49:41 +01:00
34adda590b
Merge pull request #1280 from matrix-org/luke/fix-rte-prevent-completion-pills-in-commands
...
Disable autocompletions for users and rooms when entering a command
2017-08-08 17:48:56 +01:00
b76b6791b2
Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions
...
Always use message `body` when quoting
2017-08-08 17:47:25 +01:00
b82fd02eb7
Merge pull request #1281 from matrix-org/luke/fix-autocomplete-cancel
...
When `hide`ing autocomplete, also remove completion state
2017-08-08 17:46:48 +01:00
9f8e8ae1fd
Split timeline updates in to different PR.
2017-08-08 17:34:54 +01:00
cb8a66b5a1
When hideing autocomplete, also remove completion state
2017-08-08 17:25:11 +01:00
a72f38799f
Disable autocompletions for users and rooms when entering a command
...
This only affects commands that take a room alias or user ID as an argument. (Leaving commands such as `/me` unaffected)
2017-08-08 15:58:15 +01:00
503fa6a7b3
Always use message body when quoting
...
(not formatted_body)
This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
2017-08-08 14:59:56 +01:00
f7c38992cc
Merge remote-tracking branch 'origin/develop' into develop
2017-08-08 13:01:34 +00:00
ca2273519d
Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting
...
Add optional setting for hiding avatars in <Pill>s
2017-08-08 14:01:34 +01:00
3e96892a91
Merge pull request #4757 from vector-im/luke/css-feature-pills-hide-avatar-setting
...
Adjust CSS for optional avatars in pills
2017-08-08 14:01:29 +01:00
08fba3bb75
Merge pull request #1278 from matrix-org/luke/fix-rte-key-bindings
...
Mandate ctrl/meta ONLY for a subset of key bindings
2017-08-08 13:51:02 +01:00
bef6726290
Lint
2017-08-08 13:42:51 +01:00
91a1cc4431
Mandate ctrl/meta ONLY for a subset of key bindings
...
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
2017-08-08 13:36:43 +01:00
274fc34868
Adjust CSS for optional avatars in pills
...
codep matrix-org/matrix-react-sdk#1277
2017-08-08 11:14:52 +01:00
b08d32371d
Add optional setting for hiding avatars in <Pill>s
...
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
2017-08-08 11:13:29 +01:00
3639fc0c3c
Merge pull request #1276 from matrix-org/luke/fix-rte-completion-raw-disp-name
...
Use the rawDisplayName for the user provider completion
2017-08-08 10:38:24 +01:00
1743c047bd
Use the rawDisplayName for the user provider completion
...
to make sure that the length of text in the decoration (See <Pill>) is equal to the length of text in the completion (underlying text range that the Entity covers).
2017-08-08 10:28:11 +01:00
6cb979fc6f
Merge remote-tracking branch 'origin/develop' into develop
2017-08-08 09:13:10 +00:00
10ee9f4de4
Merge pull request #4754 from vector-im/rav/fix_crypto_build
...
Fix crypto on develop
2017-08-08 10:13:06 +01:00
c31f66aed5
Jenkins.sh: only fetch head of dependency branches
2017-08-08 09:50:49 +01:00
7b024751d1
fetch-develop-deps: avoid breaking js-sdk
...
do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build.
2017-08-08 09:50:49 +01:00
9c3c1b7608
Make webpack exit non-zero on error
...
Pass `--bail` to webpack, so that if we can't find a module, we bail out rather
than deploy a broken version to /develop.
https://github.com/webpack/webpack/issues/708 is somewhat relevant.
2017-08-08 09:50:49 +01:00
aa4cc882e9
Merge pull request #1275 from matrix-org/luke/fix-rte-ctrl-a-backspace
...
Fix ctrl+a, backspace toggling block format
2017-08-07 17:58:07 +01:00
David Baker
Luke Barnard
Luke Barnard
Michael Telatynski
Richard Lewis
Bhuvan Krishna
Sri Lakshmi
David Baker
Weblate
Richard van der Hoff
Richard van der Hoff
Marcel