gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,890 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

4890 Commits

Author SHA1 Message Date
Richard Lewis 7a63cfd717 Add stylesheet for apps 2017-05-17 23:17:53 +01:00
Richard Lewis 7ea6157b67 App drawer styling 2017-05-17 21:16:15 +01:00
David Baker c929cb1337 Do I mean bash? Probably 2017-05-17 18:21:58 +01:00
David Baker b3b44dd99e Use fetch dep script for travis 2017-05-17 18:20:25 +01:00
David Baker 18afbc5bec Make dep install script work 2017-05-17 18:14:28 +01:00
David Baker 60d33f50a7 Create node_modules if it doesn't exist 2017-05-17 16:19:19 +01:00
David Baker 94ac4bf490 Use fetch dep script in jenkins script 2017-05-17 16:17:08 +01:00
David Baker fac8906102 Add script to fetch correct dep branches 
Fetch branches of js-sdk and react-sdk that match the current
branch name, if they exist. This will mostly be used in the
automated tests.
 2017-05-17 16:11:34 +01:00
Richard van der Hoff ca3921f3a0 Merge pull request #3943 from vector-im/rav/reduce_rageshake_size 
Reduce rageshake log size to 1MB
 2017-05-17 15:59:10 +01:00
Richard van der Hoff 15ab1732a2 Reduce rageshake log size to 1MB 
... 50MB turned out to be quite a lot.
 2017-05-17 14:46:06 +01:00
Luke Barnard 338ab4d046 Merge pull request #3942 from vector-im/luke/improve-country-dd-2 
CSS for putting country dd on same line as phone input
 2017-05-17 14:29:48 +01:00
Luke Barnard 089740a840 CSS for putting country dd on same line as phone input 
(For login and registration)
 2017-05-17 14:25:43 +01:00
Richard Lewis 553c53e7e8 Add apps menu icons 2017-05-17 12:33:58 +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
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
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
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
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
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 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
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 e6f6b8cebd Merge pull request #3924 from vector-im/luke/new-guest-access-need-to-set-mx-id 
Replace NeedToRegister with SetMxId dialog
 2017-05-16 11:48:24 +01:00
Luke Barnard 79d32868a6 Replace NeedToRegister with SetMxId dialog 2017-05-16 11:39:30 +01:00
Luke Barnard 5814a3fdc8 Fix copyright 2017-05-16 10:11:44 +01:00
Luke Barnard 0e787a09c3 Implement dialog to set password 
Until https://github.com/matrix-org/matrix-react-sdk/pull/881, ChangePassword will not know about the cached password (so it won't hide "Current Password" yet).

There's also a bit of work left - informing the SessionStore that the password has changed (marked with a TODO)
 2017-05-16 09:44:52 +01:00
Matthew Hodgson c8ac60768d Merge pull request #3919 from vector-im/t3chguy/patch-1 
fix #3894
 2017-05-15 21:15:03 +01:00
Michael Telatynski cef26a5b20 fix #3894 2017-05-15 21:14:01 +01:00
Matthew Hodgson fe61a7eefd fix off-by-one pixel errors in login field heights - fixes https://github.com/vector-im/riot-web/issues/3738 2017-05-15 02:32:25 +01:00
Matthew Hodgson 582a34c937 cursor pointer for avatar upload in user settings 2017-05-15 02:24:34 +01:00
Matthew Hodgson 5181eb3ea5 Merge pull request #3894 from vector-im/t3chguy/change_release_vector2riot 
change vector->riot on the surface
 2017-05-15 01:43:57 +01:00
Matthew Hodgson c3477a30a7 oops, rebuild modernizr to pull in new tests 2017-05-15 01:22:32 +01:00
Matthew Hodgson 8e2e6cee35 require indexeddb & webworkers in modernizr 2017-05-15 01:07:25 +01:00
Matthew Hodgson 25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 2017-05-15 00:26:02 +01:00
Michael Telatynski aa7728cad3 tidy up tray.js - it made my eyes hurt 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:41:13 +01:00
Michael Telatynski 808240eef9 shouldn't need this try-catch 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:40:17 +01:00
Michael Telatynski 6aae97b812 Update tray tooltip based on document.title 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:39:55 +01:00
Michael Telatynski 8927afca03 re-add electron node modules to gitignore 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:37:27 +01:00
Michael Telatynski bbda658b7f make Electron tray icon mimic the Favico.js one 
DRY: moved Favicon stuff into the base platform

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-13 12:37:13 +01:00