867f8914e1
Merge pull request #917 from matrix-org/dbkr/use_right_riot_branch
...
Make travis test against riot-web new-guest-access
2017-05-22 16:59:17 +01:00
f2e526f1d5
Merge pull request #916 from matrix-org/dbkr/use_right_riot_branch
...
Add right-branch logic to travis test script
2017-05-22 16:57:03 +01:00
52d3dd4de9
cd first so we checkout the right repo
2017-05-22 16:48:53 +01:00
c5a873c316
Remove depth=1 otherwise we won't find the branch
2017-05-22 16:41:43 +01:00
77cd9d78db
Use develop if no matching branch found
2017-05-22 16:34:15 +01:00
b0a824c941
Remove double declaration of TextInputDialog
2017-05-22 16:28:23 +01:00
2c462bdfb4
Add right-branch logic to travis test script
2017-05-22 16:27:41 +01:00
05aaa599cc
Merge branch 'develop' into new-guest-access
...
Conflicts:
src/components/structures/MatrixChat.js
2017-05-22 16:19:10 +01:00
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
a1f10ff46d
Add prop to toggle whether new password input is autoFocused
2017-05-22 14:46:49 +01:00
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
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
2ba7d91869
Merge pull request #913 from matrix-org/rav/factor_out_verify
...
Factor out DeviceVerifyDialog
2017-05-22 11:38:52 +01:00
f05de44646
Merge branch 'master' into develop
2017-05-22 11:37:29 +01:00
eadd6192e8
v0.8.9
2017-05-22 11:36:56 +01:00
545bcbdc77
Prepare changelog for v0.8.9
2017-05-22 11:36:55 +01:00
3a0ee385b8
Released js-sdk
2017-05-22 11:35:02 +01:00
574b820d11
Factor out DeviceVerifyDialog
2017-05-22 11:12:36 +01:00
02a1c1868c
autoFocus input box
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-20 00:08:53 +01:00
47e5e8d678
Moved isTwelveHour alllll the way up to TimelinePanel.
2017-05-19 23:04:37 +01:00
6b32975e0c
Add 12 hour class to mx_EventTile
2017-05-19 22:36:13 +01:00
f9152b205c
Add parameter `showTwelveHours` to formatTime
2017-05-19 22:29:49 +01:00
5aa1bc4185
Rename twentyFourHour
...
Pad time
2017-05-19 22:29:49 +01:00
008cc95e9c
Add 12 hour support
2017-05-19 22:29:49 +01:00
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
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
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
c61294f71c
Delintify some of MatrixChat ( #907 )
...
... it annoyed me too much.
2017-05-19 13:53:11 +01:00
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
1addd6e304
v0.8.9-rc.1
2017-05-19 10:39:14 +01:00
4cfd04969e
Prepare changelog for v0.8.9-rc.1
2017-05-19 10:39:14 +01:00
f615bc129f
Released js-sdk
2017-05-19 10:37:33 +01:00
c51f4b14ea
Merge pull request #905 from matrix-org/luke/new-guest-access-set-mxid-warm-fuzzy
...
Implement warm-fuzzy success dialog for SetMxIdDialog
2017-05-19 10:08:49 +01:00
2bec44a517
Remove suffix and prefix from login input username
...
This is an attempt reduce confusion when entering a custom home server: https://github.com/vector-im/riot-web/issues/3736
2017-05-19 10:03:51 +01:00
96c3bf56f8
Implement warm-fuzzy success dialog for SetMxIdDialog
2017-05-19 09:43:56 +01:00
cc7edbf86d
allow for sending arbitrary events, also override highlight with
...
event currently being forwarded while forwardingEvent is set
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 01:29:11 +01:00
475646a2a7
Change wording
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:34:35 +01:00
a2ab36f598
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into forward_message
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:33:36 +01:00
bf0fe63759
don't know why I'm even tracking mounted state. Never refd
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:20:51 +01:00
0e7e4d8595
replace weird sidebar snapping with better ui_opacity
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-19 00:20:32 +01:00
19d727ab88
Merge pull request #904 from matrix-org/t3chguy/code_style
...
code style update
2017-05-18 23:20:59 +01:00
73d68c5513
no leading lines for else,finally,catch etc
2017-05-18 23:03:34 +01:00
2ac3371ea4
Don't suggest vars!!
2017-05-18 22:51:22 +01:00
3e7a31ac75
Revert "fix scroll behaviour on macs with no gemini"
...
This reverts commit 1347d9fa65
2017-05-18 19:03:51 +01:00
726cd60127
Merge pull request #902 from matrix-org/dbkr/prevent_illegal_finddomnode
...
Prevent an exception getting scroll node
2017-05-18 17:56:29 +01:00
8fe3fa9178
Remove debug logging
2017-05-18 17:35:22 +01:00
01955146e9
Prevent an exception getting scroll node
...
Don't try to findDOMNode before we're mounted as it makes react
angry.
2017-05-18 17:33:32 +01:00
46242a1703
Merge pull request #901 from matrix-org/luke/improve-country-dd-5
...
Fix a few remaining snags with country dd
2017-05-18 17:23:34 +01:00
32818aff4f
Simplify expression
2017-05-18 17:08:26 +01:00
ee64f4a8dd
Add country prefix to country dd options
2017-05-18 17:02:19 +01:00
Luke Barnard