d1dcd0f374
Merge pull request #2101 from matrix-org/dbkr/pin_sanitize_html
...
Pin sanitize-html to 0.18.2
2018-08-02 12:05:37 +02:00
4575710c84
Pin sanitize-html to 0.18.2
...
Because 0.18.3 is broken (https://github.com/punkave/sanitize-html/issues/241
/ https://github.com/punkave/sanitize-html/issues/242
2018-08-02 10:59:26 +01:00
2f13615dd1
Merge branch 'master' into develop
2018-07-30 12:09:07 +01:00
3c8fc5a8af
v0.13.0
2018-07-30 11:57:53 +01:00
1ebcd0f0ec
Prepare changelog for v0.13.0
2018-07-30 11:53:15 +01:00
2df3580c60
Released js-sdk
2018-07-30 11:46:28 +01:00
2bc4dcc7da
Merge pull request #2096 from matrix-org/dbkr/click_on_side_panels_closes_settings_3
...
Make clicking on side panels close settings (mk 3)
2018-07-29 19:44:53 +01:00
f4c073ad45
Nest ifs to avoid unnecessary work
2018-07-27 18:58:11 +01:00
e059a08d7b
Make clicking on side panels close settings (mk 3)
...
Just do it by fixing the somewhat hacky logic to not break if the
target elements also have additional classes, like they do if the
toolbar is showing (I think it turns out this bug is only that it
doesn't work with the toolbar showing...)
Fixes https://github.com/vector-im/riot-web/issues/5658
2018-07-27 18:53:36 +01:00
897d18bffb
Merge pull request #2093 from matrix-org/t3chguy/slate_cont2
...
Fix composer bug where cursor position would change when Riot regained focus
2018-07-27 15:42:35 +01:00
8a99c712c1
Merge pull request #2094 from matrix-org/dbkr/reposition_jitsi__release
...
Fix persistend element location not updating
2018-07-27 15:42:21 +01:00
148308235d
Merge pull request #2092 from matrix-org/dbkr/reposition_jitsi
...
Fix persistent element location not updating
2018-07-27 14:51:29 +01:00
1c0f778e82
Fix persistend element location not updating
...
As hopefully all explained in comment
2018-07-27 14:42:58 +01:00
1fe0f04986
Fix persistend element location not updating
...
As hopefully all explained in comment
2018-07-27 14:33:05 +01:00
b6ebb0cc37
Merge pull request #2089 from matrix-org/t3chguy/slate_cont2
...
Slate Fixes 42?
2018-07-27 14:00:53 +01:00
6093f0ca68
Merge pull request #2090 from matrix-org/t3chguy/devtools_focus
...
fix Devtools input autofocus && state traversal when len === 1 && key=""
2018-07-26 22:28:07 +01:00
0174f67fe7
fix Devtools input autofocus && state traversal when len === 1 && key=""
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-26 18:20:09 +01:00
f264075369
null-guard history properly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-26 17:11:32 +01:00
265e4267b8
remove faulty onBlur/onFocus code which caused selection to rollback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-26 15:00:43 +01: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
0c1722c8ee
Update package-lock deps
2018-07-24 22:07:12 +01:00
c6ad30ff85
v0.13.0-rc.2
2018-07-24 19:34:37 +01:00
97fd605440
Prepare changelog for v0.13.0-rc.2
2018-07-24 19:34:36 +01:00
c35dec93e5
Merge remote-tracking branch 'origin/develop' into release-v0.13.0
2018-07-24 19:30:26 +01:00
3c377c1816
Merge pull request #2087 from matrix-org/dbkr/jitsi_out_of_labs
...
Take jitsi conf calling out of labs
2018-07-24 19:22:44 +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
15c3d4ed16
v0.13.0-rc.1
2018-07-24 18:31:28 +01:00
ca35ef3fa5
Prepare changelog for v0.13.0-rc.1
2018-07-24 18:31:28 +01:00
7891681920
js-sdk rc.1
2018-07-24 18:27:30 +01:00
ffabd60972
Merge pull request #2086 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-07-24 18:26:42 +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
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
Bruno Windels