Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,242 Commits 206 Branches 552 Tags 519 MiB
24584bee4a
Commit Graph

3242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
24584bee4a Merge pull request #3982 from vector-im/luke/new-guest-access-autoFocus-new-password 
autoFocus new password input in SetPasswordDialog
 2017-05-22 15:57:45 +01:00
Luke Barnard
5d712d27d3 autoFocus new password input in SetPasswordDialog 2017-05-22 14:45:40 +01:00
Luke Barnard
219bfffea2 Only dispatch password_changed when password has changed 2017-05-16 14:24:09 +01:00
Luke Barnard
c6ff45261d Merge pull request #3921 from vector-im/luke/new-guest-access-set-pwd-dialog 
Implement dialog to set password
 2017-05-16 14:05:03 +01:00
Luke Barnard
11d88aa6a2 import dispatcher 2017-05-16 13:56:12 +01:00
Luke Barnard
36ec39ffc0 Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog 2017-05-16 13:49:18 +01:00
Luke Barnard
48856c31f8 Dispatch password_changed when SetPasswordDialog finished 2017-05-16 13:48:56 +01:00
Luke Barnard
e367fb5a98 disabledConfirmation -> confirm 2017-05-16 12:45:30 +01:00
Luke Barnard
e6f6b8cebd Merge pull request #3924 from vector-im/luke/new-guest-access-need-to-set-mx-id 
Replace NeedToRegister with SetMxId dialog
 2017-05-16 11:48:24 +01:00
Luke Barnard
79d32868a6 Replace NeedToRegister with SetMxId dialog 2017-05-16 11:39:30 +01:00
Luke Barnard
5814a3fdc8 Fix copyright 2017-05-16 10:11:44 +01:00
Luke Barnard
0e787a09c3 Implement dialog to set password 
Until https://github.com/matrix-org/matrix-react-sdk/pull/881, ChangePassword will not know about the cached password (so it won't hide "Current Password" yet).

There's also a bit of work left - informing the SessionStore that the password has changed (marked with a TODO)
 2017-05-16 09:44:52 +01:00
Luke Barnard
67297bf827 Merge pull request #3906 from vector-im/luke/new-guest-access-welcome-user 
Add welcomeUserId to sample config
 2017-05-12 19:17:33 +01:00
Luke Barnard
f60be2d658 Add welcomeUserId to sample config 2017-05-12 16:12:17 +01:00
Luke Barnard
607ba57f48 Merge branch 'develop' into new-guest-access 
Conflicts:
	src/component-index.js
 2017-05-11 13:23:31 +01:00
Luke Barnard
0e0918d07c Merge pull request #3888 from vector-im/pr/3799 
move manifest.json outward so it is scoped properly
 2017-05-11 13:20:33 +01:00
Michael Telatynski
3c5594e034 move manifest.json outward so it is scoped properly 
this will matter more when we add a service worker

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 13:12:26 +01:00
Luke Barnard
15db686f33 Merge pull request #3799 from t3chguy/manifest 
add to manifest
 2017-05-11 13:05:00 +01:00
Michael Telatynski
ffa53ca205 Update manifest.json 2017-05-11 11:17:55 +01:00
Luke Barnard
4c0e8cd372 Merge pull request #3886 from vector-im/luke/auto-reskindex 
Automatically update component-index
 2017-05-11 10:47:06 +01:00
Luke Barnard
6d94f35c33 Automatically update component-index 
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
 2017-05-11 10:37:13 +01:00
Luke Barnard
ee33490553 Merge pull request #3885 from vector-im/luke/new-guest-access-set-mxid-4 
CSS for mxIdDialog redesign
 2017-05-11 10:28:23 +01:00
