nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,585 Commits 258 Branches 582 Tags
38e5eeea00a56d548dee683eaaf9158ce335175d
Commit Graph

62585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
5258bf9c84 Update README now the js-sdk has a transpile step 2017-01-11 17:25:58 +00:00
David Baker
10f0631487 Build the js-sdk in the CI script 
now it's transpiled
 2017-01-11 17:20:27 +00:00
David Baker
a4aa74e85a Build the js-sdk in the CI script 
now it's transpiled
 2017-01-11 17:18:37 +00:00
David Baker
1f96467145 Merge pull request #609 from matrix-org/luke/fix-join-part-collapsing-redacted-joins 
Fix redacted member events being visible
 2017-01-11 17:10:35 +00:00
David Baker
4e1af30186 Merge pull request #611 from matrix-org/luke/fix-join-part-collapsing-use-state-key 
Use `getStateKey` instead of `getSender`
 2017-01-11 17:09:14 +00:00
Luke Barnard
baaf827c48 Use getStateKey instead of getSender 
This makes sure that the kickee is not the user used for the MemberEventListSummary
 2017-01-11 17:03:14 +00:00
David Baker
97fc92b1bb Update to electron 1.4.14 
This pulls in the chrome change that broke geotrust ssl when the
build hit 10 weeks old, so let's get this one out before we hit
more disasters.
 2017-01-11 16:53:01 +00:00
Luke Barnard
32185befc0 Only transform <font> 2017-01-11 16:41:05 +00:00
Luke Barnard
8e3f2eb858 Allow [bf]g colors for <font> style attrib 
Instead of dropping the style attribute on `<font>` tags entirely, sanitise aggressively and only keep `background-color` and `color` keys, and also sanitise the values to prevent `url(XXXXXX)` and `expression(XXXXXX)` type XSS attacks.
 2017-01-11 16:35:37 +00:00
