Commit Graph

62531 Commits

Author SHA1 Message Date
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
David Baker e4d35881f6 Merge pull request #915 from matrix-org/luke/new-guest-access-autoFocus-new-password
Add prop to toggle whether new password input is autoFocused
2017-05-22 15:19:56 +01:00
Luke Barnard a1f10ff46d Add prop to toggle whether new password input is autoFocused 2017-05-22 14:46:49 +01:00
Luke Barnard 5d712d27d3 autoFocus new password input in SetPasswordDialog 2017-05-22 14:45:40 +01:00
Richard Lewis e8837d28ef App tile and app dialog styling 2017-05-22 12:34:27 +01:00
Michael Telatynski 0d70f796e2 Merge pull request #914 from matrix-org/rav/key_formatting
Group e2e keys into blocks of 4 characters
2017-05-22 12:14:14 +01:00
Richard van der Hoff fc08dc33c6 Group e2e keys into blocks of 4 characters
Hopefully this will make them a bit easier to compare.
2017-05-22 12:01:09 +01:00
David Baker 73ec3e1f4d Merge branch 'master' into develop 2017-05-22 11:44:31 +01:00
David Baker 86bce146e8 v0.9.10 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
Richard van der Hoff 2ba7d91869 Merge pull request #913 from matrix-org/rav/factor_out_verify
Factor out DeviceVerifyDialog
2017-05-22 11:38:52 +01:00
David Baker f05de44646 Merge branch 'master' into develop 2017-05-22 11:37:29 +01:00
David Baker eadd6192e8 v0.8.9 2017-05-22 11:36:56 +01:00
David Baker 545bcbdc77 Prepare changelog for v0.8.9 2017-05-22 11:36:55 +01:00
David Baker 3a0ee385b8 Released js-sdk 2017-05-22 11:35:02 +01:00
Richard van der Hoff 574b820d11 Factor out DeviceVerifyDialog 2017-05-22 11:12:36 +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
Michael Telatynski 02a1c1868c autoFocus input box
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-20 00:08:53 +01:00
Kieran Gould 47e5e8d678 Moved isTwelveHour alllll the way up to TimelinePanel. 2017-05-19 23:04:37 +01:00
Kieran Gould 6b32975e0c Add 12 hour class to mx_EventTile 2017-05-19 22:36:13 +01:00
Kieran Gould cae62c8383 MessageTimestamp now has 12 hour prop 2017-05-19 22:36:02 +01:00
Kieran Gould f9152b205c Add parameter showTwelveHours to formatTime 2017-05-19 22:29:49 +01:00
Kieran Gould 5aa1bc4185 Rename twentyFourHour
Pad time
2017-05-19 22:29:49 +01:00
Maxwell Kepler 008cc95e9c Add 12 hour support 2017-05-19 22:29:49 +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
Michael Telatynski cc3673d2d2 Make the linked versions open a new tab, turt2live complained :P
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 17:39:21 +01:00
Richard Lewis 8afc9f9a09 Add widget iframes and styling 2017-05-19 17:17:48 +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
Richard van der Hoff 8eea8c0fd7 Merge pull request #909 from matrix-org/rav/fix_missing_page_type
Fix 'missing page_type' error
2017-05-19 15:22:18 +01:00
David Baker d7f1e01cfa Don't fail if reskindex symlink exists 2017-05-19 14:47:44 +01:00
Richard van der Hoff e3dbf057fb Fix 'missing page_type' error
LoggedInView will complain if it is instantiated without a page_type, so let's
keep showing the syncing spinner until we have one.
2017-05-19 14:09:20 +01:00
Richard van der Hoff c61294f71c Delintify some of MatrixChat (#907)
... it annoyed me too much.
2017-05-19 13:53:11 +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
Richard van der Hoff 4df51a2b0b Reskindex to a temp file, to confuse the babel watcher less (#908)
I'm seeing a lot of instances where the babel watcher picks up a half-written src/component-index,
and generates an empty lib file - which it then doesn't update when src/component-index is updated.

Empirically, this seems to make it better.
2017-05-19 11:44:04 +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 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