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
6a0182a653
update Slate as fixes have now landed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-24 15:53:48 +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
c1891aa005
Merge pull request #2080 from matrix-org/dbkr/persistent_app_css_fixes
...
Fix persisent apps being the wrong size
2018-07-23 16:05:02 +01: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
4e9f6441a3
Merge pull request #2079 from matrix-org/dbkr/make_jitsi_actually_persist
...
Fix widgets resetting when going to the top-left
2018-07-23 15:31:12 +02: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
a8a40f1514
Merge pull request #2075 from matrix-org/dbkr/allow_jitsi_in_e2e_rooms
...
Allow jitsi in e2e rooms
2018-07-20 14:45:24 +01: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
503caafc87
Merge remote-tracking branch 'origin/develop' into develop
2018-07-20 11:20:24 +00:00
95eafd7489
Merge pull request #2073 from matrix-org/dbkr/kill_more_random_z_indexes
...
Fix e2e icons floating above jitsi
2018-07-20 12:20:18 +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
Weblate