David Baker
86c5fac030
Merge pull request #2097 from matrix-org/dbkr/remove_package_lock
...
Remove package-lock.json for now
2018-08-03 09:14:24 +01:00
Bruno Windels
74ee7069e2
Merge pull request #2103 from matrix-org/dbkr/chairman_mau_pt_1_login
...
Support montly active user limit error on /login
2018-08-03 09:32:08 +02:00
David Baker
d25fc9d9fb
Revert 3f0c948387
...
...as hopefully this should work now sanitize-html is fixed?
2018-08-02 19:37:27 +01:00
Bruno Windels
2b5c8282d0
Merge pull request #2105 from matrix-org/dbkr/unpin_sanitize_html
...
Unpin sanitize-html
2018-08-02 17:52:15 +02:00
David Baker
d25ed88b0d
Unpin sanitize-html
...
1.18.4 is now out which makes it work with webpack again
2018-08-02 16:20:55 +01:00
David Baker
bb9a3eb33d
Support MAU limit error on register too
2018-08-02 16:09:57 +01:00
David Baker
cc58b06226
Support montly active user limit error on /login
...
The 'contact your service administrator' should be a link but we
don't have this info from the HS yet.
2018-08-02 14:25:17 +01:00
Bruno Windels
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
David Baker
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
Bruno Windels
3f0c948387
try logging the stack to see where the TypeError on travis occurs exactly
2018-08-01 18:46:40 +02:00
David Baker
de43cc920d
Add package-lock to gitignore
2018-08-01 15:07:17 +01:00
David Baker
f0d135d76e
Remove package-lock.json for now
...
As per https://github.com/vector-im/riot-web/issues/7083
The package-lock file is currently not bringing any of the benefits
it's supposed to bring because we don't do the neccessary things to
massage it during the release process. Remove it until we actually
manage it correctly.
2018-07-31 11:02:14 +01:00
David Baker
2f13615dd1
Merge branch 'master' into develop
2018-07-30 12:09:07 +01:00
David Baker
3c8fc5a8af
v0.13.0
2018-07-30 11:57:53 +01:00
David Baker
1ebcd0f0ec
Prepare changelog for v0.13.0
2018-07-30 11:53:15 +01:00
David Baker
2df3580c60
Released js-sdk
2018-07-30 11:46:28 +01:00
Michael Telatynski
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
David Baker
f4c073ad45
Nest ifs to avoid unnecessary work
2018-07-27 18:58:11 +01:00
David Baker
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
David Baker
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
David Baker
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
David Baker
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
David Baker
1c0f778e82
Fix persistend element location not updating
...
As hopefully all explained in comment
2018-07-27 14:42:58 +01:00
David Baker
1fe0f04986
Fix persistend element location not updating
...
As hopefully all explained in comment
2018-07-27 14:33:05 +01:00
David Baker
b6ebb0cc37
Merge pull request #2089 from matrix-org/t3chguy/slate_cont2
...
Slate Fixes 42?
2018-07-27 14:00:53 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
f264075369
null-guard history properly
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-07-26 17:11:32 +01:00
Michael Telatynski
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
David Baker
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
David Baker
0c1722c8ee
Update package-lock deps
2018-07-24 22:07:12 +01:00
David Baker
c6ad30ff85
v0.13.0-rc.2
2018-07-24 19:34:37 +01:00
David Baker
97fd605440
Prepare changelog for v0.13.0-rc.2
2018-07-24 19:34:36 +01:00
David Baker
c35dec93e5
Merge remote-tracking branch 'origin/develop' into release-v0.13.0
2018-07-24 19:30:26 +01:00
David Baker
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
David Baker
20ea86417e
Appease the linter
2018-07-24 19:14:44 +01:00
David Baker
d8be4508e8
Unused import
2018-07-24 19:13:05 +01:00
David Baker
cfa7d0f11d
Take jitsi conf calling out of labs
2018-07-24 19:06:19 +01:00
David Baker
15c3d4ed16
v0.13.0-rc.1
2018-07-24 18:31:28 +01:00
David Baker
ca35ef3fa5
Prepare changelog for v0.13.0-rc.1
2018-07-24 18:31:28 +01:00
David Baker
7891681920
js-sdk rc.1
2018-07-24 18:27:30 +01:00
David Baker
ffabd60972
Merge pull request #2086 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-07-24 18:26:42 +01:00
Weblate
86eaf2bd6a
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 16:34:24 +00:00
David Baker
cf6ce0c1e2
Merge pull request #2082 from matrix-org/t3chguy/slate_cont2
...
Moar Slate Fixes
2018-07-24 17:34:20 +01:00
Weblate
b2fce4809f
Merge remote-tracking branch 'origin/develop' into develop
2018-07-24 16:12:54 +00:00
David Baker
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
Michael Telatynski
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
David Baker
cdd73e6e1f
Check matrix client exists when stopping
2018-07-24 16:55:45 +01:00
David Baker
7044410a13
Move destroyPersistentWidget to store
2018-07-24 16:50:34 +01:00
David Baker
acc767a479
s/start/stop/
2018-07-24 16:39:30 +01:00