Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-09-22 09:05:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,716 Commits 3 Branches 492 Tags 100 MiB
fd8b36eb1c
Commit Graph

519 Commits

Author SHA1 Message Date
Luke Barnard
e1d16acddb Implement general-purpose tooltip "(?)"-style 2017-11-07 14:09:04 +00:00
Travis Ralston
63607f29e7 Use SettingsStore for notification settings 
Signed-off-by: Travis Ralstron <travpc@gmail.com>
 2017-11-04 22:27:34 -07:00
Matthew Hodgson
816042d3a8 Merge branch 'develop' into matthew/status 2017-11-04 23:51:20 +00:00
Matthew Hodgson
adedf23cfb remove unnamespaced CSS fail 2017-11-04 22:19:06 +00:00
Travis Ralston
69939e2fe3 Merge branch 'develop' into travis/granular 2017-11-03 21:56:46 -06:00
Matthew Hodgson
c0b343c89f
Merge pull request #5471 from vector-im/t3chguy/devtools-1 
T3chguy/devtools 1
 2017-11-03 23:10:00 +00:00
Matthew Hodgson
923295973b Merge branch 'develop' into matthew/status 2017-11-03 15:11:23 +00:00
Luke Barnard
c01ea56676 Add toggle to alter visibility of room-group association 2017-11-02 13:40:07 +00:00
Michael Telatynski
6da2f88dc5
Devtools styling tweaks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 13:32:31 +00:00
Michael Telatynski
ea9b630082
Refactor and add Account Data stuffs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-30 12:44:50 +00:00
Travis Ralston
f6177cd7b5 Use granular settings instead of synced settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-29 01:51:02 -06:00
David Baker
b9e2b59504 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 19:01:34 +01:00
Matthew Hodgson
3df1808fd0 Merge pull request #5453 from VickyKoblinski/es6-notifications 
Leverages ES6 in Notifications
 2017-10-27 09:15:22 +01:00
Vicky Koblinski
d188fdb9fe Changes requires to imports for consistancy, removes 'use strict' 2017-10-26 21:23:16 -04:00
Vicky Koblinski
7588814ec5 Leverages ES6 and fixes typo 2017-10-26 20:37:15 -04:00
Matthew Hodgson
225c7ee621 Merge branch 'develop' into matthew/status 2017-10-26 01:46:06 +01:00
Travis Ralston
45ca890f68 Merge remote-tracking branch 'vector-im/develop' into travis/presence 2017-10-25 11:27:22 -06:00
Michael Telatynski
b16d4280b7
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:42:06 +01:00
Michael Telatynski
eb45b00b32
fix bad tab completion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:40:25 +01:00
Michael Telatynski
84d1f838f0
make filtering case-insensitive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-23 11:39:21 +01:00
Matthew Hodgson
190811ac1c WIP 2017-10-23 00:57:02 +01:00
David Baker
667556f3ce Custom server text was i18ned by key 
And therefore got replaced by the key by the i18n script
 2017-10-20 13:48:00 +01:00
Travis Ralston
ef5fc7347a Don't update presence status if the user is clicks twice 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-15 20:20:43 -06:00
Travis Ralston
deb50b2d43 Add presence context menu and styling 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 23:15:26 -06:00
Matthew Hodgson
f143315618 Merge pull request #5142 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:02:49 +01:00
Travis Ralston
6926c96f36 Hide pinning messages behind a labs settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:44 -06:00
Matthew Hodgson
6f819606c1 Merge pull request #4054 from ollieh/issues/3771 
Sorting of networks within a protocol based on name
 2017-10-14 23:21:51 +01:00
Travis Ralston
3e066d3aef Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:11:17 -06:00
Matthew Hodgson
2667ed2561 Merge pull request #4988 from vector-im/t3chguy/hide_notification_body 
allow hiding of notification body for privacy reasons
 2017-10-14 23:07:31 +01:00
