nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
62,959 Commits 258 Branches 582 Tags
f52d7a8e207301ac62497ca7cd25bf64b6834d81
Commit Graph

62959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Lewis
9dd0b9bdd1 Fix lint errrors / warnings 2017-05-17 11:31:01 +01:00
Richard Lewis
e22712514e Add show / hide apps button 2017-05-17 10:58:59 +01:00
David Baker
7ea0ecd125 Merge branch 'new_release_process_stable' into develop 
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
 2017-05-17 10:43:02 +01:00
Michael Telatynski
9352e5d78e Lets make it abundantly clear that we want attention. FLASH FLASH FLASH 
also improve favicon updating to not change if we're same as previous
not sure how intensive the nativeImage stuff is but cheap efficiency

For FLASH FLASH I moved the setBadgeCount stuff RPC -> IPC
should be more reliable now, its in electron-main
Win only:
if mainWindow is set and is not in focus make it FLASH
clear flash if notification gets cleared elsewhere
debounce focus handler so we don't set a million of them
if the app is backgrounded a while

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-17 10:39:43 +01:00
David Baker
8ce6da1b16 Merge branch 'new_release_process_stable' into develop 
This reverts all PRs currently marked notready, changing develop into
a branch that should be more stable.
 2017-05-17 10:38:09 +01:00
Luke Barnard
818f21c248 Merge pull request #893 from matrix-org/luke/unit-test-rts-reg 
Write some tests for the RTS UI
 2017-05-17 10:33:26 +01:00
Michael Telatynski
826a571b60 apply same image to the window/taskbar too; as per request 
LETS MAKE IT CLEAR WE ARE NEEDY AND WANT ATTENTION

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-17 10:05:50 +01:00
Richard van der Hoff
696234694c Merge pull request #892 from matrix-org/rav/pastefiles 
Support for pasting files into normal composer
 2017-05-17 09:59:23 +01:00
Michael Telatynski
39b6c7c65d ignore electron_app subdirs properly, missed these too :L 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-17 09:53:33 +01:00
Luke Barnard
e1089574ae Write some tests for the RTS UI 
Add tests that make assertions about the UI during registration when registration is done with a user recognised as a team member (by the mock rtsClient).
 2017-05-17 09:46:17 +01:00
Richard van der Hoff
8695397abb Support for pasting files into normal composer 
We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
 2017-05-17 01:43:13 +01:00
David Baker
9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" 
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
 2017-05-16 17:21:49 +01:00
David Baker
844ea390c8 Revert "clear the searchbox after quick-search" 
This reverts commit ddd12edc06.
 2017-05-16 17:13:55 +01:00
David Baker
fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." 
This reverts commit 52a119244b.
 2017-05-16 17:13:39 +01:00
David Baker
9399b7ddf0 Revert "fix incoming call box" 
This reverts commit b3431bb750.
 2017-05-16 16:35:17 +01:00
David Baker
03476705b1 Revert "better solution to incomingcallbox weirdness" 
This reverts commit be52787473.
 2017-05-16 16:35:06 +01:00
David Baker
3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" 
This reverts commit e6133820a2, reversing
changes made to d1db602b3a.
 2017-05-16 16:27:58 +01:00
David Baker
75eea89c08 Revert "Merge pull request #765 from t3chguy/t3chguy/escape-closes-user-settings" 
This reverts commit a29d8c2af2, reversing
changes made to 1d836c7d02.
 2017-05-16 16:12:57 +01:00
David Baker
ebfafb3639 Revert "Merge pull request #807 from matrix-org/matthew/quick-search" 
This reverts commit 0ad1d8caf3, reversing
changes made to 1189368aab.
 2017-05-16 16:11:01 +01:00
David Baker
67c6a8b81d Revert "unbreak stack overflow which fires on tests due to mocked timers" 
This reverts commit e69ea68133.
 2017-05-16 16:02:13 +01:00
David Baker
eddc2af92d Revert "HOW DID THIS EVER WORK?" 
This reverts commit 0d8d3c6710.
 2017-05-16 16:01:54 +01:00
David Baker
7a949b6a45 Revert "oops, actually refresh roomlist when its state changes!" 
This reverts commit 35a16edccc.
 2017-05-16 16:01:32 +01:00
