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

5672 Commits

Author SHA1 Message Date
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
Luke Barnard 67297bf827 Merge pull request #3906 from vector-im/luke/new-guest-access-welcome-user 
Add welcomeUserId to sample config
 2017-05-12 19:17:33 +01:00
Luke Barnard f60be2d658 Add welcomeUserId to sample config 2017-05-12 16:12:17 +01:00
Michael Telatynski ea0b166da7 change wording to not confuse users building repo 
change default repos to match their current naming

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:49:31 +01:00
Michael Telatynski f248477f82 stage 0.5 rebrand (rename dist release) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 17:46:08 +01:00
Luke Barnard 607ba57f48 Merge branch 'develop' into new-guest-access 
Conflicts:
	src/component-index.js
 2017-05-11 13:23:31 +01:00
Luke Barnard 0e0918d07c Merge pull request #3888 from vector-im/pr/3799 
move manifest.json outward so it is scoped properly
 2017-05-11 13:20:33 +01:00
Michael Telatynski 3c5594e034 move manifest.json outward so it is scoped properly 
this will matter more when we add a service worker

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-11 13:12:26 +01:00
Luke Barnard 15db686f33 Merge pull request #3799 from t3chguy/manifest 
add to manifest
 2017-05-11 13:05:00 +01:00
Michael Telatynski ffa53ca205 Update manifest.json 2017-05-11 11:17:55 +01:00
Luke Barnard 4c0e8cd372 Merge pull request #3886 from vector-im/luke/auto-reskindex 
Automatically update component-index
 2017-05-11 10:47:06 +01:00
Luke Barnard 6d94f35c33 Automatically update component-index 
Following changes to the react-sdk, reskindex can now be updated using the "-w" (watch) equivalent of the reskindex script.

-Alter npm scripts so that reskindex is run when building once and so that reskindex:start is runwhen developing
-Remove and stop tracking component-index, this will now only be created at build-time
 2017-05-11 10:37:13 +01:00
Luke Barnard ee33490553 Merge pull request #3885 from vector-im/luke/new-guest-access-set-mxid-4 
CSS for mxIdDialog redesign
 2017-05-11 10:28:23 +01:00
Luke Barnard d2ea162b3f Unmuddle the component-index header 2017-05-11 10:11:30 +01:00
Luke Barnard 2eccdf56b9 Merge branch 'develop' into new-guest-access 2017-05-11 09:50:13 +01:00
Luke Barnard ab24994e37 Move general CSS to more specific so as not to affect other dialogs 2017-05-11 09:42:21 +01:00
Luke Barnard 98f62d0300 NL at EOF 2017-05-11 09:40:06 +01:00
Luke Barnard 2e49014ffe CSS for mxIdDialog redesign 2017-05-11 09:33:52 +01:00
David Baker e67e891040 Merge pull request #3877 from vector-im/t3chguy/electron_install_fix 
move electron -> electron_app because npm smart
 2017-05-10 13:48:18 +01:00
Michael Telatynski c607b1bc89 npm is "smart" enough to try and install our electron wrapper as a module 
instead of the actual electron package. With no way to ignore directories.
I'd like to think of this as temporary, until I get to rip apart riot-web
and riot-electron

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-10 13:36:27 +01:00
Richard van der Hoff 41738ec025 Merge pull request #3863 from vector-im/rav/bug_report_endpoint 
Fix bug report endpoint in config.sample.json.
 2017-05-09 12:34:40 +01:00