Travis Ralston
1adb63ac74 Don't use MXIDs on the lightbox if possible 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:18:55 -06:00
Michael Telatynski
6df69138a2
switch to new logos, and use import rather than VAR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-11 16:46:05 +01:00
Travis Ralston
2d153a72c1 Split up CSS; use .catch instead of .then 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:33:14 -06:00
Travis Ralston
078ee54edf Move the PinnedEventsPanel to the react-sdk 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 13:15:21 -06:00
Travis Ralston
2d5acfc0bc Filter pinned events before rendering 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:30:52 -06:00
Travis Ralston
b0190f6a65 i18n for remaining strings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:22:06 -06:00
Travis Ralston
0a3bc1c667 Don't try to show redacted messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:21:44 -06:00
Travis Ralston
aff02885de Don't fail if an event doesn't belong to a room. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:21:21 -06:00
Travis Ralston
965a25ba84 Fix bug where rooms missing m.room.pinned_events could not pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:08:22 -06:00
Travis Ralston
f7389b70aa Hide the pin option in the context menu if the user can't pin messages 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 11:01:17 -06:00
Travis Ralston
efdb4b02c6 i18n for 'Jump to message' button 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:55:52 -06:00
Travis Ralston
59a253af37 Don't show the unpin button if the user can't unpin the message. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:53:44 -06:00
Travis Ralston
9b11f576fe Add action bar to pinned event tiles; support unpinning from the panel 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston
fa5a23e0df Permalink pins to their original events 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston
5daa16ab53 Add panel for pinned messages. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Travis Ralston
774c3dbd38 Pin/unpin message option in a message's context menu 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-09-29 10:42:58 -06:00
Stefan Parviainen
3cff8c1230 Mark some strings as translatable 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-09-23 13:46:51 +02:00
Michael Telatynski
dccee6d419
add ability to filter room state types/results 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 12:03:11 +01:00
Michael Telatynski
af450df513
add ability to jump from RSE to Send Custom State Event prefilled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 11:27:31 +01:00
Michael Telatynski
821ab6c13e
switch to controlled inputs and require eventType !== '' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-18 11:06:46 +01:00
Matthew Hodgson
828e9d5eb4 Merge pull request #4735 from vector-im/t3chguy/devtools 
T3chguy/devtools
 2017-09-17 23:15:28 +01:00
David Baker
f148844573 Merge pull request #4989 from vector-im/t3chguy/on_copy_tooltip 
generic contextual menu for tooltip/responses
 2017-09-13 14:27:28 +01:00
Michael Telatynski
2316f4230e
install and use prop-types over React.PropTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-13 14:23:35 +01:00
David Baker
38575a653d Revert "Implement sticky date separators" 2017-09-06 17:36:43 +01:00
Michael Telatynski
32ea675c92
fix (C) header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 14:20:12 +01:00
Michael Telatynski
60c2338543
generic contextual menu for tooltip/responses 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 11:27:04 +01:00
Michael Telatynski
fca86be077
allow hiding of notification body for privacy reasons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-09-06 10:56:32 +01:00
David Baker
b8d9276f29 Merge pull request #4939 from vector-im/luke/feature-sticky-date-separators 
Implement sticky date separators
 2017-09-05 14:16:21 +01:00
Michael Telatynski
3aa12246ea Merge branch 'develop' into t3chguy/devtools 2017-08-31 17:11:53 +01:00
Michael Telatynski
b84f258f87
add bottom margin to navigation buttons of room state explorer 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 13:49:52 +01:00
Michael Telatynski
68fc202086
remove pointless self vars and DRY render method of send custom events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 09:45:46 +01:00
Michael Telatynski
ce0861d5bd
undo `` as its hard to read 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-31 09:25:06 +01:00
David Baker
a70e7751e9 Merge pull request #4943 from anoadragon453/develop 
Update vector-im to riot-im on Login
 2017-08-31 08:33:21 +01:00
Andrew (anoa)
8e5427d626
Update vector-im to riot-im on Login 
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
 2017-08-30 12:06:19 -07:00
Luke Barnard
88228a5a3f Implement sticky date separators 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1353
 2017-08-30 14:06:50 +01:00
