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

264 Commits

Author SHA1 Message Date
Matthew Hodgson 3d20a64502 export enum via method for convenience from matrix-react-sdk 2018-04-13 01:25:00 +01:00
Matthew Hodgson 3ecbfae371 move everything not explicitly riot (or status) branded into matrix-react-sdk 2018-04-11 23:49:52 +01:00
Luke Barnard 527e8306b2
Merge pull request #6317 from vector-im/dbkr/og_image_sort_of_configurable 
Remove og:image with status.im URL
 2018-03-15 09:21:12 +00:00
David Baker 96f374ed69 Remove og:image with status.im URL 
And make it configurable, albeit only at buuld time, as hopefully
explained in the README.
 2018-03-14 18:34:26 +00:00
Luke Barnard 647c7d7629 Fix themeing bug with Firefox where "disabled" ignored 
A bug in firefox means "disabled" isn't honoured when set in the
HTML. Doing `a.disabled = false` does work however, and Chrome
also appears to honour this.
 2018-03-12 16:15:17 +00:00
Matthew Hodgson aa54032500 force refresh when updating the app 2018-03-09 01:45:44 +00:00
Matthew Hodgson c315a59717
remove doubly-closed tag 2018-02-23 16:27:34 +00:00
rugk e3dcaebe9b
Merge branch 'develop' into patch-2 2018-02-15 13:16:34 +01:00
rugk ba7991deba
Fix syntax error of wrong use of self-closing HTML tag 
Firefox complaint about this in the source code view:
 2018-02-15 02:36:05 +01: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
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
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
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
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
Matthew Hodgson bbcf74f774 fix @lampholder's NPE for real 2017-11-15 15:55:33 +00:00
Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07: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 69b8ff8668 add fixme 2017-11-14 15:17:32 +00:00
Travis Ralston 977599a660 Use the SettingsStore to get the theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-13 13:14:29 -07:00
Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular 2017-11-13 12:25:56 -07:00
Matthew Hodgson 809dd0856f add more fixmes 2017-11-13 16:35:39 +00:00
Matthew Hodgson 0a80774066 unstatusify redirects 2017-11-13 16:26:26 +00:00
Matthew Hodgson 5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
Matthew Hodgson 2fa1f16284 use new theme-aware tinter api 2017-11-08 06:55:30 -08:00
Matthew Hodgson 555847e5e9 make default theme actually work 2017-11-05 00:40:13 +00:00
Matthew Hodgson 9a0bbfb871 tint the colours in the theme rather than hardcode vector green 2017-11-04 23:43:34 +00:00
Matthew Hodgson df58bdd529 use absolute url for og:image 2017-10-31 22:56:57 +00:00
Matthew Hodgson 1b7e42f5e8 add og:image 2017-10-31 22:45:19 +00:00
Travis Ralston f1c81be633 Import the right SettingsStore 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 22:18:34 -06:00
Travis Ralston ccf52b2a69 Convert local settings to granular settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 17:05:27 -06:00
David Baker 5063fef4f5 Redirect to instructions page if user on mobile 2017-10-27 19:08:35 +01:00
Matthew Hodgson 468f8ccab8 dirty hack to make FF work 2017-10-27 00:02:52 +01:00
Matthew Hodgson 6fa2d35630 support concept of default theme 2017-10-20 18:41:39 +01:00
David Baker 42ddafcfd4 comment 2017-10-19 10:03:47 +01:00
David Baker 137cf32d3b Use _t as _t 
Rather than through a languageHandler object. This way our
translation script knows about it.
 2017-10-18 19:39:51 +01:00
Robert Swain f79b8e0c71 ElectronPlatform: Import desktopCapturer explicitly 2017-09-25 17:19:04 +02:00
Robert Swain e8424d71db ElectronPlatform.js: Add Jitsi screensharing support 2017-09-04 09:33:08 +02:00
Kegsay 40a47f8c7a Allow Riot to load up different configs depending on the domain (#4575) 
Initially try to load `config.$domain.json` and only if that fails, load
`config.json`. Configs are not muxxed in any way, it either entirely uses
the domain config, or entirely uses `config.json`.
 2017-07-14 15:05:07 +01:00
Richard van der Hoff 4c5b5ca0ba replace `q.Promise` with `new Promise` 2017-07-13 00:50:01 +01:00
Richard van der Hoff d5b550f89a replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff b29b4a959b q(...) -> Promise.resolve 
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff 10decf95f6 replace imports of `q` with bluebird 
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-13 00:48:31 +01:00
Richard van der Hoff cc56ef3abd Attempt to flush the rageshake logs on close 
... so that we get to see what happened in the last 30s.
 2017-06-22 18:25:19 +01:00