David Baker
b063c605a8 Revert "fix stupid typos in RoomList's shouldComponentUpdate" 
This reverts commit b0288ebd89.
 2017-05-16 16:01:14 +01:00
David Baker
714cd6a10f Revert "recalculate roomlist when your invites change" 
This reverts commit ec6a1c4c75.
 2017-05-16 16:00:34 +01:00
David Baker
1aabaec158 Revert "comment out spammy CTD logging" 
This reverts commit 19482d751d.
 2017-05-16 15:35:22 +01:00
David Baker
ff9c40472a Revert "Merge pull request #822 from t3chguy/BaseDialog_restore_focus" 
This reverts commit 0ac836919d, reversing
changes made to 7e07ffd55f.
 2017-05-16 14:50:29 +01:00
David Baker
19dcd83aeb Revert "Merge pull request #841 from matrix-org/luke/fix-double-dialogs" 
This reverts commit 1913a32fbd, reversing
changes made to 0c16298c45.
 2017-05-16 14:50:19 +01:00
David Baker
387529d130 Revert "Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2" 
This reverts commit 3366d3bbae, reversing
changes made to ceb71a4ef6.
 2017-05-16 14:49:55 +01:00
David Baker
d06bd3cf9d Revert "Fix Create Room button" 
This reverts commit 9cae667c06.
 2017-05-16 14:30:02 +01:00
David Baker
f8d1a6d240 Revert "Fix 'start chat' button" 
This reverts commit c841eb641b.
 2017-05-16 14:26:46 +01:00
Luke Barnard
ca907f42dc Fix redundant getComponent 2017-05-16 14:24:24 +01:00
Luke Barnard
219bfffea2 Only dispatch password_changed when password has changed 2017-05-16 14:24:09 +01:00
Michael Telatynski
58ada2c27d move mxEvent.status check to js-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:14:06 +01:00
Luke Barnard
2c5fb01f03 Fix bugs introduced by dodgy merge 2017-05-16 14:13:22 +01:00
Michael Telatynski
db78534b45 remove no longer required parseIntWithDefault 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:10:00 +01:00
Michael Telatynski
d55f4f9e6a use new RoomState method from matrix-org/matrix-js-sdk/pull/435 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:08:00 +01:00
Luke Barnard
49437e301e Merge pull request #890 from matrix-org/luke/new-guest-access-change-pwd 
Make confirmation optional on ChangePassword
 2017-05-16 14:05:19 +01:00
Luke Barnard
c6ff45261d Merge pull request #3921 from vector-im/luke/new-guest-access-set-pwd-dialog 
Implement dialog to set password
 2017-05-16 14:05:03 +01:00
David Baker
6bd7af2917 Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1" 
This reverts commit 3549ff2543, reversing
changes made to 1db677141e.
 2017-05-16 14:00:09 +01:00
Luke Barnard
66985e6d08 Merge branch 'new-guest-access' into luke/new-guest-access-change-pwd 2017-05-16 13:59:54 +01:00
Luke Barnard
11d88aa6a2 import dispatcher 2017-05-16 13:56:12 +01:00
Luke Barnard
36ec39ffc0 Merge branch 'new-guest-access' into luke/new-guest-access-set-pwd-dialog 2017-05-16 13:49:18 +01:00
Luke Barnard
48856c31f8 Dispatch password_changed when SetPasswordDialog finished 2017-05-16 13:48:56 +01:00
Michael Telatynski
aff1e14efc first go at show redact only if we can redact 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 13:15:14 +01:00
Luke Barnard
e367fb5a98 disabledConfirmation -> confirm 2017-05-16 12:45:30 +01:00
Luke Barnard
5a3c32044e disableConfirmation -> confirm 2017-05-16 12:45:14 +01:00
Luke Barnard
c6350379dc Merge pull request #881 from matrix-org/luke/user-settings-remove-current-password 
Remove "Current Password" input if mx_pass exists
 2017-05-16 12:29:23 +01:00
Luke Barnard
633c6b39f6 Add comment to Lifecycle 2017-05-16 11:58:37 +01:00
Luke Barnard
eb36e979c2 Reference store token, call .remove on it on unmount 2017-05-16 11:52:51 +01:00
Luke Barnard
f7e6a996c5 Add proptype 2017-05-16 11:51:09 +01:00