Commit Graph

5383 Commits

Author SHA1 Message Date
Michael Telatynski
fbd9ba32aa
Merge pull request #5851 from oivoodoo/add-oivoodoo-author
Fixes #1953 by adding oivoodoo as author
2017-12-18 19:50:26 +00:00
Alexandr Korsak
3164655a21 Fixes #1953 2017-12-18 22:41:46 +03:00
Matthew Hodgson
fbbca2e466
Merge pull request #5824 from pafcu/patch-1
Instructions on security issues
2017-12-18 12:35:00 +00:00
Luke Barnard
7cc8fed61b
Merge pull request #5790 from vector-im/luke/feature-ordered-tag-panel
Move DND wrapper to top level component
2017-12-14 10:36:26 +00:00
pafcu
25bfb52e7e
Instructions on security issues
It's not good to put potentially sensitive security issues in the public bug tracker, so advice to use security@matrix.org instead
2017-12-12 19:49:48 +01:00
Matthew Hodgson
89efbd0a71
Merge pull request #5786 from vector-im/rxl881/titleBar
Widget title bar max / min visual cues.
2017-12-08 19:18:52 +01:00
Luke Barnard
608a359e0a Move DND wrapper to top level component 2017-12-06 14:54:35 +00:00
Richard Lewis
0ff5d61189 Don't capture pointer events. 2017-12-05 18:44:24 +00:00
Richard Lewis
c37c50e1e0 Add maximise and minimise icons 2017-12-05 18:07:49 +00:00
Richard Lewis
e0ae266bb2 Make cursor pointer on menubar mouseover. 2017-12-05 18:07:19 +00:00
Matthew Hodgson
9835e2e0b4
Merge pull request #5759 from vector-im/luke/renumerate-broken-ordered-sublists
Implement renumeration of ordered tags upon collision
2017-12-04 18:09:23 +00:00
Luke Barnard
95c746936a Merge branch 'master' into develop 2017-12-04 12:36:42 +00:00
Luke Barnard
b73f0c7b90 v0.13.3 2017-12-04 12:31:50 +00:00
Luke Barnard
8ec48db86c Prepare changelog for v0.13.3 2017-12-04 12:31:50 +00:00
Luke Barnard
5fba5b30e9 v0.13.3 2017-12-04 12:29:32 +00:00
Luke Barnard
c685546e9a Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:27:49 +00:00
Luke Barnard
1a0c0af447 Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:25:54 +00:00
Luke Barnard
b0d115a64a Implement renumeration of ordered tags upon collision
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
2017-12-01 18:20:38 +00:00
Luke Barnard
e80c4fadea Linting 2017-12-01 18:18:48 +00:00
Luke Barnard
cc4890f0b8 Fix TagPanel bg on status theme 2017-12-01 14:12:31 +00:00
Luke Barnard
0aaae9bca5
Merge pull request #5751 from vector-im/luke/refactor-keycode-to-keyboard
Update imports for accessing KeyCode
2017-12-01 12:04:10 +00:00
Luke Barnard
a24c42b3a8 Realign collpased BottomLeftMenu with create group button 2017-12-01 11:04:46 +00:00
Luke Barnard
1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
Luke Barnard
4e7a1e9653 Correctly position TagPanel createGroupButton 2017-11-30 11:07:27 +00:00
Matthew Hodgson
2a402985aa
Merge pull request #5685 from aidalgol/root-lang-attrib-fix
Set html lang attribute from language setting
2017-11-30 10:12:40 +00:00
Matthew Hodgson
f72b44650b fix tertiary accent colors 2017-11-29 22:04:40 +00:00
Luke Barnard
72563e6114 overflow hidden for groupPublicity scrollbox 2017-11-29 18:50:22 +00:00
Luke Barnard
123ad19b28
Merge pull request #5723 from vector-im/luke/feature-tag-panel
CSS for new TagPanel
2017-11-29 17:30:40 +00:00
Luke Barnard
28132eaf36 Correct comment 2017-11-29 17:17:09 +00:00
Luke Barnard
0c43edb629 CSS for new TagPanel 2017-11-29 16:41:00 +00:00
Luke Barnard
63bedc440b
Merge pull request #5707 from vector-im/luke/allow-guest-view-group
getGroupStore no longer needs a matrix client
2017-11-28 14:09:39 +00:00
Luke Barnard
bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Luke Barnard
58b7530134
Merge pull request #5702 from vector-im/luke/move-group-flair-toggle-to-user-settings
CSS required for moving group publication toggles to UserSettings
2017-11-28 11:25:45 +00:00
Richard van der Hoff
93f05ceea3 Merge branch 'master' into develop 2017-11-28 11:22:16 +00:00
Richard van der Hoff
5fff46fdac v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff
0f5785c27b Prepare changelog for v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff
854a665627 v0.13.2 2017-11-28 11:16:45 +00:00
Richard van der Hoff
2e9f309415 Bump to react-sdk 0.11.2 2017-11-28 11:16:13 +00:00
Luke Barnard
6fc173eaa9 CSS required for moving group publication toggles to UserSettings
See https://github.com/matrix-org/matrix-react-sdk/pull/1634
2017-11-27 18:59:33 +00:00
Luke Barnard
5f4d011606 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-11-27 18:58:42 +00:00
Luke Barnard
9da799c2dd GroupTile h3 becomes div for simpler reuse 2017-11-27 18:57:59 +00:00
David Baker
a346cf393d
Merge pull request #5630 from turt2live/travis/granular-theme
Make sure the SettingsStore is ready to load the theme before loading it
2017-11-27 18:11:07 +00:00
Travis Ralston
c825ab0fa3
Add comment about why we call SdkConfig twice
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-27 11:03:58 -07:00
Aidan Gauland
c4dc59dc41 Use documentElement instead of getElementById
Use documentElement to get the root <html> element instead of adding an id to
the root element.
2017-11-26 13:46:47 +13:00
Aidan Gauland
43b3c013f2 Change html root id
Change the root <html> element id to follow Matrix naming conventions.
2017-11-26 09:49:39 +13:00
Aidan Gauland
c0a5c28d80 Set html lang attribute from language setting 2017-11-25 22:58:52 +13:00
Matthew Hodgson
c28d9e5cde
Merge pull request #5661 from pafcu/sidebar-a11y
Add some aria-labels to RightPanel
2017-11-21 18:47:37 +00:00
Stefan Parviainen
0bd68ce068 Add some aria-labels to RightPanel
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-21 09:18:59 +01:00
Luke Barnard
f2e66590da
Merge pull request #5657 from vector-im/luke/fix-member-count-format
Use badge count format for member count in RightPanel
2017-11-20 13:30:40 +00:00
lukebarnard
7cb59bddb0 Use badge count format for member count in RightPanel
(to avoid cosmetic disasters with >9999 members in a room, e.g. HQ)
2017-11-20 13:12:55 +00:00