Commit graph

5350 commits

Author SHA1 Message Date
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
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
Matthew Hodgson
21d7c4d92a
Merge pull request #5640 from turt2live/travis/granular-language
Exclude the default language on page load
2017-11-18 12:25:50 +00:00
Travis Ralston
aab044a14c Exclude the default language on page load
This is so we correctly detect the browser language.

Fixes https://github.com/vector-im/riot-web/issues/5632

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-17 22:15:35 -07:00
David Baker
7130f4aee8 Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:29:33 +00:00
David Baker
aad2069a51 v0.13.1 2017-11-17 16:09:48 +00:00
David Baker
bac8b34e26 Prepare changelog for v0.13.1 2017-11-17 16:09:48 +00:00
David Baker
6ebab2cb8d v0.13.1 2017-11-17 16:05:26 +00:00
David Baker
538e1d2446 Released js-sdk & react-sdk 2017-11-17 16:05:01 +00:00
Luke Barnard
dff791d478 Add Slovak to included languages 2017-11-17 15:07:20 +00:00
Travis Ralston
eb40de4670 Make sure we load the config before trying to redirect to a mobile page
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 21:00:30 -07:00
Travis Ralston
67ca1515d8 Pull the theme through the default chain
This is so the `config` level is respected.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 20:50:55 -07:00
Travis Ralston
1ab5ff079c Set the SdkConfig values immediately after loading the config
This is to ensure that when we make a call to get the theme we'll have the SdkConfig available.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-16 20:50:29 -07:00
Matthew Hodgson
4c8f77bb80 buttonify verify buttons 2017-11-16 16:46:46 +00:00
Matthew Hodgson
58f2e51af5
Merge pull request #5615 from turt2live/travis/granular_bugs
Use SettingsStore to get the default theme
2017-11-16 13:08:48 +00:00
Luke Barnard
cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation
Refactor translations
2017-11-16 11:54:52 +00:00
pafcu
1e2e4397f7
Fix typo 2017-11-16 12:41:26 +01:00
Travis Ralston
42e601005f Use SettingsStore to get the default theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-15 19:09:03 -07:00
Stefan Parviainen
4949f2f763 Fix typo and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:43:45 +01:00
Stefan Parviainen
ae6c985d39 Add missing backtick
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 19:58:29 +01:00
Richard Lewis
53a793b8fd
Merge pull request #5605 from vector-im/rxl881/invertOutlineColour
TintableSvgButton styling
2017-11-15 18:35:09 +00:00
Luke Barnard
6f15c67d0b Merge branch 'master' into develop 2017-11-15 16:32:52 +00:00
Richard Lewis
ed3a6d29ac Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/invertOutlineColour 2017-11-15 16:25:14 +00:00
Matthew Hodgson
bbcf74f774 fix @lampholder's NPE for real 2017-11-15 15:55:33 +00:00
Richard Lewis
bfb4ae3083 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/invertOutlineColour 2017-11-15 15:09:38 +00:00
Richard Lewis
26231e458e Add green cancel icon. 2017-11-15 13:42:36 +00:00
Richard Lewis
10b17b7fd0 TintableSvgButton styling. 2017-11-15 13:04:58 +00:00
Luke Barnard
9664b4d176 Add Slovak to included languages 2017-11-15 12:14:30 +00:00
Luke Barnard
629a18ebef v0.13.0 2017-11-15 11:09:31 +00:00
Luke Barnard
7e5f80c9f7 Prepare changelog for v0.13.0 2017-11-15 11:09:30 +00:00
Luke Barnard
898bb6f9d8 v0.13.0 2017-11-15 11:08:37 +00:00
Luke Barnard
02c2e1a14c Bump js/react SDKs to releases 0.9.0 & 0.11.0 2017-11-15 11:03:20 +00:00
Matthew Hodgson
ffada4f6fe
Merge pull request #5468 from turt2live/travis/granular
Granular settings
2017-11-15 10:56:08 +00:00
Richard Lewis
1fc44a32c0 Fix SVG colours. Add rounded, lowlight outline for clarity. 2017-11-15 10:39:12 +00:00
Travis Ralston
a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07:00