PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
11029 commits 1 branch 0 tags 338 MiB
Commit graph

11029 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Baker
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
Weblate
7e721adf80 Merge remote-tracking branch 'origin/develop' into develop 2018-07-24 15:03:32 +00:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
6a0182a653
update Slate as fixes have now landed 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 15:53:48 +01:00
Michael Telatynski
6cd3860058
fix conjugated emoji in slate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 14:35:23 +01:00
Michael Telatynski
afa19cd60d
make clicking autocomplete suggestions work again 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 13:48:05 +01:00
Michael Telatynski
ef39327073
fix CommandMap typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-24 13:21:36 +01:00
Michael Telatynski
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
Weblate
3eb832aa2f Merge remote-tracking branch 'origin/develop' into develop 2018-07-23 16:25:55 +00:00