Michael Telatynski
a2b57f502c
lets let people know that the bug report actually sent properly :) 
RFC on the wording of it.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-28 00:07:48 +01:00
Michael Telatynski
d14f16f0e9
look at event property of the mxEv, this way we won't have all 
the additional internal keys :)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-27 17:25:51 +01:00
Michael Telatynski
a437f23e9d
add i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-26 18:48:24 +01:00
Michael Telatynski
84f4fbe142
DRY up code and change flow to be less destructive 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 23:56:57 +01:00
Michael Telatynski
3fd1a366bf
add back button to all pages and widen textarea 2017-08-10 23:13:40 +01:00
Michael Telatynski
2d4484e0f2
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools 2017-08-10 16:06:14 +01:00
Luke Barnard
535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:36:04 +01:00
Michael Telatynski
4c6836bc3f
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:13:30 +01:00
Michael Telatynski
9c5ceb6775
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:56:01 +01:00
Luke Barnard
57f82c3c9e Quote using innerText 
codep matrix-org/matrix-react-sdk#1289
 2017-08-10 10:18:37 +01:00
Michael Telatynski
1b004f170d
make eslint happy 2017-08-03 01:10:32 +01:00
Michael Telatynski
9ab30b7b17
fix line-length and copyright header 2017-08-03 01:05:43 +01:00
Michael Telatynski
131d1c74c9
add room state explorer to devtools 2017-08-03 00:59:40 +01:00
Michael Telatynski
6bfdd69279
add devtools dialog 2017-07-31 12:08:41 +01:00
Michael Telatynski
5b6dbfb701
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics 2017-07-28 21:02:48 +01:00
Michael Telatynski
93a3c896a4
un-i18n Modal Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-07-27 17:45:02 +01:00
Richard van der Hoff
bc2f639aae Fix a couple of minor errors in the room list 
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
 2017-07-24 17:19:46 +01:00
Luke Barnard
53ae42ed68 Use catch instead of fail to handle room tag error 
Because bluebird doesn't support fail
 2017-07-19 14:11:22 +01:00
Richard van der Hoff
7238c4dfac Fix overlooked q 2017-07-13 11:33:25 +01:00
Richard van der Hoff
1d2d086a58 Replace q.allSettled() 
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
 2017-07-13 00:50:01 +01:00
Richard van der Hoff
d5b550f89a replace q method calls with bluebird ones 
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
 2017-07-13 00:50:01 +01:00
Richard van der Hoff
10decf95f6 replace imports of q with bluebird 
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
 2017-07-13 00:48:31 +01:00
Luke Barnard
c1b8879b6b Merge pull request #4500 from vector-im/luke/feature-enable-RTE 
Take RTE out of labs
 2017-07-10 13:56:02 +01:00
Luke Barnard
77a52b02cb Take RTE out of labs 
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
 2017-07-04 16:26:19 +01:00
Michael Telatynski
f36c1ca207 fix Quote not closing contextual menu 
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
 2017-06-27 14:51:18 +01:00
Michael Telatynski
e33e0effa3 use _t on string literals and i18n 'warning' 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-22 15:05:13 +01:00
Michael Telatynski
0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js
 2017-06-22 15:04:33 +01:00
Richard van der Hoff
a9c8429d2e Merge pull request #4362 from turt2live/travis/missed-redact 
Change missed 'Redact' to 'Remove' in ImageView.
 2017-06-22 14:37:31 +01:00
Luke Barnard
c4a3211cfc Use _tJsx for PasswordNagBar (because it has <u>) 2017-06-20 16:28:40 +01:00
Michael Telatynski
fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:32:19 +01:00
Luke Barnard
d5d29c1c92 Give _t to PasswordNagBar, add CSS for UserSettings password warning 
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
 2017-06-20 11:23:34 +01:00
turt2live
b9fc46fa41 Change missed 'Redact' to 'Remove' in ImageView. 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-19 16:24:03 -06:00
Matthew Hodgson
612cad5d9e fix broken vars 2017-06-19 00:01:11 +01:00
Michael Telatynski
274536bf13 change dispatcher forward_event signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-16 16:11:33 +01:00
David Baker
2c186aafae Fix h2 in markdown being weird 
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.

Fixes https://github.com/vector-im/riot-web/issues/4328
 2017-06-16 11:36:24 +01:00
Luke Barnard
4f55f810af Ask for email address after setting password for the first time 
This is so that the user can reset their password.
 2017-06-14 09:30:08 +01:00