Michael Telatynski
6e8516e537
fiiine!
2017-05-22 16:53:46 +01:00
Luke Barnard
299dc7fe84
Merge branch 'develop' into new-guest-access
2017-05-22 16:17:36 +01:00
David Baker
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
Luke Barnard
9fc57786f1
Add warm-fuzzy for successful password entry
2017-05-22 16:11:52 +01:00
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
David Baker
73ec3e1f4d
Merge branch 'master' into develop
2017-05-22 11:44:31 +01:00
David Baker
86bce146e8
v0.9.10
2017-05-22 11:41:10 +01:00
David Baker
734a28e0f3
Prepare changelog for v0.9.10
2017-05-22 11:41:09 +01:00
David Baker
5c4e3cec08
v0.9.10
2017-05-22 11:40:10 +01:00
David Baker
c03d12238a
Released js-sdk & react-sdk
2017-05-22 11:39:25 +01:00
Michael Telatynski
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
Kieran Gould
cae62c8383
MessageTimestamp now has 12 hour prop
2017-05-19 22:36:02 +01:00
Kieran Gould
1ebe819aa2
Revert _EventTile.scss padding.
2017-05-19 22:29:20 +01:00
Maxwell Kepler
9e37fa46b1
Add 12 hour support
2017-05-19 22:29:20 +01:00
David Baker
dc990f47be
Fix app breakage with a 'version' file
...
Re-add accidenally removed variable initialiser
2017-05-19 17:02:48 +01:00
David Baker
a9b5282ba3
Merge pull request #3909 from vector-im/t3chguy/favicon_improvements
...
Electron Tray Improvements
2017-05-19 16:22:11 +01:00
David Baker
d7f1e01cfa
Don't fail if reskindex symlink exists
2017-05-19 14:47:44 +01:00
Richard van der Hoff
0a920df05d
Merge pull request #3966 from vector-im/rav/more_deflakification
...
More riot-web test deflakification
2017-05-19 13:51:51 +01:00
Richard van der Hoff
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
David Baker
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
David Baker
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
Luke Barnard
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
Luke Barnard
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
David Baker
da14d7eb8c
v0.9.10-rc.1
2017-05-19 10:43:11 +01:00
David Baker
3a44cb65b7
Prepare changelog for v0.9.10-rc.1
2017-05-19 10:43:10 +01:00
David Baker
029dfe5ed0
v0.9.10-rc.1
2017-05-19 10:41:22 +01:00
David Baker
c0c1972d56
Released js-sdk & react-sdk
2017-05-19 10:40:44 +01:00
Michael Telatynski
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
Michael Telatynski
eaeac1230f
Merge branch 'develop' of github.com:vector-im/riot-web into forward_message
2017-05-19 01:15:31 +01:00
Michael Telatynski
7777be89ee
only for finalised events
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-18 23:53:37 +01:00
Richard van der Hoff
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
Richard van der Hoff
4d60d444d4
Merge pull request #3956 from vector-im/rav/deflakify
...
Attempt to deflakify joining test
2017-05-18 19:06:01 +01:00
Luke Barnard
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
Luke Barnard
d0adfb6469
CSS for left_aligned Dropdowns, and adjustments for Country dd in Login
2017-05-18 14:03:27 +01:00
Luke Barnard
1460eae280
Change background colour of login country dd to white
2017-05-18 13:43:21 +01:00
Richard van der Hoff
86055bc476
Fix some setState-after-unmount in roomdirectory
...
Give the RoomDirectory and unmounted guard, and use it to avoid some setState
warnings. Also, cancel the filterTimeout (no point in leaving it around).
There are still plenty of other opportunities to setState after unmount, but
the filterTimeout was causing noise in the test.
2017-05-18 13:41:54 +01:00
Richard van der Hoff
f16086bbea
Attempt to deflakify joining test
...
give the client a bit longer to get started.
2017-05-18 13:39:33 +01:00
Richard van der Hoff
f60773ae1f
mock-request: improve logging
...
attempt to make the logging a bit more comprehensible
2017-05-18 13:37:23 +01:00
Luke Barnard
01a15b2b7e
Merge pull request #3953 from vector-im/luke/improve-country-dd-3-square-flags
...
Add square flag pngs /w genflags.sh script
2017-05-18 13:37:17 +01:00
David Baker
5526525b6b
Merge pull request #3954 from vector-im/dbkr/riot_bot_for_desktop
...
Add config for riot-bot on desktop app build
2017-05-18 13:18:19 +01:00
Richard van der Hoff
a39a7c8334
Update to more recent mock-request
...
Just copy-and-paste the updated version from js-sdk in here.
2017-05-18 12:18:57 +01:00
David Baker
c9e821ffc5
Add config for riot-bot on desktop app build
...
Also remove unused room dir stuff
2017-05-18 12:00:02 +01:00
Luke Barnard
b290a28123
Merge pull request #3952 from vector-im/dbkr/electron_copy_link_location
...
Desktop: 'copy link address'
2017-05-18 11:49:41 +01:00
David Baker
16899d3b1f
Bump electron version to 1.6.8
2017-05-18 11:38:03 +01:00
Luke Barnard
7d81ade563
genflags.sh should be run from root dir
2017-05-18 11:38:01 +01:00
Luke Barnard
bc5ad3c761
Move genflags.sh to scripts
2017-05-18 11:36:24 +01:00
Luke Barnard
7c764b7365
Add copyright
2017-05-18 11:34:26 +01:00
David Baker
dfb30e91de
Desktop: 'copy link address'
...
Add 'copy link address' to link context menu in electron app
2017-05-18 11:32:10 +01:00
Luke Barnard
ea03140cbd
Add ellipsis overflow to long dd options
2017-05-18 11:30:22 +01:00
