 Michael Telatynski
|
f57d8e4cb9
|
make ESLint a touch happier
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2017-05-22 18:31:30 +01:00 |
|
|
Michael Telatynski
|
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 |
|
 Richard Lewis
|
998739a7dc
|
Edit icon and styling
|
2017-05-22 18:00:40 +01:00 |
|
|
Richard Lewis
|
b111579aed
|
App tile events
|
2017-05-22 18:00:17 +01:00 |
|
 David Baker
|
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 |
|
 Luke Barnard
|
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 |
|
|
Luke Barnard
|
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 |
|
 Michael Telatynski
|
6e8516e537
|
fiiine!
|
2017-05-22 16:53:46 +01:00 |
|
 David Baker
|
52d3dd4de9
|
cd first so we checkout the right repo
|
2017-05-22 16:48:53 +01:00 |
|
|
David Baker
|
c5a873c316
|
Remove depth=1 otherwise we won't find the branch
|
2017-05-22 16:41:43 +01:00 |
|
|
David Baker
|
77cd9d78db
|
Use develop if no matching branch found
|
2017-05-22 16:34:15 +01:00 |
|
 Luke Barnard
|
b0a824c941
|
Remove double declaration of TextInputDialog
|
2017-05-22 16:28:23 +01:00 |
|
|
David Baker
|
2c462bdfb4
|
Add right-branch logic to travis test script
|
2017-05-22 16:27:41 +01:00 |
|
|
Luke Barnard
|
05aaa599cc
|
Merge branch 'develop' into new-guest-access
Conflicts:
src/components/structures/MatrixChat.js
|
2017-05-22 16:19:10 +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 |
|
|
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 |
|