Luke Barnard
d2ea162b3f Unmuddle the component-index header 2017-05-11 10:11:30 +01:00
Luke Barnard
2eccdf56b9 Merge branch 'develop' into new-guest-access 2017-05-11 09:50:13 +01:00
Luke Barnard
ab24994e37 Move general CSS to more specific so as not to affect other dialogs 2017-05-11 09:42:21 +01:00
Luke Barnard
98f62d0300 NL at EOF 2017-05-11 09:40:06 +01:00
Luke Barnard
2e49014ffe CSS for mxIdDialog redesign 2017-05-11 09:33:52 +01:00
David Baker
e67e891040 Merge pull request #3877 from vector-im/t3chguy/electron_install_fix 
move electron -> electron_app because npm smart
 2017-05-10 13:48:18 +01:00
Michael Telatynski
c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module 
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 13:36:27 +01:00
Richard van der Hoff
41738ec025 Merge pull request #3863 from vector-im/rav/bug_report_endpoint 
Fix bug report endpoint in config.sample.json.
 2017-05-09 12:34:40 +01:00
Richard van der Hoff
f9ae456a64 Fix bug report endpoint in config.sample.json. 
Not sure why this was like this - has vector.im/bugs *ever* worked?
 2017-05-09 12:27:41 +01:00
David Baker
1b78737f12 Merge pull request #3817 from vector-im/luke/password-nag-bar 
Implement PasswordNagBar
 2017-05-08 15:00:37 +01:00
David Baker
2983b36d4c Merge pull request #3851 from vector-im/dbkr/missed_icons 
Update 2 missed icons to the new icon
 2017-05-08 13:12:00 +01:00
David Baker
640aa98cf4 Update 2 missed icons to the new icon 
Electron icons for windows & Linux. Also add them to the script
that makes all the icon versions.
 2017-05-08 13:05:17 +01:00
David Baker
e6133820a2 Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2 
Make left panel better for new users (mk II)
 2017-05-08 10:37:59 +01:00
Luke Barnard
5766a6e93d Give warning icon better alt 2017-05-08 10:02:05 +01:00
Luke Barnard
c783f701dd reskindex 2017-05-08 10:01:18 +01:00
Matthew Hodgson
d1db602b3a Merge pull request #3839 from vector-im/t3chguy/patch-1 
match primary package.json
 2017-05-07 20:34:18 +01:00
Michael Telatynski
ea72e9c7a0 match primary package.json 
got mismatched after a release -> develop merge
 2017-05-07 20:33:13 +01:00
Matthew Hodgson
8e94d5240f merge master into develop post 0.9.9 2017-05-07 19:58:42 +01:00
Matthew Hodgson
1e5908a31e speed up burndown generation by ~250x 2017-05-07 19:34:16 +01:00
David Baker
40c98fc84f Merge pull request #3829 from vector-im/t3chguy/productName-missing 
Re-add productName
 2017-05-06 12:20:30 +01:00
Michael Telatynski
9c6b3819a5 Re-add productName 
so that electron-builder packages is as Riot rather than riot-web
 2017-05-06 10:24:13 +01:00
David Baker
6013a3e71d Merge pull request #3683 from t3chguy/t3chguy/electron_version_inconsistency 
Remove leading v in /version file, for SemVer and to match Electron ver
 2017-05-05 18:28:16 +01:00
David Baker
0deed1b511 Merge pull request #3790 from t3chguy/patch-2 
Fix scope of callback
 2017-05-05 18:25:29 +01:00
David Baker
2c36506342 Merge pull request #3622 from t3chguy/t3chguy/electron-persist-window-layout 
Remember and Recall window layout/position state
 2017-05-05 18:23:15 +01:00
Michael Telatynski
309afdb813 no point installing deps here, builder will do it for us 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:08:50 +01:00
Michael Telatynski
1ed1080bf3 Update README with npm run electron 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:05:03 +01:00
Michael Telatynski
a09f890619 Merge package.json, match version in electron/package.json 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:03:28 +01:00
Michael Telatynski
499b04c254 Only install electron deps when we're bundling/running electron 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-05 17:01:32 +01:00