7ea913ccec
fall back to synced membership when own membership is not yet available (due to lazy loading)
2018-07-25 16:10:49 +02:00
f79e2eae40
might not have loaded members here yet
2018-07-25 16:10:49 +02:00
33f5560666
move error message to caller of lazy loading
2018-07-25 16:10:49 +02:00
201332d96c
move comment after rebase
2018-07-25 16:10:49 +02:00
af07d73432
hide lazy loading behind feature flag
2018-07-25 16:10:49 +02:00
866b4bb067
use isKicked method in preview bar
2018-07-25 16:10:49 +02:00
8c9ceca14f
take into account lazy loading when enlarging avatar
2018-07-25 16:10:49 +02:00
af77f0206a
don't assume a member has events associated
2018-07-25 16:10:49 +02:00
8529bc55e3
use helper method for knowing whether a user was kicked
...
mainly for readability, but also to discourage grabbing into the member
because of lazy loading changes
2018-07-25 16:10:49 +02:00
e237a02fa5
use more consistent naming
2018-07-25 16:10:49 +02:00
54904c9282
use member helper method instead of digging inside member
2018-07-25 16:10:49 +02:00
6ff92ede8f
this code actually never fires, so remove it
...
and that's ok because createRoom will already mark a DM as such
on the inviter's side. So here we just handle the invitees side.
2018-07-25 16:10:49 +02:00
19387805ac
Don't assume RoomMember has a state event in direct chat detection
...
Instead call the method on the member that takes lazy loading into account
2018-07-25 16:10:49 +02:00
de3e143a8f
only lazy load the members when viewing a joined room
2018-07-25 16:10:49 +02:00
8c985bd049
ask client to lazy load room members when viewing a room
2018-07-25 16:10:49 +02:00
a11e1cc2f9
[WIP] Send lazy_load_memberers filter when syncing
2018-07-25 16:10:49 +02:00
a00c2b753a
Merge pull request #2085 from matrix-org/t3chguy/emoji_aliases
...
allow autocompleting Emoji by common aliases, e.g 👍 to 👍
2018-07-25 10:40:59 +01:00
20ea86417e
Appease the linter
2018-07-24 19:14:44 +01:00
d8be4508e8
Unused import
2018-07-24 19:13:05 +01:00
cfa7d0f11d
Take jitsi conf calling out of labs
2018-07-24 19:06:19 +01:00
86eaf2bd6a
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 16:34:24 +00:00
cf6ce0c1e2
Merge pull request #2082 from matrix-org/t3chguy/slate_cont2
...
Moar Slate Fixes
2018-07-24 17:34:20 +01:00
b2fce4809f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 16:12:54 +00:00
c19a5bd2a8
Merge pull request #2084 from matrix-org/dbkr/store_destroy_persistent_widget
...
Make ActiveWidgetStore clear persistent widgets
2018-07-24 17:12:49 +01:00
07f0713a56
allow autocompleting Emoji by common aliases, e.g 👍 to 👍
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 17:06:45 +01:00
cdd73e6e1f
Check matrix client exists when stopping
2018-07-24 16:55:45 +01:00
7044410a13
Move destroyPersistentWidget to store
2018-07-24 16:50:34 +01:00
acc767a479
s/start/stop/
2018-07-24 16:39:30 +01:00
ec4c7ffb71
Make ActiveWidgetStore clear persistent widgets
...
ActiveWidgetStore is now reponsible for removing the current
persistent widget from the store if it's been removed from whatever
room it was in. As per comment, this leaves us with the store updating
itself in this case but in all other cases, views call setters on the
store to update its state. We should make it so the store keeps itself
up to date and views aren't responsible for keeping the store up to date.
The store now emits events so it can notify PersistentApp when it changes.
Fixes https://github.com/vector-im/riot-web/issues/7076
2018-07-24 16:21:43 +01:00
7e721adf80
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 15:03:32 +00:00
fe3850d61f
Merge pull request #2078 from psaavedra/fix_render_in_CreateRoomDialog
...
CreateRoomDialog is rendered before getting the config default_federate
2018-07-24 16:03:26 +01:00
020e714b85
fix focus and too many <p>s after a Event>Quote in RT mode
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 15:54:24 +01:00
6cd3860058
fix conjugated emoji in slate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 14:35:23 +01:00
afa19cd60d
make clicking autocomplete suggestions work again
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 13:48:05 +01:00
ef39327073
fix CommandMap typo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 13:21:36 +01:00
7c3873b449
fix `@room` pill href=undefined and @room parsing breaking subsequent pills
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 12:18:10 +01:00
3eb832aa2f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-23 16:25:55 +00:00
b8ca65627b
Merge pull request #2076 from matrix-org/t3chguy/slate_cont2
...
Slate Fixes
2018-07-23 17:25:51 +01:00
d5093b7ba0
Merge remote-tracking branch 'origin/develop' into develop
2018-07-23 16:24:45 +00:00
d242935a90
Merge pull request #2077 from matrix-org/bwindels/fix-dm-error-on-left-room
...
FIX: Don't error on rooms the user has left already
2018-07-23 17:24:41 +01:00
6804647dda
Destroy widget when its permission is revoked
2018-07-23 17:11:53 +01:00
77ab7d2589
CreateRoomDialog is rendered before get default_federate value
...
In React the order of the execution of mount and render functions
is: `componentWillMount --> render --> componentDidMount`
The `CreateRoomDialog` `render()` function is executed before than
the `componentDidMount()` function so the
`this.defaultNoFederate = config.default_federate === false;`
; instruction which is executed in the `componentDidMount` function
(in `CreateRoomDialog`) is evaluated always after than the rendering
of the page.
Therefore, the obvious issue is that the values obtained from the
`SdkConfig.get()` function (`config.default_federate`) are obtained
later than their usage on `render()`.
This patch makes this change to fix the described issue:
* componentWillMount instead of componentDidMount
Signed-off-by: Pablo Saavedra <psaavedra@igalia.com>
2018-07-23 17:51:51 +02:00
4ce2c03f70
Merge remote-tracking branch 'origin/develop' into develop
2018-07-23 15:05:10 +00:00
4f8ece53b2
Fix CSS naming
2018-07-23 15:58:07 +01:00
5adcd673ab
Fix persisent apps being the wrong size
2018-07-23 15:08:17 +01:00
3d3ff6cc00
Merge remote-tracking branch 'origin/develop' into develop
2018-07-23 13:31:18 +00:00
00f78822c5
Fix widgets resetting when going to the top-left
...
Remove the hash from the parentUrl because this change when we
change rooms.
2018-07-23 13:50:16 +01:00
3992e99850
dont error on rooms the user has left already
2018-07-23 14:18:45 +02:00
fc18c301a1
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-07-22 13:01:26 +00:00
93abb4b74b
workaround to prevent Slate getting too empty when undoing RT pastes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-20 15:06:27 +01:00
da8f77e621
Merge remote-tracking branch 'origin/develop' into develop
2018-07-20 14:01:32 +00:00
fc29e89f63
Merge pull request #2062 from matrix-org/dbkr/use_configured_integ_url
...
Jitsi: Use integrations URL from config
2018-07-20 15:01:28 +01:00
972d59c77b
Merge remote-tracking branch 'origin/develop' into develop
2018-07-20 13:45:29 +00:00
bd3dd9aafc
Allow jitsi in e2e rooms
...
We have a separate warning about how widgets are not very e2e, so
this should be sufficient warning.
2018-07-20 14:30:38 +01:00
ad6397a7f4
Merge remote-tracking branch 'origin/develop' into develop
2018-07-20 11:23:07 +00:00
6f278ceab0
Merge pull request #2071 from matrix-org/dbkr/persistedelement_border
...
Fix border around persisted widgets
2018-07-20 12:23:02 +01:00
19f4d4e15b
Translated using Weblate (Slovak)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-07-20 08:02:47 +00:00
25a3d49f67
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-19 13:38:39 +00:00
d35ef7e7eb
Merge remote-tracking branch 'origin/develop' into develop
2018-07-19 12:51:09 +00:00
3c895e5a0d
Merge pull request #2074 from matrix-org/t3chguy/hide_ddg_me_after_space
...
hide some commands after space as they have special semantics
2018-07-19 13:51:05 +01:00
173806e657
Merge remote-tracking branch 'origin/develop' into develop
2018-07-19 12:49:49 +00:00
f9af96d422
Merge pull request #2070 from matrix-org/t3chguy/slate_cont2
...
Even More Slate Fixes :D
2018-07-19 13:49:42 +01:00
0d1fd1b892
Translated using Weblate (French)
...
Currently translated at 100.0% (1218 of 1218 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-19 11:23:39 +00:00
f700c8e60d
Merge remote-tracking branch 'origin/develop' into develop
2018-07-19 11:00:43 +00:00
eb0a1d9b92
Translated using Weblate (Russian)
...
Currently translated at 99.4% (1208 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-19 11:00:42 +00:00
0ddf84c45e
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-07-19 11:00:42 +00:00
50c6b91c8f
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-19 11:00:42 +00:00
7612910507
Translated using Weblate (French)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-19 11:00:42 +00:00
89bc4776e9
Translated using Weblate (Esperanto)
...
Currently translated at 91.0% (1106 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-07-19 11:00:42 +00:00
1a61f15a97
Translated using Weblate (Bulgarian)
...
Currently translated at 99.3% (1207 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-07-19 11:00:41 +00:00
df025ca935
Translated using Weblate (Italian)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-07-18 18:40:28 +00:00
855f8871b8
replace heuristic for the time being as it failed with inlines like pills. Fixes vector-im/riot-web#7059
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 16:50:07 +01:00
5867fe73dd
hide some commands after space as they have special semantics
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 15:38:21 +01:00
cbb61e3b2b
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-07-18 12:52:22 +00:00
22bde9fd50
Read jitsi widget URL from config
2018-07-18 12:05:32 +01:00
f868cd6699
Fix border around persisted widgets
...
The PersistedElement had zero height so the border ended up in the
wrong place. Add a wrapper to fix the height back.
Fixes https://github.com/vector-im/riot-web/issues/7030
Fixes https://github.com/vector-im/riot-web/issues/7029
2018-07-18 11:52:57 +01:00
88dddb628d
in MD mode forgo any Magic Rich Pasting conversion as its confusing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 11:50:13 +01:00
6bb88c0548
attempt to fix clash of Cmd-M on Mac. Should fix vector-im/riot-web#7047
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 11:28:48 +01:00
3e956514b3
also prevent merge/skip on rich text pastes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 11:00:45 +01:00
1a9de3fabe
fix undo on pasting plaintext content
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 10:58:27 +01:00
f5856270cc
undo removal of stripping <p>s as it breaks HTML `/me`s
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 10:48:54 +01:00
68c46a694e
lint
2018-07-18 10:18:55 +01:00
19e5dc5799
do less rewriting for composer quote to prevent breaking pills
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 10:10:42 +01:00
8bb08b1b75
fix focus on new editorState as it didn't have focus so broke when alt tab
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-18 10:10:11 +01:00
7aab6fa6f1
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-18 09:35:57 +01:00
c4caaecfb3
Translated using Weblate (French)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-18 07:03:06 +00:00
0118027354
Translated using Weblate (Galician)
...
Currently translated at 100.0% (1215 of 1215 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-07-17 18:59:16 +00:00
dff3425a00
Merge remote-tracking branch 'origin/develop' into develop
2018-07-17 16:46:57 +00:00
0a432dfb8f
Merge pull request #2063 from matrix-org/dbkr/jitsi_check_scalar_first
...
Jitsi: Check integrations server before call
2018-07-17 17:46:53 +01:00
bfe8b0c8e4
Merge remote-tracking branch 'origin/develop' into develop
2018-07-17 16:42:44 +00:00
583cde6397
Merge pull request #2061 from matrix-org/dbkr/jitsi_error_no_perm
...
Jitsi: Error message on no permission
2018-07-17 17:42:39 +01:00
4be222c6aa
Merge remote-tracking branch 'origin/develop' into develop
2018-07-17 16:15:11 +00:00
02c3bc9476
Merge pull request #2069 from matrix-org/t3chguy/slate_cont2
...
Moar Slate Fixes
2018-07-17 17:15:01 +01:00
720a728278
workaround for placeholder being shown when empty text but block. Fixes vector-im/riot-web#7042
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 16:13:33 +01:00
1b467f6ca8
fix pasting of plaintext content (prevent loads of <p>s) Fixes vector-im/riot-web#7043
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 16:02:37 +01:00
414908611d
prevent exception if there is no text node at anchor
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 13:48:15 +01:00
688776bc10
allow enter to remove current block if its empty useful for lists
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 13:29:40 +01:00
8d4cead105
special-case 'inline-code' button because mark is called 'code'
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 13:24:28 +01:00
ff76b6a981
allow user to break out of blockquote/etc by hitting enter twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 12:30:22 +01:00
5b79e3bcd5
fix user autocomplete not adding `: ` if at the start
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 11:56:24 +01:00
23b6abf8b7
no point saving history at this point, maybe future supported
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-17 09:27:11 +01:00
09a504ba0e
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-17 05:44:59 +00:00
cbe5944ff0
preserve selection and history between room changes and refreshes
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 22:04:42 +01:00
c958e14c0e
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 20:37:02 +00:00
48fbf1406f
Merge pull request #2068 from matrix-org/t3chguy/slate_cont2
...
fix 2nd typo in one PR :(
2018-07-16 21:36:57 +01:00
1c24f1fd5a
fix 2nd typo in one PR :(
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 21:34:25 +01:00
5c9125ffde
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 20:32:09 +00:00
8c17ee7281
Merge pull request #2067 from matrix-org/t3chguy/slate_cont2
...
check if has some completions, not if >=0
2018-07-16 21:32:04 +01:00
547e0ed52c
check if has some completions, not if >=0
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 21:30:04 +01:00
6ae7c577cd
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 20:29:26 +00:00
f655e2eb86
Translated using Weblate (French)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-16 20:29:25 +00:00
a5b932bfdd
Merge pull request #2066 from matrix-org/t3chguy/slate_cont2
...
Slate fixes
2018-07-16 21:29:20 +01:00
3000099991
add additional checks for hiding autocomplete to prevent `text` calculation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 21:27:52 +01:00
bdbc2cbd38
disable spellCheck when the placeholder is shown because "unencrypted"
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 18:32:50 +01:00
c7859fed1a
add heuristic to compare documents to prevent autocomplete flicker
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 18:27:06 +01:00
ddf576ac59
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 16:26:42 +00:00
a79caed0c9
Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms
2018-07-16 17:21:51 +01:00
60bf368887
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 16:20:54 +00:00
3daff00704
Translated using Weblate (Russian)
...
Currently translated at 99.4% (1205 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-16 16:20:53 +00:00
a449b8420d
Translated using Weblate (French)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-16 16:20:53 +00:00
379d65bd6c
Merge pull request #2064 from matrix-org/t3chguy/slate_cont2
...
simplify MessageComposerStore and improve its performance
2018-07-16 17:20:48 +01:00
2f1779751b
make the MessageComposerStore stateless for better performance
...
and inter-tab composition (by simplifying it. WIN-WIN)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-16 16:56:08 +01:00
850a4d8ec5
Jitsi: Check integrations server before call
2018-07-16 16:54:25 +01:00
e95a8e82bc
Jitsi: Use integrations URL from config
2018-07-16 16:35:45 +01:00
983dc3ad2e
lint
2018-07-16 16:19:18 +01:00
19f0617052
Jitsi: Error message on no permission
...
Fixes https://github.com/vector-im/riot-web/issues/7007
2018-07-16 15:41:03 +01:00
8fa2fa19aa
Translated using Weblate (French)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-16 13:43:18 +00:00
f1cac4e268
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 13:16:33 +00:00
d16ac4d80c
Merge pull request #1890 from matrix-org/matthew/slate
...
Replace Draft with Slate
2018-07-16 14:16:25 +01:00
f76d9a7a97
Merge remote-tracking branch 'origin/develop' into develop
2018-07-16 12:33:19 +00:00
33b6d0ab5f
Translated using Weblate (Spanish)
...
Currently translated at 61.2% (742 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-07-16 12:33:18 +00:00
a17483971a
Translated using Weblate (Korean)
...
Currently translated at 80.5% (976 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2018-07-16 12:33:18 +00:00
88d688e56f
Translated using Weblate (French)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-16 12:33:18 +00:00
c857bf400c
Translated using Weblate (Esperanto)
...
Currently translated at 91.1% (1105 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-07-16 12:33:17 +00:00
415eef5aec
Merge pull request #2055 from matrix-org/bwindels/stop-peeking-fix
...
Fix not stopping to peek when navigating away from peeked room
2018-07-16 13:33:13 +01:00
4c6419a3c5
Merge remote-tracking branch 'origin/develop' into dbkr/widget_echo
2018-07-16 13:24:13 +01:00
0f32c3a018
PR feedback
2018-07-16 13:18:10 +01:00
ff96537048
lint
2018-07-16 11:49:53 +01:00
ffe0b35504
while logging out ignore `Session.logged_out` as it is intentional
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-15 22:33:00 +01:00
59a14f2c0b
re-hydrate Values which have been serialized into LocalStorage
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-15 20:34:27 +01:00
e42f8c0c77
Merge remote-tracking branch 'origin/develop' into develop
2018-07-13 13:47:50 +00:00
b450d5be65
Translated using Weblate (Bulgarian)
...
Currently translated at 99.9% (1211 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2018-07-13 13:47:49 +00:00
4850387ae0
add null-guard for stickerpickerWidget in StickerPicker
2018-07-13 14:24:29 +01:00
f76ddbc718
Merge remote-tracking branch 'origin/develop' into develop
2018-07-13 10:14:43 +00:00
903bac3f45
Translated using Weblate (Russian)
...
Currently translated at 99.7% (1209 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-07-13 10:14:42 +00:00
a463b6d8bb
Translated using Weblate (Azerbaijani)
...
Currently translated at 33.0% (401 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2018-07-13 10:14:41 +00:00
7bbb967ddd
Merge pull request #2053 from matrix-org/dbkr/jitsi_always_on_screen
...
Implement always-on-screen capability for widgets
2018-07-13 11:14:37 +01:00
ac8d9a4f20
Translated using Weblate (German)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-07-13 09:25:47 +00:00
e56feea9ec
Put always-on-screen widgets in top left
...
always-on-screen widgets now appear in the top-left where the
call preview normally is if you're not in the room that they're in.
Fixes https://github.com/vector-im/riot-web/issues/7007
Based off https://github.com/matrix-org/matrix-react-sdk/pull/2053
2018-07-12 18:43:49 +01:00
60a25b5263
Translated using Weblate (Azerbaijani)
...
Currently translated at 33.0% (401 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/az/
2018-07-12 17:27:50 +00:00
5a5e967262
Fix avatars vanishing on hover
...
Turns out the z-index was to make the avatar appear above the
EventTile_line even though it comes before in the DOM (it's
absolutely positioned to overlap with it). Instead, just put
it afterwards in the DOM.
2018-07-12 17:48:49 +01:00
7405c5eff2
specify alternate history storage key to prevent conflicts with draft
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-12 16:35:42 +01:00
b412b9e84d
Fix stopPeeking not being called at the right time
...
stopPeeking is currently not called when navigating to a joined room
after having peeked a room. This causes the /events endpoint for the
peeked room to be called until peeking another room, even when not
viewing the peeked room anymore.
The current code would only stop peeking if you joining were true (note the nesting),
e.g. when waiting for your join to be confirmed by /sync.
This change might make stopPeeking called also when not needed by there is a guard in
that method to do nothing if not currently peeking.
2018-07-12 15:19:25 +02:00
f0dbd161b3
Obviously didn't mean to commit that change
2018-07-11 18:11:28 +01:00
8f10ee01c6
Implement always-on-screen capability for widgets
...
As per https://github.com/matrix-org/matrix-doc/issues/1354
This is whitelisted to only jitsi widgets for now as per comment,
mostly because any widget that we may make always-on-screen we need
to preemptively put in a PersistedElement container, which is
unnecessary for any other widget.
Apologies that this does a bunch of refactoring which could have
been split out separately: I only discovered what needed to be
refactored in the process of doing this.
Fixes https://github.com/vector-im/riot-web/issues/6984
2018-07-11 18:07:32 +01:00
b4bc09c335
null-guard savedState since now we're accessing its props
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 17:13:33 +01:00
3e05bf19c5
hide autocomplete when moving caret to match existing behaviour
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 16:30:45 +01:00
95909de446
fix MessageComposer not marking translatable strings. run gen-i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 11:39:55 +01:00
c3aef6e3a0
workaround for tommoor/slate-md-serializer#14
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 10:29:14 +01:00
fd4f9679df
convert md<->rt if the stored editorState was in a different state
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-11 09:43:39 +01:00
3c39c53797
Translated using Weblate (French)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-07-11 08:39:49 +00:00
88c74bae1f
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (1212 of 1212 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-07-11 08:30:43 +00:00
716d7ad85d
Merge remote-tracking branch 'origin/develop' into develop
2018-07-11 08:12:53 +00:00
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling
...
fix nullguard on EventTile, getComponent never returns falsey, it throws
2018-07-11 09:12:49 +01:00
d8d7ff223f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-11 08:10:33 +00:00
abbb69dc36
fix fn call, fixes usage of SlashCommands
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 17:35:13 +01:00
25e453badd
Fix stickerpicker PersistedElement usage
...
Earlier PR changed the prop to persistKey in PersistedElement but
containerId here, so this was ending up as 'undefined'.
2018-07-10 17:32:17 +01:00
f2e3e30af8
Merge remote-tracking branch 'origin/develop' into develop
2018-07-10 15:12:51 +00:00
b482a4cdd3
Merge pull request #2042 from matrix-org/matthew/encrypt-for-invited-users
...
encrypt for invited users if history visibility allows.
2018-07-10 16:12:45 +01:00
ab625d489b
Merge remote-tracking branch 'origin/develop' into develop
2018-07-10 14:18:27 +00:00
02c6f3d168
fix typo
2018-07-10 15:18:07 +01:00
100ecfe7ce
remove trailing spaces to make linter happy (no-trailing-spaces)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 10:29:52 +01:00
58301e5dd4
navigateHistory only when at edges of document, to prevent Firefox bug
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-10 10:28:17 +01:00
51591a4d62
fix lint
2018-07-09 20:49:31 +01:00
8bcb987f50
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 20:14:37 +01:00
2018523bdb
Merge remote-tracking branch 'origin/develop' into develop
2018-07-09 19:11:29 +00:00
ffec1b5a95
fix lint
2018-07-09 20:11:17 +01:00
0d0934add7
unbreak modifier+space (e.g. emoji insert on macOS)
...
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:58:04 +01:00
021409aafe
apply review feedback from @lukebarnard1
...
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:54:57 +01:00
5bd4104c96
modify ComposerHistoryManager
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit d139dd6)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:43:57 +01:00
5b74c615ae
add missing import
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:42:57 +01:00
43204ea177
fix Control-Backspace after select-all
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:42:10 +01:00
faf17f06c6
remove debugger statement
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:36 +01:00
483116fb03
add rule to slate-md-serializer: make underlined and removed work for CM
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:29 +01:00
372fa29ad3
take edge into consideration when moving focus region on arrow keys
...
fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:20 +01:00
c6837af398
import-type Change from slate
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-09 19:40:00 +01:00
efdc5430d7
merge develop
2018-07-09 17:50:07 +01:00
42b77bfc48
Merge remote-tracking branch 'origin/develop' into develop
2018-07-09 10:17:20 +00:00
e61317284b
Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar
...
move nag bar clear statement to any desktop notif toggle not just 0->1
2018-07-09 11:17:15 +01:00
2847a5355c
Merge remote-tracking branch 'origin/develop' into develop
2018-07-09 09:17:14 +00:00
1646c3180c
Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf
...
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
2018-07-09 10:17:05 +01:00
0f1ae2b48d
Translated using Weblate (Basque)
...
Currently translated at 100.0% (1211 of 1211 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-07-08 08:54:54 +00:00
51dc8d9528
Merge remote-tracking branch 'origin/develop' into develop
2018-07-06 19:28:14 +00:00
6e1f62d16a
Fix stuff
2018-07-06 20:22:37 +01:00
86dc444e37
Merge remote-tracking branch 'origin/develop' into develop
2018-07-06 18:17:35 +00:00
aa9208d6b4
Merge pull request #2046 from Half-Shot/hs/show-server-bans
...
Show m.room.server_acl
2018-07-06 19:17:30 +01:00
4044185cdd
add space after commas
2018-07-06 19:17:01 +01:00
83221da7d7
Delint
2018-07-06 16:54:28 +01:00
9a4075c637
Semicolons
2018-07-06 16:38:04 +01:00
52b1d946be
Remove unused console.log
2018-07-06 16:37:52 +01:00
Bruno Windels