241d95293e
Code style fixes
...
Use async/await consistently rather than flipping between that and
callbacks, s/var/let/, indenting
2017-05-23 16:44:54 +01:00
a6b11968a4
s/tabs/spaces/
2017-05-23 16:15:52 +01:00
3f3f230a77
Remove accidentally comitted yarn stuff
2017-05-23 14:20:51 +01:00
6b6fa59f3e
Squash merge https://github.com/vector-im/riot-web/pull/3636
2017-05-23 14:12:53 +01:00
8994c2bad1
missed a concat :)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:28:01 +01:00
e0fb2fd074
/me forgets we don't have babel
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:56 +01:00
4bb054c955
electron stuff isn't actually using flow, so don't enable it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:25:18 +01:00
911c3bcf6e
tidy electron files, they were starting to annoy me
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 19:21:52 +01:00
4944bfdaa2
onAction support in Electron process, disable powersave when in call
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:32:39 +01:00
f57d8e4cb9
make ESLint a touch happier
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:31:30 +01:00
755c66b9f1
pass dispatcher through to electron, on a whitelist basis
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-22 18:30:45 +01:00
998739a7dc
Edit icon and styling
2017-05-22 18:00:40 +01:00
7d59742a22
Merge pull request #3975 from vector-im/t3chguy/riot-desktopt-linux-cat
...
add menu category for linux build of app
2017-05-22 16:59:27 +01:00
6e8516e537
fiiine!
2017-05-22 16:53:46 +01:00
299dc7fe84
Merge branch 'develop' into new-guest-access
2017-05-22 16:17:36 +01:00
b057e8a92f
Merge pull request #3989 from vector-im/luke/new-guest-access-set-pwd-dialog-fuzzy
...
Add warm-fuzzy for successful password entry
2017-05-22 16:15:00 +01:00
9fc57786f1
Add warm-fuzzy for successful password entry
2017-05-22 16:11:52 +01:00
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
5d712d27d3
autoFocus new password input in SetPasswordDialog
2017-05-22 14:45:40 +01:00
73ec3e1f4d
Merge branch 'master' into develop
2017-05-22 11:44:31 +01:00
86bce146e8
v0.9.10
2017-05-22 11:41:10 +01:00
734a28e0f3
Prepare changelog for v0.9.10
2017-05-22 11:41:09 +01:00
5c4e3cec08
v0.9.10
2017-05-22 11:40:10 +01:00
c03d12238a
Released js-sdk & react-sdk
2017-05-22 11:39:25 +01:00
90ab4a02f2
add category so it doesn't get dropped into Default/Lost+Found
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-20 13:11:31 +01:00
cae62c8383
MessageTimestamp now has 12 hour prop
2017-05-19 22:36:02 +01:00
1ebe819aa2
Revert _EventTile.scss padding.
2017-05-19 22:29:20 +01:00
9e37fa46b1
Add 12 hour support
2017-05-19 22:29:20 +01:00
8afc9f9a09
Add widget iframes and styling
2017-05-19 17:17:48 +01:00
dc990f47be
Fix app breakage with a 'version' file
...
Re-add accidenally removed variable initialiser
2017-05-19 17:02:48 +01:00
a9b5282ba3
Merge pull request #3909 from vector-im/t3chguy/favicon_improvements
...
Electron Tray Improvements
2017-05-19 16:22:11 +01:00
d7f1e01cfa
Don't fail if reskindex symlink exists
2017-05-19 14:47:44 +01:00
0a920df05d
Merge pull request #3966 from vector-im/rav/more_deflakification
...
More riot-web test deflakification
2017-05-19 13:51:51 +01:00
ea67fa9c16
More riot-web test deflakification
...
Two changes:
1. wait longer for /sync to arrive in the loading tests, via an
`expectAndAwaitSync` method.
2. https://github.com/matrix-org/matrix-react-sdk/pull/773 made it possible for
MatrixChat to not show its syncing spinner despite `loading` being
false. Update `awaitSyncingSpinner` accordingly, so that it doesn't fail
when it happens to check MatrixChat at just taht moment.
2017-05-19 13:33:50 +01:00
50b46af943
Merge pull request #3945 from vector-im/dbkr/fetch_deps_script
...
Script to fetch corresponding branches of dependent projects
2017-05-19 13:14:07 +01:00
68a39b2783
Update process to not set deps to #develop
...
Update README instructions and add checks to release script to
prevent us forgetting to bump the versions of dependencies
(because the check in the main release script will only catch
references to #develop left in, which will no longer be the
failure mode).
2017-05-19 11:59:27 +01:00
448ac8dce1
Merge pull request #3964 from vector-im/luke/fix-logo-svgs-style-type
...
Add type="text/css" to SVG logos
2017-05-19 11:38:27 +01:00
76bf869d87
Add type="text/css" to SVG logos
...
Without this, SVG renderers may not pick up the CSS in the SVGs at all, as is the case with librsvg.
2017-05-19 11:19:30 +01:00
da14d7eb8c
v0.9.10-rc.1
2017-05-19 10:43:11 +01:00
3a44cb65b7
Prepare changelog for v0.9.10-rc.1
2017-05-19 10:43:10 +01:00
029dfe5ed0
v0.9.10-rc.1
2017-05-19 10:41:22 +01:00
c0c1972d56
Released js-sdk & react-sdk
2017-05-19 10:40:44 +01:00
09f987559b
rename action, now forwarding any event is possible, limited by where
...
button is shown, i.e easy to modify
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 01:30:36 +01:00
eaeac1230f
Merge branch 'develop' of github.com:vector-im/riot-web into forward_message
2017-05-19 01:15:31 +01:00
7777be89ee
only for finalised events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-18 23:53:37 +01:00
b886215fdd
Merge pull request #3958 from vector-im/rav/roomdirectory_unmounting
...
Fix some setState-after-unmount in roomdirectory
2017-05-18 19:06:18 +01:00
4d60d444d4
Merge pull request #3956 from vector-im/rav/deflakify
...
Attempt to deflakify joining test
2017-05-18 19:06:01 +01:00
53f0a6b360
Merge pull request #3959 from vector-im/luke/improve-country-dd-4
...
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:38:47 +01:00
d0adfb6469
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:03:27 +01:00
1460eae280
Change background colour of login country dd to white
2017-05-18 13:43:21 +01:00
David Baker