7d1940620d
Add (watching) reskindex to npm start
...
also add reskindex in non-watching mode to `npm run build`
2017-05-08 15:07:58 +01:00
2eaaa97451
Give reskindex.js a watch mode (-w)
...
`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.
This depends on `chokidar`
2017-05-08 15:07:05 +01:00
1b78737f12
Merge pull request #3817 from vector-im/luke/password-nag-bar
...
Implement PasswordNagBar
2017-05-08 15:00:37 +01:00
1addc7e2c5
Update header copyright
2017-05-08 14:56:38 +01:00
ca7989a1fd
.gitignore auto-generated component-index
2017-05-08 14:55:55 +01:00
d1f467ee91
Remove auto-generated component-index
...
This will now be generated as part of the build process (`npm run build`) and whilst developing (`npm run start`).
2017-05-08 14:53:00 +01:00
39323647d1
Don't show null URL previews
...
These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.
2017-05-08 14:01:44 +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
11d039477d
Merge pull request #869 from matrix-org/dbkr/addressselector_keys
...
Fix keys for AddressSelector
2017-05-08 12:47:52 +01:00
cafbe14589
Fix keys for AddressSelector
...
Was using a property which just did not exist.
2017-05-08 11:59:06 +01:00
c841eb641b
Fix 'start chat' button
2017-05-08 11:26:25 +01:00
53796f55be
Added default_federate property
2017-05-08 12:25:45 +02:00
17262ad80d
Added TextInputWithCheckbox dialog
2017-05-08 12:18:31 +02: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
3366d3bbae
Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:55 +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
69382d36b1
Merge pull request #864 from matrix-org/luke/show-pwd-nag-bar
...
Show password nag bar when user is PWLU
2017-05-08 09:52:04 +01:00
bd32df4ef6
comment wording
2017-05-07 20:58:30 +01:00
360f1cd250
completely missed the ESC check
...
I need sleep
2017-05-07 20:57:54 +01:00
78e7272344
Fixes 2 issues with Dialog closing
...
+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
2017-05-07 20:43:42 +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
ceb71a4ef6
Merge pull request #866 from t3chguy/warn_on_unload
...
Explicitly save composer content onUnload
2017-05-07 20:07:09 +01:00
a141350670
Explicitly save composer content onUnload
...
small oversight, caught by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-07 20:01:55 +01:00
f056360f70
merge master post release
2017-05-07 20:01:11 +01:00
8e94d5240f
merge master into develop post 0.9.9
2017-05-07 19:58:42 +01:00
1e5908a31e
speed up burndown generation by ~250x
2017-05-07 19:34:16 +01:00
5900c879ce
Merge pull request #851 from t3chguy/warn_on_unload
...
Warn on unload
2017-05-07 18:17:18 +01:00
2b2b43a7f3
Content in Composer is not lost on unload so it should be fine
...
to scare the user thinking they have lost all of their content
even though when they come back they can cry with joy :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-07 18:16:10 +01:00
40c98fc84f
Merge pull request #3829 from vector-im/t3chguy/productName-missing
...
Re-add productName
2017-05-06 12:20:30 +01:00
9c6b3819a5
Re-add productName
...
so that electron-builder packages is as Riot rather than riot-web
2017-05-06 10:24:13 +01:00
2b71123ddc
suppress null member rejoins again
...
reverts https://github.com/matrix-org/matrix-react-sdk/commit/f5fe4b24336a8245b5a08050fefe13b9999d92fb
should fix https://github.com/vector-im/riot-web/issues/3788
2017-05-06 01:45:37 +01:00
b944fff5c5
unscrew merge
2017-05-05 20:57:18 +01:00
110ca22c4c
Merge branch 'develop' into webrtc_settings
2017-05-05 20:56:20 +01:00
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
0deed1b511
Merge pull request #3790 from t3chguy/patch-2
...
Fix scope of callback
2017-05-05 18:25:29 +01:00
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
1a0ea29995
Remove redundant role elements
2017-05-05 17:51:14 +01:00
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
1ed1080bf3
Update README with npm run electron
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-05 17:05:03 +01:00
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
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
8a50207189
Change shebang to bash for string manipulations
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-05 16:57:18 +01:00
f54708227e
Proper two package.json format, release.sh bumps 2nd json ver too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-05-05 16:54:55 +01:00
6f4eb9d8b1
Show password nag bar when user is PWLU
2017-05-05 16:31:33 +01:00
f14c2a0a71
Implement PasswordNagBar
...
This will tell the user that they need to set a password to return to their account.
2017-05-05 16:30:18 +01:00
4fc4ae1e99
Size is a string, import react
...
React gets put in by the JSX transpile
2017-05-05 14:56:26 +01:00
28e0a32d6c
Merge pull request #862 from matrix-org/rav/log_device_id
...
Log deviceid at login
2017-05-05 14:52:49 +01:00
Luke Barnard
David Baker
David Baker
Pablo Saavedra
Luke Barnard
Michael Telatynski
Matthew Hodgson
Michael Telatynski
Matthew Hodgson
Richard van der Hoff