gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,437 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

5437 Commits

Author SHA1 Message Date
Michael Telatynski 26269986f5
move piwik whitelists to conf and add piwik config.json info to readme 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-19 15:36:28 +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
Michael Telatynski b00cf8c939
add dark theme styling to devtools input box 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-15 17:13:39 +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
Matthew Hodgson 142a9d7549 fix buttons on dark theme 2017-11-15 01:56:32 +00:00
Matthew Hodgson bd89fe59c0 remove blue halos everywhere 2017-11-15 01:46:18 +00:00
Matthew Hodgson 86509abbfb no need to retint explicitly after changing theme 2017-11-15 01:46:11 +00:00
Matthew Hodgson 9f61cb8137 turns out that we /do/ use tertiaryAccentColor after all 2017-11-15 00:57:53 +00:00
Matthew Hodgson 3e72d8d969
Merge pull request #5286 from turt2live/travis/presence 
CSS/components for custom presence controls
 2017-11-14 23:53:26 +00:00
Stefan Parviainen fcd58a2544 Update translating docs 2017-11-14 22:50:27 +01:00
Stefan Parviainen ca4b71b6e2 Update to use newer _t() 2017-11-14 21:54:00 +01:00
Richard Lewis aceabd6d28
Merge pull request #5574 from vector-im/rxl881/appTileStyling 
Set widget tile background colour
 2017-11-14 19:33:37 +00:00
Richard Lewis 81ef9b143c Add widget menubar styling 2017-11-14 18:44:10 +00:00
Richard Lewis 93eab05239 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appTileStyling 2017-11-14 18:14:36 +00:00
Matthew Hodgson 534504b618
Merge pull request #5573 from vector-im/rxl881/visualCue 
Widget styling tweaks
 2017-11-14 18:05:27 +00:00
Matthew Hodgson bea95fde3a
Merge pull request #5567 from vector-im/rxl881/mixedContentWarnings 
Center mixed content warnings in panel.
 2017-11-14 18:03:08 +00:00
Richard Lewis cf2850834e Add apps drawer bottom margin. 2017-11-14 17:32:01 +00:00
Richard Lewis e3bdcf4d0d Remove unused edit_white icon 2017-11-14 15:42:29 +00:00
Richard Lewis 940f229102 Fix edit icon colors and add green edit icon. 2017-11-14 15:20:57 +00:00