36ec39ffc0
Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog
2017-05-16 13:49:18 +01:00
48856c31f8
Dispatch password_changed when SetPasswordDialog finished
2017-05-16 13:48:56 +01:00
aff1e14efc
first go at show redact only if we can redact
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-16 13:15:14 +01:00
e367fb5a98
disabledConfirmation -> confirm
2017-05-16 12:45:30 +01:00
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
79d32868a6
Replace NeedToRegister with SetMxId dialog
2017-05-16 11:39:30 +01:00
5814a3fdc8
Fix copyright
2017-05-16 10:11:44 +01:00
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
c8ac60768d
Merge pull request #3919 from vector-im/t3chguy/patch-1
...
fix #3894
2017-05-15 21:15:03 +01:00
cef26a5b20
fix #3894
2017-05-15 21:14:01 +01:00
fe61a7eefd
fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738
2017-05-15 02:32:25 +01:00
582a34c937
cursor pointer for avatar upload in user settings
2017-05-15 02:24:34 +01:00
5181eb3ea5
Merge pull request #3894 from vector-im/t3chguy/change_release_vector2riot
...
change vector->riot on the surface
2017-05-15 01:43:57 +01:00
c3477a30a7
oops, rebuild modernizr to pull in new tests
2017-05-15 01:22:32 +01:00
8e2e6cee35
require indexeddb & webworkers in modernizr
2017-05-15 01:07:25 +01:00
25a727b8d8
use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874
2017-05-15 00:26:02 +01:00
aa7728cad3
tidy up tray.js - it made my eyes hurt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:41:13 +01:00
808240eef9
shouldn't need this try-catch
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:40:17 +01:00
6aae97b812
Update tray tooltip based on document.title
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:39:55 +01:00
8927afca03
re-add electron node modules to gitignore
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:37:27 +01:00
bbda658b7f
make Electron tray icon mimic the Favico.js one
...
DRY: moved Favicon stuff into the base platform
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-13 12:37:13 +01:00
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
f60be2d658
Add welcomeUserId to sample config
2017-05-12 16:12:17 +01:00
ea0b166da7
change wording to not confuse users building repo
...
change default repos to match their current naming
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:49:31 +01:00
f248477f82
stage 0.5 rebrand (rename dist release)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-11 17:46:08 +01:00
607ba57f48
Merge branch 'develop' into new-guest-access
...
Conflicts:
src/component-index.js
2017-05-11 13:23:31 +01:00
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
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
15db686f33
Merge pull request #3799 from t3chguy/manifest
...
add to manifest
2017-05-11 13:05:00 +01:00
ffa53ca205
Update manifest.json
2017-05-11 11:17:55 +01:00
4c0e8cd372
Merge pull request #3886 from vector-im/luke/auto-reskindex
...
Automatically update component-index
2017-05-11 10:47:06 +01:00
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
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
d2ea162b3f
Unmuddle the component-index header
2017-05-11 10:11:30 +01:00
2eccdf56b9
Merge branch 'develop' into new-guest-access
2017-05-11 09:50:13 +01:00
ab24994e37
Move general CSS to more specific so as not to affect other dialogs
2017-05-11 09:42:21 +01:00
98f62d0300
NL at EOF
2017-05-11 09:40:06 +01:00
2e49014ffe
CSS for mxIdDialog redesign
2017-05-11 09:33:52 +01:00
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
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
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
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
1b78737f12
Merge pull request #3817 from vector-im/luke/password-nag-bar
...
Implement PasswordNagBar
2017-05-08 15:00:37 +01:00
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
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
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
5766a6e93d
Give warning icon better alt
2017-05-08 10:02:05 +01:00
c783f701dd
reskindex
2017-05-08 10:01:18 +01:00
d1db602b3a
Merge pull request #3839 from vector-im/t3chguy/patch-1
...
match primary package.json
2017-05-07 20:34:18 +01:00
ea72e9c7a0
match primary package.json
...
got mismatched after a release -> develop merge
2017-05-07 20:33:13 +01:00
Luke Barnard