David Baker
06718c580e Hopefully fix Windows shortcuts 
* Revert 79d164309f
   as it seems to break shortcuts altogether
 * Update electron-builder (and add the squirrel windows package
   that the newer version now requires: it's been split out). This
   uses a newer version of squirrel which has some fixes for
   shortcuts.

I'm unsure exactly what was going wrong originally in
https://github.com/vector-im/riot-web/issues/2775 but #79d1643
seems to break shortcut creation as far as I can see.
 2017-01-11 16:27:40 +00:00
David Baker
15528ef8d7 Merge pull request #2915 from vector-im/dbkr/use_dev_tools_role 
Use the role for 'toggle dev tools'
 2017-01-11 14:50:15 +00:00
Luke Barnard
6e2a75bbee Fix redacted member events being visible 
This was due to the `MemberEventListSummary` not ignoring redacted joins/leaves. This was also causing bug #2765.
 2017-01-11 11:27:07 +00:00
David Baker
b71f96e4e5 Use the role for 'toggle dev tools' 
Let electron handle it rather than doing it ourselves
 2017-01-11 10:28:04 +00:00
David Baker
278de1398b Merge pull request #2909 from vector-im/dbkr/enable_screen_sharing 
Enable screen sharing easter-egg in desktop app
 2017-01-11 10:12:57 +00:00
David Baker
e95f5b959f Merge pull request #608 from matrix-org/dbkr/move_screen_sharing_error 
Move screen sharing error check into platform
 2017-01-11 10:12:51 +00:00
David Baker
37d9108ceb Add error popup if screen sharing fails 2017-01-11 10:06:48 +00:00
David Baker
c5459a2f19 Enable screen sharing easter-egg in desktop app 2017-01-10 18:39:21 +00:00
David Baker
a16aae1124 Move screen sharing error check into platform 
Because on the browser it depends on HTTPS, on electron it doesn't
matter.
 2017-01-10 18:37:57 +00:00
David Baker
085f134e84 Merge pull request #606 from matrix-org/dbkr/fix_forgot_password_create_account 
Fix 'create account' link in 'forgot password'
 2017-01-10 15:27:51 +00:00
David Baker
13a5337e0f Fix 'create account' link in 'forgot password' 
Fixes https://github.com/vector-im/riot-web/issues/2853
 2017-01-10 15:16:39 +00:00
Matthew Hodgson
c1d4a0dd28 postcss experiment 2017-01-10 11:06:45 +00:00
Matthew Hodgson
691fe611d6 experimental postcss 2017-01-10 11:06:09 +00:00
Sijmen Schoon
ef88e02931 Add support for pasting into the text box 
Only supports the new rich-text-supporting text editor
 2017-01-08 02:21:36 +01:00
Richard van der Hoff
6a1af891b7 Use a custom script to copy resources (#2893) 
All of those cpx invocations were getting unwieldy, and I suspect the exotic
quoting needed to run them under parallelshell was breaking things on windows.

Replace the unwieldy cpx invocations with an unwieldy custom script.
 2017-01-06 10:43:13 +00:00
rubo77
85040a2e6d Hide Options button from copy to clipboard 2017-01-05 23:18:56 +01:00
Matthew Hodgson
35b3013386 fix up a few more colours 2016-12-31 14:27:44 +00:00
Hubert Chathi
d1a9695a35 update README to point to new names/locations 2016-12-28 20:57:31 -05:00
Matthew Hodgson
c6beaa1631 initial stab at an official dark theme via the magic of SASS. 
SVGs are all broken, and some of the more exotic colours haven't been updated. There's been no attempt to use SASS to remove duplication from the CSS yet.
no attempt to switch it at runtime yet.
 2016-12-28 04:06:10 +00:00
Matthew Hodgson
33f0eaada0 autogen _components.css 2016-12-28 02:02:23 +00:00
Matthew Hodgson
c5fa84cd28 autogenerate the _components.scss index 2016-12-28 02:02:05 +00:00
Matthew Hodgson
bacb284415 basic jig for SASS-based themed CSS (one bundle per theme) 2016-12-28 02:01:28 +00:00
Richard van der Hoff
42de77e588 Remove "Cannot re-join empty room" error 
This is a lying error message. burn it with fire
 2016-12-27 19:17:48 +00:00
Kevin McDonald
650269d356 Add ISSUE_TEMPLATE 2016-12-26 21:33:27 -07:00
Matthew Hodgson
9c4671568d fix disasterous thinko in 69b277b282 2016-12-24 22:33:04 +00:00
Matthew Hodgson
b0319ec0f1 merge 2016-12-24 19:32:29 +00:00
Matthew Hodgson
6e0f83a298 Merge branch 'release-v0.9.5' 2016-12-24 19:29:42 +00:00
Matthew Hodgson
747408871d v0.9.5 v0.9.5 2016-12-24 19:07:31 +00:00
Matthew Hodgson
0129da4dd6 Prepare changelog for v0.9.5 2016-12-24 19:07:30 +00:00
Matthew Hodgson
3f3772463b bump react dep 2016-12-24 19:04:00 +00:00
Matthew Hodgson
4de042bf58 empirically fix win32 shortcut in start menu 2016-12-24 19:03:46 +00:00
Matthew Hodgson
8c523be6f5 add gnu-tar to debian electron build deps 2016-12-24 19:03:46 +00:00
Matthew Hodgson
078493912c make electron send email validation URLs with a nextlink of riot.im rather than file:/// 2016-12-24 19:03:46 +00:00
Matthew Hodgson
97514cf80e Merge branch 'master' into develop 2016-12-24 19:03:42 +00:00
Matthew Hodgson
45bfb93f17 v0.8.4 2016-12-24 19:03:08 +00:00
Matthew Hodgson
b88afab7af Prepare changelog for v0.8.4 2016-12-24 19:03:07 +00:00
Matthew Hodgson
cbf105f2a0 Revert "bump to dep on react-sdk 0.8.3-electron" 
This reverts commit bba6664b1c.
 2016-12-24 18:59:41 +00:00
Matthew Hodgson
bba6664b1c bump to dep on react-sdk 0.8.3-electron 2016-12-24 18:58:42 +00:00
Matthew Hodgson
223caae842 Merge branch 'master' into develop 2016-12-24 18:54:00 +00:00
Matthew Hodgson
1976bb70bd v0.8.3-electron 2016-12-24 18:53:24 +00:00
Matthew Hodgson
2e888f7f27 Prepare changelog for v0.8.3-electron 2016-12-24 18:53:24 +00:00